rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-18 15:54:26 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #11697 from twbs/btn-xs-10979

Browse Source 
fix .btn-group-xs portion of #10979
This commit is contained in:
Mark Otto 2013-12-03 22:55:11 -08:00
commit ed0d556847
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dist/css/bootstrap.css vendored
View File

@ -2622,8 +2622,7 @@ fieldset[disabled] .btn-link:focus {
border-radius: 6px; border-radius: 6px;
} }
.btn-sm, .btn-sm {
.btn-xs {
padding: 5px 10px; padding: 5px 10px;
font-size: 12px; font-size: 12px;
line-height: 1.5; line-height: 1.5;
@ -2632,6 +2631,9 @@ fieldset[disabled] .btn-link:focus {
.btn-xs { .btn-xs {
padding: 1px 5px; padding: 1px 5px;
font-size: 12px;
line-height: 1.5;
border-radius: 3px;
} }
.btn-block { .btn-block {
@ -3754,7 +3756,6 @@ input[type="button"].btn-block {
} }
.btn-group-xs > .btn { .btn-group-xs > .btn {
padding: 5px 10px;
padding: 1px 5px; padding: 1px 5px;
font-size: 12px; font-size: 12px;
line-height: 1.5; line-height: 1.5;

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

5
less/buttons.less
View File

@ -122,13 +122,12 @@
// line-height: ensure even-numbered height of button next to large input // line-height: ensure even-numbered height of button next to large input
.button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large); .button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
} }
.btn-sm, .btn-sm {
.btn-xs {
// line-height: ensure proper height of button next to small input // line-height: ensure proper height of button next to small input
.button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small); .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
} }
.btn-xs { .btn-xs {
padding: 1px 5px; .button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @border-radius-small);
} }

3
less/variables.less
View File

@ -84,6 +84,9 @@
@padding-small-vertical: 5px; @padding-small-vertical: 5px;
@padding-small-horizontal: 10px; @padding-small-horizontal: 10px;
@padding-xs-vertical: 1px;
@padding-xs-horizontal: 5px;
@line-height-large: 1.33; @line-height-large: 1.33;
@line-height-small: 1.5; @line-height-small: 1.5;