kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

fix .btn-group-xs portion of #10979

This commit is contained in:
Chris Rebert 2013-12-03 18:03:04 -08:00
parent bac153127c
commit 4a45650026
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;
}
.btn-sm,
.btn-xs {
.btn-sm {
padding: 5px 10px;
font-size: 12px;
line-height: 1.5;
@ -2632,6 +2631,9 @@ fieldset[disabled] .btn-link:focus {
.btn-xs {
padding: 1px 5px;
font-size: 12px;
line-height: 1.5;
border-radius: 3px;
}
.btn-block {
@ -3754,7 +3756,6 @@ input[type="button"].btn-block {
}
.btn-group-xs > .btn {
padding: 5px 10px;
padding: 1px 5px;
font-size: 12px;
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
.button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
}
.btn-sm,
.btn-xs {
.btn-sm {
// 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);
}
.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-horizontal: 10px;
@padding-xs-vertical: 1px;
@padding-xs-horizontal: 5px;
@line-height-large: 1.33;
@line-height-small: 1.5;