2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-15 11:59:39 +03:00
Commit Graph

2103 Commits

Author SHA1 Message Date
Zlatan Vasović 0423635614 Ditch &, as + ... is enought 2013-10-15 17:35:11 +02:00
Chris Rebert a28d9539c7 fix #10952 2013-10-14 20:45:43 -07:00
Rogério Yokomizo e20b02ad0b extended hover state of linked versions of .thumbnail 2013-10-14 20:10:49 -03:00
Mark Otto fa64846acf Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	dist/css/bootstrap.min.css
2013-10-14 13:45:57 -07:00
Mark Otto 7100711577 unnest the list-group-item link variation for #11085 and #11088 2013-10-14 13:45:32 -07:00
Mark Otto 3fb1381a30 Merge pull request #11084 from ZDroid/variable_way
Unhardcode .table-responsive bottom margin
2013-10-14 11:33:27 -07:00
Chris Rebert 5c64ef393c fix .table-responsive media query; refs #11067 2013-10-14 10:58:12 -07:00
Zlatan Vasović 4ce1b08c32 Unhardcode .table-responsive bottom margin 2013-10-14 18:22:31 +02:00
Zlatan Vasović b3c04c95d3 Nuke trailing zeros 2013-10-14 15:06:58 +02:00
Mark Otto e7379f75bd no trailing decimal place 2013-10-13 20:04:28 -07:00
Mark Otto fbc67a395f Merge branch 'master' of github.com:twbs/bootstrap 2013-10-13 20:04:00 -07:00
Mark Otto 36b4639b0d Merge pull request #10949 from StevenBlack/jumbotron.fontsize
Jumbotron: remove the hard-coded font-size from jumbotron.less and moved...
2013-10-13 20:03:02 -07:00
Mark Otto be4e951b7d scope top padding of .form-control-static to be within horizontal forms only; fixes #10927 2013-10-13 20:02:24 -07:00
Mark Otto 44b32a3036 move .hidden to utilities; fixes #10997 2013-10-13 19:59:42 -07:00
Mark Otto 5a411af967 Merge branch 'master' of github.com:twbs/bootstrap 2013-10-13 19:57:23 -07:00
Mark Otto f946ff5d25 fix #10257 2013-10-13 19:57:14 -07:00
Mark Otto 7112d06a2b Merge pull request #10955 from ZDroid/patch-1
Insert comma to fix validation warning
2013-10-13 19:41:12 -07:00
Mark Otto bf73f1f9d3 Merge branch 'master' into restore_grid_mixins
Conflicts:
	dist/css/bootstrap.min.css
2013-10-13 18:59:40 -07:00
Mark Otto 6351c30782 comment and spacing 2013-10-13 18:58:09 -07:00
Mark Otto 6085973e25 drop .tabbable since it's unused and undocumented /cc #10102 2013-10-13 18:56:31 -07:00
Mark Otto 265fda7903 Merge branch 'master' into restore_grid_mixins
Conflicts:
	dist/css/bootstrap.min.css
2013-10-13 18:32:34 -07:00
Mark Otto 590975b407 remove undocumented and unsupported .pill-content and .pill-pane /cc #10102 2013-10-13 15:55:13 -07:00
Mark Otto 570aa8a309 Merge pull request #11059 from ZDroid/patch-5
Add more functionality to .small to match <small>
2013-10-12 16:58:49 -07:00
Mark Otto d82650102c Merge pull request #10933 from ZDroid/patch-2
Change border to border-radius
2013-10-12 15:35:07 -07:00
Zlatan Vasović 8098f4e5ba Add more functionality to .small 2013-10-12 23:28:50 +02:00
Mark Otto c814ad1833 Combine separate efforts for grid mixins into one, cleanup and reorganize 2013-10-11 22:00:37 -07:00
Mark Otto 352532cd63 Half fix for #9855: Don't fuck with margins for open modal dialog on account of Lion non-scrollbars and inconsistencies elsewhere 2013-10-07 14:39:11 -05:00
Mark Otto 1adbe2043a Fixes #10959: round the .lead values down to nearest pixel via floor() 2013-10-07 14:32:23 -05:00
Steven Black 0740d01b4c Good catch by @juthilo - omitted the modified in a prior commit. 2013-10-05 20:48:28 -04:00
Steven Black 4b27c08783 The Jumbotron font-size LESS variable now conforms to the '@{bootstrapClass}-font-size' naming scheme. 2013-10-05 18:37:53 -04:00
Zlatan Vasović b1cc07fa15 Insert comma to fix validation warning
BS doesn't support IE6/IE7, so comma can be inserted.
2013-10-05 20:14:19 +02:00
Steven Black 38941881e9 Jumbotron: remove the hard-coded font-size from jumbotron.less and moved it into variables.less where other .font-size-xxxxx things now live. 2013-10-04 21:43:31 -04:00
Zlatan Vasović 6f9d980139 Change border to border-radius
Border isn't set, but border-radius is.
2013-10-03 23:15:49 +02:00
Tobias Lindig 70453c2327 unify button sizing, use mixin ".button-size" also for the base sized button 2013-10-03 10:43:35 -07:00
Chris Rebert 2d0f5565ab re-sort affected .glyphicon-* classes by new codepoints 2013-09-23 22:43:48 -07:00
Chris Rebert b160e61451 Update affected .glyphicon-* CSS classes to use new codepoints
.glyphicon-briefcase: U+1F4BC -> U+E139
.glyphicon-calendar:  U+1F4C5 -> U+E109
.glyphicon-pushpin:   U+1F4CC -> U+E146
.glyphicon-paperclip: U+1F4CE -> U+E142
.glyphicon-camera:    U+1F4F7 -> U+E046
.glyphicon-lock:      U+1F512 -> U+E033
.glyphicon-bell:      U+1F514 -> U+E123
.glyphicon-bookmark:  U+1F516 -> U+E044
.glyphicon-fire:      U+1F525 -> U+E104
.glyphicon-wrench:    U+1F527 -> U+E136
2013-09-23 22:43:48 -07:00
Chris Rebert c4e7e3c933 deprecate .hide; fixes #10446 2013-09-23 12:46:57 -07:00
Mark Otto 8a181a1388 Merge pull request #10695 from FredericoC/fix-nav-active-caret
Fixed issue where caret wouldn't inherit "active" li style on nav-pills
2013-09-22 16:53:01 -07:00
Mark Otto 5b12736fb7 Merge pull request #10741 from ZDroid/patch-1
Avoid LESS nesting if isn't needed
2013-09-22 07:25:33 -07:00
Mark Otto ed44a3255c Merge branch 'master' of github.com:twbs/bootstrap 2013-09-22 09:20:15 -05:00
Mark Otto 000b445a04 Fixes #10755: Don't remove quotes around q element by default 2013-09-22 09:19:37 -05:00
Zlatan Vasović dc3d16648c @headingsColor → @headings-color 2013-09-21 14:19:11 +02:00
Zlatan Vasović 2304ba6a25 Avoid LESS nesting if isn't needed 2013-09-20 18:06:48 +02:00
Mark Otto e148923f27 Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	dist/css/bootstrap.min.css
2013-09-19 22:57:11 -05:00
Mark Otto ef636bd62d Fixes #10694: Remove unnecessary content property from .caret 2013-09-19 22:56:17 -05:00
XhmikosR 60afea85b4 less/mixins.less: tabs to spaces. 2013-09-18 08:14:19 +03:00
XhmikosR 0cd6d35058 Update normalize to v2.1.3. 2013-09-18 08:05:34 +03:00
Frederico Carvalho 29f24f746c corrected caret colour when a nav dropdown is open 2013-09-18 14:45:56 +10:00
Frederico Carvalho b1208f380a fixed issue where caret wouldn't inherit "active" li style on nav-pills, which caused the caret to stay blue 2013-09-18 14:31:52 +10:00
Mark Otto f2750dd6bc Merge pull request #10626 from buob/variablize-nav-pill-border-radius
Variablize nav pill border radius
2013-09-16 22:00:39 -07:00