root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 13 Packages Projects Releases Wiki Activity
9,427 Commits 111 Branches 92 Tags 671 MiB
Commit Graph

2597 Commits

Author SHA1 Message Date
Mark Otto e381635b1f Fixes #12593: Add support for table bodies and table rows to the collapse plugin 2014-03-03 21:39:53 -08:00
Mark Otto 6bd54ef14b 100% less tumah 2014-02-27 12:17:08 -08:00
Mark Otto ce4175b65e Merge pull request #12855 from lipis/patch-1 
Added the very useful .animation-fill-mode() mixin
 2014-02-27 12:12:44 -08:00
Mark Otto 2e02ed4e0c Fixes #12851: it's not a tumah 2014-02-27 11:08:24 -08:00
Sojaner 77cd015cf0 Fix for issue #12854 where push and pull resets 
The col-*-push-0 and col-*-pull-0 classes try to reset the positioning using 0% but this prevents the opposite direction positioning to freeze and not being set correctly.
To fix that, these must set the position to auto instead of 0% with means left:auto and right:auto instead of left:0% and right:0%.
 2014-02-27 12:35:58 +03:30
Lipis b878491b9a Added the very useful .animation-fill-mode() mixin 
I think that's the only animation property that was missing and it's quite useful.

https://developer.mozilla.org/en-US/docs/Web/CSS/animation-fill-mode
 2014-02-26 17:59:36 +01:00
Chris Rebert f1736e2d32 update GitHub issue link in comment 2014-02-25 10:17:44 -08:00
Chris Rebert 754791e3d9 fix #12836 
Thanks @Quy.
 2014-02-24 14:43:09 -08:00
Mark Otto 66a229bdbf Fixes #12822: Scope panel collapse styles to immediate panel bodies only 2014-02-22 22:46:03 -08:00
Mark Otto 7b60470e9b Fixes #12801: Add padding to the bottom of .form-control-static to match height of standard form controls 2014-02-22 14:16:11 -08:00
Mark Otto 7e551ecaf7 Update modals to use more consistent padding—modal body and footer now match modal header 2014-02-22 12:38:56 -08:00
Mark Otto 4ccf088a24 Merge branch 'master' into pr/12813 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-02-22 12:20:53 -08:00
Mark Otto b99be29f32 Fixes #12756: Ensure horizontal dls are cleared by moving the clearfix out of the media query 2014-02-22 12:13:11 -08:00
Supergibbs 49094844ac Correctly set .btn-link colors in a .navbar and .navbar-inverse #12694 2014-02-21 20:51:06 -08:00
Chris Rebert bdd7651e32 replace .visible-{size} with .visible-{size}-{display} ; fixes #8869 2014-02-21 17:44:40 -08:00
Mark Otto b01f995ad7 Merge pull request #12459 from rubenstolk/hotfix/mixins/scale 
Make both .scale(X) and .scale(X, Y) both work
 2014-02-21 17:36:47 -08:00
Mark Otto c7b07a5644 Merge pull request #12742 from ZDroid/table-responsive-mixin 
Make .table-responsive usable as mixin
 2014-02-21 17:34:27 -08:00
Chris Kankiewicz 4dde96b674 Removed unnecessary top margin from .modal-footer 2014-02-20 14:27:19 -07:00
Demian Ferreiro ca15add174 Fix UAs required message position on grouped radio buttons 
Instead of not rendering the element at all with display:none, use opacity:0 and z-index:-1 so the radio element has a defined position on the document and user agents can show the required message in the right place.
 2014-02-19 17:30:55 -03:00
Zlatan Vasović dfa5edca2c Make .table-responsive usable as mixin 2014-02-14 19:48:17 +01:00
rhaase eef939916b Defined and use variables for .panel-heading & .panel-footer padding 2014-02-14 15:51:01 +01:00
DaSch 2fba53e600 add posibillity to hover links and not background in list-groups 2014-02-14 13:56:36 +01:00
Mark Otto eb20d6f132 Fixes #11659, #12698, and #12349: Always apply position and z-index form controls in input groups for proper borders 2014-02-11 14:20:01 -08:00
Mark Otto 8551f42ae2 Merge branch 'master' into pr/12412 
Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	test-infra/npm-shrinkwrap.canonical.json
 2014-02-11 09:50:40 -08:00
Mark Otto b4ba964801 Merge pull request #12673 from tlindig/tl_popover_arrow_size 
use @popover-arrow-width for offset the popover
 2014-02-10 20:52:43 -08:00
Mark Otto 9427310a09 Fixes #12674 
* The problem with #12674 is that it reassigns the same variable, but the color values were purposely different.
* This uses Less's color functions to generate the proper darker colors.
* Why darker colors? Because those CSS carets render lighter than their solid border counterparts. Consider it a design hack.
 2014-02-10 20:49:17 -08:00
Chris Rebert c4e242bdb1 add .sr-only-focusable; fixes #12259 2014-02-10 10:34:38 -08:00
Tobias Lindig 221ac861e4 use @popover-arrow-width for offset the popover to account for the popover arrow 2014-02-10 10:57:11 +01:00
Ruben Stolk a843bfda18 Make both .scale(X) and .scale(X, Y) both work 2014-02-10 10:12:38 +05:30
Mark Otto 41841c99c4 Merge branch 'master' of github.com:twbs/bootstrap 2014-02-08 17:29:25 -08:00
Mark Otto 44bb7b20c7 Fixes #12625: Only remove first list group item's top and last list group item's bottom borders when the list group is first or last 2014-02-08 17:29:10 -08:00
Mark Otto 2365717a3d Merge pull request #12433 from tagliala/list-inline-first-element-fix 
Fix first element padding of list-inline
 2014-02-08 16:59:59 -08:00
Mark Otto 65b10706b3 brace position 2014-02-08 16:56:59 -08:00
Mark Otto e9199718d6 Merge branch 'master' into fix-12154 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-02-08 16:52:22 -08:00
Mark Otto b6444c6472 Merge pull request #12552 from stoudenmire/carousel-icon-classname-fix 
Fixes two typos in carousel.less
 2014-02-08 16:03:25 -08:00
Mark Otto e3cfd5821d Merge branch 'master' into pr/12462 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-02-08 16:01:56 -08:00
Mark Otto c8315edd73 Merge branch 'master' into pr/12639 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-02-08 15:37:35 -08:00
Zlatan Vasović 4c16360036 Fix #12656: add @blockquote-font-size 2014-02-08 22:12:18 +01:00
Mark Otto 06f1293acf Merge branch 'master' into panels_and_tables 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-02-07 18:36:27 -08:00
Mark Otto a2f08158d0 Nuke shit I added in 4d7b2ddba9 that shouldn't come until v4 2014-02-07 15:44:50 -08:00
Bas Bosman a0052b5a37 Drop -o-user-select 2014-02-07 14:14:32 +01:00
Mark Otto 4d7b2ddba9 Fixes #12486: Restore full width inputs for input groups in inline forms and navbars 2014-02-07 02:58:10 -08:00
Mark Otto d91d9b0ade Fixes #12447: Properly reset borders on table cells in panels 2014-02-07 02:38:01 -08:00
Mark Otto da43f97be1 Override iOS search input's extra round corners 2014-02-07 02:08:32 -08:00
Mark Otto 228d4e59fc Fixes #12555: Rearrange variables to place grids and containers closer 2014-02-07 01:22:30 -08:00
Mark Otto b124c4a6a4 Merge pull request #12620 from twbs/thumbnail-extend 
use :extend in thumbnail Less
 2014-02-06 19:32:31 -08:00
Mark Otto 42d7479dbf Merge pull request #12502 from ZDroid/moz 
Remove redundant :-moz-placeholder styles
 2014-02-06 19:31:29 -08:00
Mark Otto ace0abfdb6 Merge branch 'master' into thumbnail-extend 
Conflicts:
	dist/css/bootstrap.css
 2014-02-06 18:52:03 -08:00
Chris Rebert 7c1511502e use :extend(.img-responsive) in Carousel's Less 2014-02-06 15:52:26 -08:00
Chris Rebert fda8d91c86 use :extend in thumbnail Less 2014-02-06 15:42:54 -08:00
Chris Rebert 37c21a3ac7 use Less' extend feature in btn-group-lg etc. 2014-02-06 10:59:04 -08:00
Supergibbs 08ff305ed7 Added border radiuses to table when in a panel. Fixes #12461 2014-02-05 14:29:23 -08:00
Mark Otto 45e65eef3d Merge pull request #12025 from ZDroid/clean-visibility-mess 
Fix #12015 and minify styles
 2014-02-04 18:29:05 -08:00
Mark Otto 07098d1bb7 Fixes #12470: Scope large modal styles to minimum viewport width 2014-02-04 02:01:31 -08:00
Mark Otto 266a2e11e0 Merge pull request #12533 from 1000hz/tighten-popover-arrows-scope 
Scope popover arrow css to direct descendant
 2014-02-03 23:40:52 -08:00
Chris Rebert 149c4be726 die tabs, die! 2014-02-03 10:02:58 -08:00
stoudenmire a484b3bd7a fixed two typos in carousel.less 
carousel.less has two typos in glyphicon classnames. fixed them.
 2014-02-03 16:24:07 +01:00
Cina S 847adb7dad Tightening up popover arrow css scope to apply only to direct descendant arrows. 2014-02-02 16:14:22 -06:00
Zlatan Vasović 1e09a9d1d7 Remove redundant :-moz-placeholder styles 
No need for old Firefox versions support.
 2014-02-01 14:20:41 +01:00
Frederick Marcoux d1a7271ea1 Update variables.less 2014-01-31 15:25:09 -05:00
Frederick Marcoux d3aad7e355 Added .list-group-item.disabled 
Added support for disabled List group item.
 2014-01-31 15:17:49 -05:00
Chris Kankiewicz 22e576c600 Fix issue causing .navbar-brand element height to be shorter than .navbar height 2014-01-30 14:59:54 -07:00
Geremia Taglialatela 0da527f169 fixed first element padding of list-inline 2014-01-30 14:55:19 +01:00
Mark Otto d2f1887bb5 Merge branch 'master' into pr/12388 
Conflicts:
	dist/css/bootstrap.min.css
 2014-01-29 22:18:29 -08:00
Mark Otto 9195d8e8eb Follow up to #11655: don't reset opacity on disabled buttons 2014-01-29 21:57:44 -08:00
Mark Otto d631e0b92d Fix #12422: Reset height on multiple select in input size mixin 2014-01-29 21:34:10 -08:00
Mark Otto 545c957f17 Fixes #12424: Account for Normalize change on figure element so that we don't potentially screw folks over 2014-01-29 21:23:23 -08:00
Mark Otto 493d143cbd v3 instead of rc1 2014-01-28 10:07:33 -08:00
Donald Pipowitch 7037c6fc72 refactored and renamed grid mixins 2014-01-28 10:48:45 +01:00
Mark Otto b7ac009a52 Remove #8350's reset for number inputs since Normalize fixes those upstream 2014-01-27 12:25:39 -08:00
Mark Otto 400720d00b Remove optgroup resets from #7611 since Normalize fixes those upstream 2014-01-27 12:24:35 -08:00
Mark Otto 6a0a139cda Upgrade to Normalize v3-rc1 in prep for v3 final 2014-01-27 12:08:55 -08:00
Mark Otto 16fd8cd01e Merge pull request #12398 from twbs/deprecate-box-shadow-mixin 
mark .box-shadow() mixin as deprecated
 2014-01-26 19:15:31 -08:00
Chris Rebert 1a36e4fa1e docs & comments: v3.1 => v3.1.0 2014-01-26 17:48:15 -08:00
Chris Rebert 602e5f8f11 mark .box-shadow() mixin as deprecated; fixes #12396 2014-01-26 17:44:01 -08:00
Alan Hamlett e38fd138ce fixes #10495 by forcing .navbar-brand height to prevent it's inner content from increasing navbar height 2014-01-25 21:40:56 -08:00
Mark Otto 4b2fe3f96f Merge branch 'master' of github.com:twbs/bootstrap 2014-01-24 11:56:04 -06:00
Mark Otto 64e8132426 Fix #12359: Reset min-width on fieldsets so that they don't break responsive tables and behave more like standard block level elements 2014-01-24 11:55:59 -06:00
Chris Rebert f1c1469b83 Merge pull request #12357 from twbs/border-box-note 
add note in Less source about global `box-sizing: border-box;`
 2014-01-23 20:57:45 -08:00
Mark Otto 44fc629d44 Fix #12353: Scope table border reset in panels to first-child rows 2014-01-23 22:52:26 -06:00
Chris Rebert b30cff4888 Add ref in Less to docs regarding box-sizing conflicts 
Refs #12351
 2014-01-23 20:51:23 -08:00
Chris Rebert 31e8a48783 "bottom increment" => "decrement" in explanatory comment 2014-01-23 15:07:04 -08:00
Mark Otto f748390cf5 Follow-up to #12250: remove remaining page margins for print 2014-01-22 21:51:23 -06:00
Mark Otto 08e83a62b7 Fix #11655: Fix broken disabled states for iOS form controls and buttons 2014-01-22 21:43:08 -06:00
Mark Otto 833c208bf5 Merge branch 'master' of github.com:twbs/bootstrap 2014-01-22 21:20:06 -06:00
Mark Otto 1e1af8687d Merge pull request #12250 from twbs/rm-print-margins 
remove default left-right print margins per upstream h5bp change
 2014-01-22 19:18:24 -08:00
Chris Rebert 1942f36455 remove default left-right print margins per upstream h5bp change 
Refs:
    57be193031
    https://github.com/h5bp/html5-boilerplate/issues/1477
 2014-01-21 16:29:49 -08:00
Mark Otto e71a85a525 remove confusing comment 2014-01-19 10:23:00 -08:00
Zlatan Vasović 885a870f43 Fix #12025 and minify styles 2014-01-19 12:52:31 +01:00
Mark Otto 3b6ab5075e Merge branch 'master' into bg-variant 
Conflicts:
	less/mixins.less
 2014-01-18 14:40:17 -08:00
Mark Otto 572e6a959a Merge pull request #12286 from watilde/fixes-panel 
Fixes #12263: Remove border radius when it's not both ends in panel
 2014-01-18 14:29:11 -08:00
Mark Otto b32d92ef71 Merge pull request #12249 from twbs/modal-md 
add & use @modal-md Less var for uniformity
 2014-01-18 14:28:45 -08:00
Mark Otto cfe38a4241 Merge branch 'master' into modal-md 2014-01-18 14:12:04 -08:00
Mark Otto cd1bea0616 Merge branch 'master' into bg-variant 2014-01-18 14:11:55 -08:00
Mark Otto 689e75e4b1 Merge branch 'master' into text-emphasis-variant 2014-01-18 14:11:36 -08:00
Daijiro Wachi 6856c9f7f6 remove border radius when it's not both ends in panel 2014-01-19 06:43:57 +09:00
Chris Rebert d8c87ddc28 fix #12277 
Thanks to @Quy for pointing these out.
 2014-01-17 14:28:01 -08:00
Mark Otto 380019ccb2 Split box-sizing reset for faster rendering 2014-01-16 20:00:28 -08:00
Chris Rebert b2e88d1359 add & use @modal-md Less var for uniformity 2014-01-15 18:53:22 -08:00
Chris Rebert b121207e10 refactoring: add & use .bg-variant() mixin 2014-01-15 18:21:56 -08:00
Chris Rebert b886fd2f01 refactoring: add & use .text-emphasis-variant() mixin 2014-01-15 18:07:22 -08:00
Mark Otto 413c8a6da5 Fixes #12210: badges in xs buttons 2014-01-14 21:44:38 -08:00
Mark Otto f4dd6221d4 Merge branch 'responsive-embed' of https://github.com/boulox/bootstrap into boulox-responsive-embed 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
 2014-01-13 20:01:54 -08:00
Chris Rebert 4787a69efb fix #12154 2014-01-12 13:51:03 -08:00
Mark Otto 3a8e99e91e Fixes #12171: Ensure panel groups have a bottom margin since we nuke it on child panels 2014-01-10 18:56:44 -08:00
Chris Rebert c6a5e6accb rm outdated `<select>` references from comments in forms.less 2014-01-10 14:34:25 -08:00
Mark Otto 7f153974e1 Fixes #11990 and #12159: Make range inputs block level and 100% wide by default 2014-01-09 18:07:14 -08:00
Chris Rebert 82eccef7e3 mixins.less: fix typo in comment 2014-01-09 13:45:10 -08:00
thomaswelton 04ba67d6f1 Add new varaible @icon-font-svg-id and set it to be the correct SVG font ID, used new variable in glyphicons.less 2014-01-09 10:16:27 +00:00
Chris Rebert db829f8620 add support for '//===' for <h3>s in bs-lessdoc 2014-01-08 12:41:51 -08:00
Chris Rebert 39861714a8 Use JS & Jade to generate the customizer variables form HTML from variables.less; fixes #11095 
also updates variables file organization (courtesy @mdo)
 2014-01-08 12:41:51 -08:00
Julian Thilo 8fd177bfa7 Fix #12073: Consistent order of variations 
This changes the order of component variations throughout the repo (code and docs) to be more consistent.
The order now used everywhere is the one most frequently found in the repo before:
Default, Primary, Success, Info, Warning, Danger
 2014-01-07 22:24:45 +01:00
Chris Rebert 9fa2c95d78 make CSSLint happier; refs #12094 2014-01-05 21:29:26 -08:00
Zlatan Vasović 78eb8cc0f4 Replace @screen-sm with @screen-sm-min 2014-01-05 11:38:26 +01:00
Mark Otto 50cf0b1a9d Update Gruntfile.js to copy 'dist/' files to 'docs/dist/' with 'grunt dist' task; Fixes #12030: navbar toggle focus state 2013-12-31 18:23:10 -08:00
Mark Otto ac3f48bb19 Fixes #12046: move .csscomb.json and .csslintrc to less/ folder 2013-12-31 13:16:28 -08:00
Fabien 29e495f03c Add Embed responsive utility 2013-12-30 05:52:00 +01:00
Môshe van der Sterre dd9c5fdb08 Small fix: I noticed the use of a deprecated variable. This seems to be the only occurrence. 2013-12-27 21:27:51 +01:00
Chris Rebert 67271a18ac add @navbar-collapse-max-height Less variable 2014-01-21 10:23:57 -08:00
Mark Otto 04ec4354ed don't roll back that comment 2013-12-24 12:18:53 -08:00
Mark Otto 679c786237 roll back version numbers to avoid broken links in docs and readme (fixes #12000) 2013-12-24 12:16:17 -08:00
Supergibbs f3ce6a9696 Fixes #10492 better: 
- Made more generic. Applies to "> .table" and "> .table-responsive > .table" to support td/tr background colors too and not just .table-striped
- Supports tfoot
 2013-12-23 16:07:55 -08:00
Mark Otto 9fc0e20381 Fixes #10492 and some of #11970: round the proper corner on table cells in panels 2013-12-22 22:31:13 -08:00
Tobias Lindig 7f599cedf3 add new variables for "pagination" to improve support of customizing 2013-12-20 17:06:53 +01:00
Mark Otto 2854c5c3fb Fixes #11952: Refactor blockquote styles 
* Deprecate .pull-right class for .blockquote-reverse
* Move font-size change to the parent, blockquote, instead of setting on the p element to allow more flexible content
 2013-12-19 19:40:08 -08:00
dzwillia d9586e2863 Added position: static to table th and td. 2013-12-19 00:10:58 -05:00
Mark Otto 324f6ca562 buttons should be more mixin friendly 2013-12-18 14:29:33 -08:00
Mark Otto ab740f0f0f navbars need to use prefixed nav class or they won't work as expected 2013-12-18 14:28:03 -08:00
Mark Otto 3416e87a97 restore inline block on breadcrumbs and ensure proper code formatting for readibility 2013-12-18 14:27:21 -08:00
Julian Thilo 2b312bf3c1 Revert commits 
Bootstrap is being relicensed from Apache 2.0 to MIT so that more of our community can use the free and open source software we lovely create together. As commits are copyright their original authors, the commits of any individual not agreeing to relicense their contributions are being removed to be later rewritten by the @twbs/team.

This undoes the changes introduced by the following commits:
7ea34ae0ef , 7376eef378 , 303ba1326b , 7d1c8c2a0c , 11319f6da9 , 110fc88601 , ced08f6935
 2013-12-18 22:58:13 +01:00
Mark Otto d15218a09c Fixes #11899: Ensure proper margins and .small/small usage for heading tags (e.g., .h1-.h6) 2013-12-18 09:49:05 -08:00
Sebastian Podjasek ae640d4f1c Fix handling of btn-group placed inside input-group-btn (used for mixing dropdowns with normal buttons) 2013-12-16 22:56:28 +01:00
Chris Rebert 637b20f6d5 minor refactoring of 4ee93c9f85 2013-12-15 20:56:23 -08:00
Chris Rebert be508e043c copyediting 2013-12-15 18:13:50 -08:00
Mark Otto 4ee93c9f85 Fixes #10492 again, this time for last row's corners on striped tables 2013-12-15 17:22:55 -08:00
Mark Otto 2979e4bcea Add new form feedback states, clean up existing form styles 
New stuff:

* Adds `.has-feedback` and `.form-control-feedback` to show icon-based
form feedback to users. Fixes #11836.
* Removes the `width: 1em` on `.glyphicon` because it makes it
impractical to resize the width of all icons, even if they’re not
“empty” (e.g., a simple `.glyphicon { width: 30px; }` wouldn’t work,
nor would a class preceeded by a parent class.

Clean up:

* Sets `width: auto;` on all `.form-control`s within inline forms.
* Removes all the inline `select` menu `width` styles because all
inputs are now `auto`.
* Update form states docs to separate out sections better.
 2013-12-15 17:15:09 -08:00
Mark Otto d9345ff7d5 Fixes #11266: Apply a pixel-based line-height to date inputs for iOS 7 2013-12-15 15:27:46 -08:00
Mark Otto 4f22670c6e formatting and comment 2013-12-15 15:24:52 -08:00
Mark Otto d1f15baa71 Merge branch 'master' into pr/11817 
Conflicts:
	dist/css/bootstrap.min.css
	less/input-groups.less
 2013-12-15 15:07:38 -08:00
Mark Otto b04a1de9b0 Fixes #11402: Updated fix for select.form-control width in inline-forms 2013-12-15 14:52:49 -08:00
Mark Otto 6bc7126643 Merge pull request #11494 from blowsie/patch-2 
Fixed single dropdown-toggle in btn-group-veritcal not being rounded
 2013-12-15 14:28:49 -08:00
Mark Otto 393d523cdb Fixes #11660: Depcreate small and .small in blockquote in favor of footer 2013-12-15 14:23:55 -08:00
Mark Otto f5c13a3e1b revert an earlier change to move the component-animations.less file because it fubared modal backdrop .fade usage 2013-12-15 14:14:09 -08:00
Mark Otto 122245fe87 Merge branch 'master' into pr/11676 
Conflicts:
	less/modals.less
 2013-12-15 14:10:48 -08:00
Mark Otto f126411735 Merge pull request #11840 from ZDroid/pagination-boom 
Improve pager customization
 2013-12-15 13:46:11 -08:00
Mark Otto c7c9929c12 Fixes #11770: Move component-animations.less to the utility section of import list to match Customizer 2013-12-15 12:31:40 -08:00
Mark Otto a7029edc61 Restyle the blockquote to not thin text or change line-height 2013-12-15 11:29:58 -08:00
Mark Otto 2b86e05a61 Change variable 2013-12-15 11:09:03 -08:00
Mark Otto bc261ecc52 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-15 11:02:45 -08:00
Mark Otto a319ec5b7d Fixes #11829: Adds .make-xs-column mixins 2013-12-15 11:02:32 -08:00
Mark Otto 2ea370f93b Merge pull request #11861 from freeman/master 
Issue #11852 : create a new variable for the list group active item link...
 2013-12-15 10:59:23 -08:00
Mark Otto ad782ff89a comments and spacing 2013-12-15 10:53:53 -08:00
Mark Otto 82c52a7e9d Fixes #11801: use correct variables for grid containers 2013-12-15 10:38:54 -08:00
Mark Otto 168469f545 Fixes #11588: Scope font-size to only p elements in a .jumbotron and remove the supersized line-height from the base class 2013-12-14 21:50:47 -08:00
Mark Otto 647e9eb0f1 Fixes #11555: Add `@tooltip-opacity` variable 2013-12-14 21:43:08 -08:00
Mark Otto 072ccd4dda Fixes #11572: Add contextual background-color classes to match text classes; move both sets of classes to Helper Classes section of the CSS docs 2013-12-14 21:40:16 -08:00
Mark Otto 432b9f9cde Fixes #11561: Add float: left; to .form-control within input groups to prevent IE9 from screwing up placeholder text and select menu arrows 2013-12-14 20:04:12 -08:00
Mark Otto e98c2dc3ad Merge pull request #11326 from ZDroid/animations 
Add `.animation-*()` mixins
 2013-12-14 18:58:41 -08:00
Mark Otto 46c3d27468 Merge branch 'master' into pr/11435 
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css
 2013-12-14 16:56:56 -08:00
Mark Otto 4c64c1eecd Merge branch 'master' into pr/11302 
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css
 2013-12-14 16:46:40 -08:00
Mark Otto 323a40cc53 Merge branch 'master' into pr/11162 
Conflicts:
	less/modals.less
 2013-12-14 16:29:47 -08:00
Mark Otto 83c60ef3ee Merge branch 'master' into pr/11107 
Conflicts:
	docs-assets/js/raw-files.js
 2013-12-14 16:20:19 -08:00
Mark Otto 4afcebe0e7 Merge pull request #11286 from BBosman/well-border 
Add well-border variable
 2013-12-14 16:17:41 -08:00
Mark Otto 544b8ecab7 Fixes #10921: Add support for input groups within button toolbars 
* Floats any `.input-group` within a toolbar
* Simplifies the CSS to remove sibling selectors and instead use a
negative amrgin on the parent with only `margin-left`

See it in action: http://jsbin.com/aGEcUqAT/1/.
 2013-12-14 16:03:21 -08:00
Mark Otto a54dbfdf2a Merge branch 'master' into pr/10951 
Conflicts:
	dist/css/bootstrap.min.css
	less/modals.less
 2013-12-14 15:38:21 -08:00
Mark Otto 11c6ab767c Fixes #10370: Improved and deprecated dropdown menu alignment options 
* Removes an old pair of selectors that didn’t properly target the
right-aligned navbar alignment of dropdown menus.
* Deprecates the `.pull-right` alignment in favor of a more specific
and unique class name.
* Adds `.dropdown-menu-right` as the new alignment class. This is then
mixin-ed into the `.navbar-right.navbar-nav` dropdown menus for
auto-alignment.
* To override that auto-alignment, use `.dropdown-menu-left` as needed.
 2013-12-14 13:22:56 -08:00
Mark Otto 914f5e6a1d Fixes #11867: Add `@panel-body-padding` variable 2013-12-14 11:44:54 -08:00
Mark Otto ecc6f4e6bc Merge branch 'master' into pr/11868 
Conflicts:
	dist/css/bootstrap.min.css
 2013-12-14 11:36:54 -08:00
Mark Otto 22820d7151 Fixes #10495: Float Glyphicon and set margins in .navbar-brand to ensure there is no added height because wtf even is CSS 2013-12-13 23:06:04 -08:00
Chris Rebert de6b9e9df1 Merge pull request #11874 from ZDroid/hotfix 
';' isn't needed
 2013-12-13 14:31:15 -08:00
Zlatan Vasović e3d799fca3 ';' isn't needed 2013-12-13 23:15:02 +01:00
Tobias Lindig b7bf212995 use @zindex-modal for .modal and @zindex-modal-background for .modal-backdrop. 
removed z-index for .modal-dialog, it was not necessary because the parent element (.modal) already has a z-index.
 2013-12-13 12:24:20 +01:00
Mark Otto 5f9ecc7351 -ms-transform is for IE9 only, IE10+ don't require it 2013-12-12 23:01:11 -08:00
Mark Otto 0e6d34f24f Merge pull request #11819 from janpanschab/ms-transform-origin 
Transform-origin mixin for IE
 2013-12-12 22:59:08 -08:00
mrasscha ce39cbe6fa Issue #11852 : create a new variable for the list group active item link text. 2013-12-12 20:48:08 +01:00
dzwillia 4b47c60835 Added @dropdown-caret-color variable back to variables.less (deprecated) 2013-12-12 12:53:59 -05:00
Mark Otto bdd0890c0f Merge pull request #11841 from ZDroid/breadcrumbs 
Use variables for breadcrumb padding
 2013-12-11 10:48:51 -08:00
Zlatan Vasović 2547f1e20f Use variables for breadcrumb padding 2013-12-11 14:36:26 +01:00
Zlatan Vasović 27859f6b8f Improve pager customization 2013-12-11 14:25:21 +01:00
Jan Panschab 3e0366a3df transform origin mixin for explorer 2013-12-10 17:15:41 +01:00
Tobias Lindig 3b5e0c9a3c hide space characters in input-group-btn to fix segmented buttons double border 2013-12-10 16:47:12 +01:00
Chris Rebert ab29b1a335 misc strictMath compliance fixes 2013-12-09 16:14:44 -08:00
Chris Rebert 9664f8da58 add parens around arithmetic in recursive mixin calls to comply with LESS strictMath 
<3 @seven-phases-max for helping to confirm & debug this
X-Ref: https://github.com/less/less.js/issues/1725
 2013-12-09 16:02:24 -08:00
Chris Rebert 10e74a94e6 improve compliance with LESS's strictMath 2013-12-09 15:35:13 -08:00
Mark Otto 25ec09f06a Merge pull request #11790 from twbs/drop_recess_for_less 
Drop grunt-recess for grunt-contrib-less
 2013-12-09 11:30:10 -08:00
Chris Rebert 9ceff60057 more nesting in .list-group-item-variant mixin 2013-12-08 23:34:24 -08:00
Mark Otto 0016c17f93 Switch to `&:extend(.clearfix all)` for clearfix mixin 
Original discussion:
https://github.com/less/less.js/issues/1437#issuecomment-21383639.

Since we’re switching to `grunt-contrib-less`, we can take advantage of
newer LESS features than what RECESS supported. Included in that is the
ability to `:extend`, and not only that, but `:extend(.mixin-name
all)`. By doing so, we remove duplicate CSS for all our elements that
were being clearfix-ed.

Fixes #8947, #8968, #8991, #9257, #9268, #9291, #9430, #9604, #9686,
#9929, #10731, #10793, #11305, #11498, #11533, #11570, #11604, #11652.

(dem issues, tho)
 2013-12-08 23:18:28 -08:00
Mark Otto 6df909ad9b Fixes #11786: Nest media queries within print utilities for mixin-friendliness 2013-12-08 19:19:06 -08:00
Zlatan Vasović 77bc82d486 Add `.animation-*()` mixins 2013-12-08 11:54:04 +01:00
Mark Otto 1f9bfa89dc Fixes #11741: Don't set headings font-family again, just use inherit 2013-12-08 02:14:24 -08:00
Mark Otto c37b710e85 Merge branch 'master' into pr/11744 
Conflicts:
	dist/css/bootstrap.min.css
 2013-12-08 02:00:37 -08:00
Mark Otto b5008ebf9c add vertical-align back to where it's necessary since we reset from block to inline-block on several inputs 2013-12-08 01:59:44 -08:00
Mark Otto e43e87b2f3 Merge pull request #11748 from bganicky/patch-1 
Updated .scale() mixin so that it accepts optional vertical scale factor...
 2013-12-08 01:49:38 -08:00
Mark Otto 12500047f9 Merge branch 'master' into pr/11750 
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css
 2013-12-08 01:45:42 -08:00
Mark Otto 6273604601 Add .container-fluid variation for full-width containers and layouts 
/cc #10711 #9862
 2013-12-07 20:52:51 -08:00
Mark Otto a9b86cbfde Merge branch 'pr/11138' 
Conflicts:
	dist/css/bootstrap.min.css
	dist/js/bootstrap.min.js
	docs-assets/js/raw-files.js
 2013-12-07 14:10:41 -08:00
Mark Otto 07de53c644 Contextual list group cleanup 
* Adds nav link to sidebar for contextual classes
* Refactors to use prefixed classes, like .list-group-item-info, instead of chained classes
* Adds default and linked variations to example in docs
 2013-12-07 14:09:03 -08:00
Mark Otto bfd8f8c83a Merge branch 'master' of github.com:twbs/bootstrap 2013-12-07 12:18:52 -08:00
Mark Otto b1215d1b2e Fixes #11193: Add kbd element styles to indicate user input via keyboard 2013-12-07 12:18:13 -08:00
Mark Otto a691d54436 Merge pull request #11675 from GraceNut/feature/text-justify 
Added text-justify class to type.less
 2013-12-07 11:58:31 -08:00