clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-25 04:27:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,527 Commits 116 Branches 89 Tags 628 MiB
072ccd4dda
Commit Graph

2287 Commits

Author SHA1 Message Date
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
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
Jan Panschab
3e0366a3df transform origin mixin for explorer 2013-12-10 17:15:41 +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
Mark Otto
fe58357df1 Fixes #10884: Adds .info variant to contextual table classes 2013-12-07 11:56:35 -08:00
Mark Otto
c07632e4e8 Reorder button and table variants for consistent order 2013-12-07 11:47:37 -08:00
Mark Otto
107b334d34 Fixes #11766: Use color var for background on badges in buttons to restore proper background to default button badge 2013-12-07 11:45:11 -08:00
XhmikosR
f4087df47e Remove incompatible properties. 2013-12-07 04:52:20 +02:00
Zlatan Vasović
78b43d4c99 Darken icon bar to meet WCAG 2013-12-06 22:34:29 +01:00
Luke Noel-Storr
b92bee99ef reverted changes in commit 96109d3 which seemed to break conditional classes in striped tables (ignoring the comment above that the previous rules were needed for just this purpose) 
fixes issue twbs/bootstrap#11728
 2013-12-06 14:11:58 +00:00
Bohdan Ganicky
9ce7e5620c Updated .scale() mixin so that it accepts optional vertical scale factor parameter. 2013-12-06 14:09:55 +01:00
Mark Otto
0a5aa8e0a3 Merge pull request #11714 from ZDroid/redundant-comment 
Remove redundant, duplicate comment
 2013-12-04 22:52:12 -08:00