diff options
| author | Mark Otto <[email protected]> | 2013-12-03 22:58:25 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-03 22:58:25 -0800 |
| commit | a42e9163cbf6dcdd72a004a4a7c2b787478e18b0 (patch) | |
| tree | 6ba50185884ca0a425d7185ac63949102d96002e /less | |
| parent | 303f8a33c354b5c8f6132574de55114b8f39a1f1 (diff) | |
| parent | ed0d556847a7a1168a05a6a71f8f1af23139327b (diff) | |
| download | bootstrap-a42e9163cbf6dcdd72a004a4a7c2b787478e18b0.tar.xz bootstrap-a42e9163cbf6dcdd72a004a4a7c2b787478e18b0.zip | |
Merge branch 'master' into responsive-visibility-table
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'less')
| -rw-r--r-- | less/buttons.less | 5 | ||||
| -rw-r--r-- | less/variables.less | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/less/buttons.less b/less/buttons.less index ee6f6612a..0a484ead2 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -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); } diff --git a/less/variables.less b/less/variables.less index 120a65e06..1775be080 100644 --- a/less/variables.less +++ b/less/variables.less @@ -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; |