From 83293516b6b1785e8f57dc26b9023f26cd7a89a1 Mon Sep 17 00:00:00 2001
From: ggam <ggam@brainleakage.com>
Date: Mon, 12 Aug 2013 13:55:09 +0200
Subject: [PATCH 1/2] Renamed btn-pseudo-states mixin to btn-variant for
 consistency

---
 less/buttons.less | 12 ++++++------
 less/mixins.less  |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/less/buttons.less b/less/buttons.less
index 8dc05e824c..1527a5fa08 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -54,26 +54,26 @@
 // --------------------------------------------------
 
 .btn-default {
-  .btn-pseudo-states(@btn-default-color; @btn-default-bg; @btn-default-border);
+  .button-variant(@btn-default-color; @btn-default-bg; @btn-default-border);
 }
 .btn-primary {
-  .btn-pseudo-states(@btn-primary-color; @btn-primary-bg; @btn-primary-border);
+  .button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border);
 }
 // Warning appears as orange
 .btn-warning {
-  .btn-pseudo-states(@btn-warning-color; @btn-warning-bg; @btn-warning-border);
+  .button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border);
 }
 // Danger and error appear as red
 .btn-danger {
-  .btn-pseudo-states(@btn-danger-color; @btn-danger-bg; @btn-danger-border);
+  .button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border);
 }
 // Success appears as green
 .btn-success {
-  .btn-pseudo-states(@btn-success-color; @btn-success-bg; @btn-success-border);
+  .button-variant(@btn-success-color; @btn-success-bg; @btn-success-border);
 }
 // Info appears as blue-green
 .btn-info {
-  .btn-pseudo-states(@btn-info-color; @btn-info-bg; @btn-info-border);
+  .button-variant(@btn-info-color; @btn-info-bg; @btn-info-border);
 }
 
 
diff --git a/less/mixins.less b/less/mixins.less
index e58e602d38..7bd2acc45f 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -362,11 +362,11 @@
   }
 }
 
-// Button pseudo states
+// Button variants
 // -------------------------
 // Easily pump out default styles, as well as :hover, :focus, :active,
 // and disabled options for all buttons
-.btn-pseudo-states(@color; @background; @border) {
+.button-variant(@color; @background; @border) {
   color: @color;
   background-color: @background;
   border-color: @border;

From 6993db1840561e89dd772302d5b3d567bc92f033 Mon Sep 17 00:00:00 2001
From: ggam <ggam@brainleakage.com>
Date: Mon, 12 Aug 2013 14:07:19 +0200
Subject: [PATCH 2/2] Added button-size mixin

---
 less/buttons.less | 12 ++++--------
 less/mixins.less  |  9 +++++++++
 2 files changed, 13 insertions(+), 8 deletions(-)

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) {