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

70 Commits

Author SHA1 Message Date
Mark Otto
17e41098c8 Fixes #12824: Remove white-space: nowrap from code elements 2014-03-06 20:39:19 -08:00
Mark Otto
8526adf69c grunt 2014-03-06 20:33:10 -08:00
Mark Otto
10eb167e35 Fixes #12901: Refactors list group active state for use on non-anchors 2014-03-04 22:42:13 -08:00
Mark Otto
24de9b0994 Fixes #12848: Account for and document progress bars at 0-3% 2014-03-04 16:55:15 -08:00
Mark Otto
026e2f8d30 Grunt after merging #12863 2014-03-04 14:24:09 -08:00
Mark Otto
7733f24373 Fixes #12868: Enables icon feedback on validation states for large/small inputs.
Also reorders the CSS to place Glyhpicons as a dependency before other components for fewer overrides and less specific CSS.
2014-03-04 14:12:57 -08:00
Mark Otto
f45df64670 Fixes #12914: Darken immediate children hr elements in jumbotrons 2014-03-04 13:54:09 -08:00
Mark Otto
1399497a02 grunt 2014-03-04 00:30:40 -08:00
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
XhmikosR
e5affbfa0a Run grunt. 2014-03-01 20:58:53 +02:00
XhmikosR
c48042f440 Run grunt dist. 2014-02-26 01:23:52 +02:00
Mark Otto
429fc9331e grunt dist 2014-02-24 19:10:23 -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
Mark Otto
4b622c60c1 grunt 2014-02-21 17:42:25 -08:00
Mark Otto
385fb68981 grunt 2014-02-13 08:59:03 -08:00
Mark Otto
88fdd45427 v3.1.1 bump 2014-02-13 01:12:26 -08: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
728067b586 Update Glyphicons 2014-02-10 21:28:05 -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
Mark Otto
769339ed18 grunt dist 2014-02-08 17:30:40 -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
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
3fc7a4cffa grunt with new mixins 2014-02-08 16:31:42 -08:00
Mark Otto
26e2d7cdc9 grunt 2014-02-08 16:13:30 -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
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
3ccc16cad0 grunt for days 2014-02-07 02:24:37 -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
ace0abfdb6 Merge branch 'master' into thumbnail-extend
Conflicts:
	dist/css/bootstrap.css
2014-02-06 18:52:03 -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
00cb50a41a grunt dist--includes changes from #12025 and decimal changes, likely from a change in dependencies 2014-02-04 19:27:25 -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
ec6c9d2824 Don't offset customizer alert, grunt dist 2014-02-04 00:18:34 -08:00
Mark Otto
58bf3f9432 grunt after last commits 2014-01-31 13:40:32 -08: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
a9a4d81730 grunt 2014-01-28 10:08:40 -08:00