rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Code Issues Actions Packages Releases Activity
8,422 Commits 108 Branches 89 Tags 552 MiB
13b4e7a1a8
Commit Graph

2409 Commits

Author SHA1 Message Date
Mark Otto
65b10706b3 brace position 2014-02-08 16:56:59 -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
b6444c6472 Merge pull request #12552 from stoudenmire/carousel-icon-classname-fix 
Fixes two typos in carousel.less
 2014-02-08 16:03:25 -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
Zlatan Vasović
4c16360036 Fix #12656: add @blockquote-font-size 2014-02-08 22:12:18 +01: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
da43f97be1 Override iOS search input's extra round corners 2014-02-07 02:08:32 -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
b124c4a6a4 Merge pull request #12620 from twbs/thumbnail-extend 
use :extend in thumbnail Less
 2014-02-06 19:32:31 -08:00
Mark Otto
42d7479dbf Merge pull request #12502 from ZDroid/moz 
Remove redundant :-moz-placeholder styles
 2014-02-06 19:31:29 -08:00
Mark Otto
ace0abfdb6 Merge branch 'master' into thumbnail-extend 
Conflicts:
	dist/css/bootstrap.css
 2014-02-06 18:52:03 -08:00
Chris Rebert
7c1511502e use :extend(.img-responsive) in Carousel's Less 2014-02-06 15:52:26 -08:00
Chris Rebert
fda8d91c86 use :extend in thumbnail Less 2014-02-06 15:42:54 -08:00
Chris Rebert
37c21a3ac7 use Less' extend feature in btn-group-lg etc. 2014-02-06 10:59:04 -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
45e65eef3d Merge pull request #12025 from ZDroid/clean-visibility-mess 
Fix #12015 and minify styles
 2014-02-04 18:29:05 -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
266a2e11e0 Merge pull request #12533 from 1000hz/tighten-popover-arrows-scope 
Scope popover arrow css to direct descendant
 2014-02-03 23:40:52 -08:00
Chris Rebert
149c4be726 die tabs, die! 2014-02-03 10:02:58 -08:00
stoudenmire
a484b3bd7a fixed two typos in carousel.less 
carousel.less has two typos in glyphicon classnames. fixed them.
 2014-02-03 16:24:07 +01:00
Cina S
847adb7dad Tightening up popover arrow css scope to apply only to direct descendant arrows. 2014-02-02 16:14:22 -06:00
Zlatan Vasović
1e09a9d1d7 Remove redundant :-moz-placeholder styles 
No need for old Firefox versions support.
 2014-02-01 14:20:41 +01:00
Chris Kankiewicz
22e576c600 Fix issue causing .navbar-brand element height to be shorter than .navbar height 2014-01-30 14:59:54 -07: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
493d143cbd v3 instead of rc1 2014-01-28 10:07:33 -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
16fd8cd01e Merge pull request #12398 from twbs/deprecate-box-shadow-mixin 
mark .box-shadow() mixin as deprecated
 2014-01-26 19:15:31 -08:00
Chris Rebert
1a36e4fa1e docs & comments: v3.1 => v3.1.0 2014-01-26 17:48:15 -08:00
Chris Rebert
602e5f8f11 mark .box-shadow() mixin as deprecated; fixes #12396 2014-01-26 17:44:01 -08:00
Alan Hamlett
e38fd138ce fixes #10495 by forcing .navbar-brand height to prevent it's inner content from increasing navbar height 2014-01-25 21:40:56 -08:00
Mark Otto
4b2fe3f96f Merge branch 'master' of github.com:twbs/bootstrap 2014-01-24 11:56:04 -06: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
Chris Rebert
f1c1469b83 Merge pull request #12357 from twbs/border-box-note 
add note in Less source about global `box-sizing: border-box;`
 2014-01-23 20:57:45 -08:00
Mark Otto
44fc629d44 Fix #12353: Scope table border reset in panels to first-child rows 2014-01-23 22:52:26 -06:00
Chris Rebert
b30cff4888 Add ref in Less to docs regarding box-sizing conflicts 
Refs #12351
 2014-01-23 20:51:23 -08:00
Chris Rebert
31e8a48783 "bottom increment" => "decrement" in explanatory comment 2014-01-23 15:07:04 -08: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
833c208bf5 Merge branch 'master' of github.com:twbs/bootstrap 2014-01-22 21:20:06 -06:00
Mark Otto
1e1af8687d Merge pull request #12250 from twbs/rm-print-margins 
remove default left-right print margins per upstream h5bp change
 2014-01-22 19:18:24 -08:00