0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

2310 Commits

Author SHA1 Message Date
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