From: ggam Date: Mon, 12 Aug 2013 12:07:19 +0000 (+0200) Subject: Added button-size mixin X-Git-Tag: v3.0.0-rc.2~44^2^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9373%2Fhead;p=thirdparty%2Fbootstrap.git Added button-size mixin --- diff --git a/less/buttons.less b/less/buttons.less index 8dc05e824c..e355153581 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 e58e602d38..63196448f4 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -394,6 +394,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) {