diff options
| author | Mark Otto <[email protected]> | 2013-08-12 10:40:56 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-12 10:40:56 -0700 |
| commit | ddd13dc100db6a51dac927bcc884e1a8de5b35c0 (patch) | |
| tree | 156476f99c71619cfc5b2056472a654a718a21c3 /less | |
| parent | 3d11e6dedf0174e2124985828f64c6fe68c874f6 (diff) | |
| parent | 6993db1840561e89dd772302d5b3d567bc92f033 (diff) | |
| download | bootstrap-ddd13dc100db6a51dac927bcc884e1a8de5b35c0.tar.xz bootstrap-ddd13dc100db6a51dac927bcc884e1a8de5b35c0.zip | |
Merge pull request #9373 from ggam/button-sizes
Added button-size mixin
Diffstat (limited to 'less')
| -rw-r--r-- | less/buttons.less | 12 | ||||
| -rw-r--r-- | less/mixins.less | 9 |
2 files changed, 13 insertions, 8 deletions
diff --git a/less/buttons.less b/less/buttons.less index 1527a5fa0..e5c287fd7 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -121,17 +121,13 @@ // -------------------------------------------------- .btn-lg { - padding: @padding-large-vertical @padding-large-horizontal; - font-size: @font-size-large; - line-height: @line-height-large; // ensure even-numbered height of button next to large input - border-radius: @border-radius-large; + // 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 { - padding: @padding-small-vertical @padding-small-horizontal; - font-size: @font-size-small; - line-height: @line-height-small; // ensure proper height of button next to small input - border-radius: @border-radius-small; + // 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: 3px 5px; diff --git a/less/mixins.less b/less/mixins.less index 309868251..d6162f374 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -384,6 +384,15 @@ } } +// Button sizes +// ------------------------- +.button-size(@padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) { + padding: @padding-vertical @padding-horizontal; + font-size: @font-size; + line-height: @line-height; + border-radius: @border-radius; +} + // Labels // ------------------------- .label-variant(@color) { |