rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity
8,519 Commits 108 Branches 89 Tags 547 MiB
7b60470e9b
Commit Graph

2429 Commits

Author SHA1 Message Date
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
b01f995ad7 Merge pull request #12459 from rubenstolk/hotfix/mixins/scale 
Make both .scale(X) and .scale(X, Y) both work
 2014-02-21 17:36:47 -08:00
Mark Otto
c7b07a5644 Merge pull request #12742 from ZDroid/table-responsive-mixin 
Make .table-responsive usable as mixin
 2014-02-21 17:34:27 -08:00
Chris Kankiewicz
4dde96b674 Removed unnecessary top margin from .modal-footer 2014-02-20 14:27:19 -07:00
Zlatan Vasović
dfa5edca2c Make .table-responsive usable as mixin 2014-02-14 19:48:17 +01: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
b4ba964801 Merge pull request #12673 from tlindig/tl_popover_arrow_size 
use @popover-arrow-width for offset the popover
 2014-02-10 20:52:43 -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
Tobias Lindig
221ac861e4 use @popover-arrow-width for offset the popover to account for the popover arrow 2014-02-10 10:57:11 +01:00
Ruben Stolk
a843bfda18 Make both .scale(X) and .scale(X, Y) both work 2014-02-10 10:12:38 +05:30
Mark Otto
41841c99c4 Merge branch 'master' of github.com:twbs/bootstrap 2014-02-08 17:29:25 -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
2365717a3d Merge pull request #12433 from tagliala/list-inline-first-element-fix 
Fix first element padding of list-inline
 2014-02-08 16:59:59 -08:00
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
Geremia Taglialatela
0da527f169 fixed first element padding of list-inline 2014-01-30 14:55:19 +01: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