0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Commit Graph

440 Commits

Author SHA1 Message Date
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
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
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
Mark Otto
44fc629d44 Fix #12353: Scope table border reset in panels to first-child rows 2014-01-23 22:52:26 -06: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
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
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
Mark Otto
99b66c1f2c grunt dist 2014-01-09 18:06:46 -08:00
Chris Rebert
fc62379e61 grunt dist 2014-01-09 11:11:13 -08:00
Chris Rebert
72ff8ff9fb grunt dist 2014-01-08 18:39:08 -08:00
Chris Rebert
bf5017c01c fix #12143 2014-01-07 17:08:40 -08:00
Mark Otto
a9c829bc0c Rearrange repository contents because muahahahahahaha 2013-12-28 22:47:03 -08:00
Mark Otto
2115ac525b Run grunt dist after adding 'a' requirement to the text emphasis classes 2014-01-18 14:40:48 -08:00
Mark Otto
7b42103df6 kill bottom margin on last docs section 2014-01-18 11:33:50 -08:00
Mark Otto
380019ccb2 Split box-sizing reset for faster rendering 2014-01-16 20:00:28 -08:00
fat
3b2418e688 remove flaky pos bottom test which is effect by unit scroll pos 2014-01-16 13:44:08 -08:00
Mark Otto
413c8a6da5 Fixes #12210: badges in xs buttons 2014-01-14 21:44:38 -08:00