more consistent btn vars

diff --git a/less/buttons.less b/less/buttons.less
index afe339bc7a608738920369454d206d83ed8961f2..d6e334f0e2c8889b3a7c9a8c232ddd9cc16fd0ab 100644 (file)
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -110,26 +110,26 @@ input[type="button"] {
 
 .btn {
   color: @btn-color;
-  .btn-pseudo-states(@btn-background, @btn-border);
+  .btn-pseudo-states(@btn-bg, @btn-border);
 }
 .btn-primary {
-  .btn-pseudo-states(@btn-background-primary, @btn-border-primary);
+  .btn-pseudo-states(@btn-primary-bg, @btn-primary-border);
 }
 // Warning appears as orange
 .btn-warning {
-  .btn-pseudo-states(@btn-background-warning, @btn-border-warning);
+  .btn-pseudo-states(@btn-bg-warning, @btn-warning-border);
 }
 // Danger and error appear as red
 .btn-danger {
-  .btn-pseudo-states(@btn-background-danger, @btn-border-danger);
+  .btn-pseudo-states(@btn-bg-danger, @btn-danger-border);
 }
 // Success appears as green
 .btn-success {
-  .btn-pseudo-states(@btn-background-success, @btn-border-success);
+  .btn-pseudo-states(@btn-bg-success, @btn-success-border);
 }
 // Info appears as blue-green
 .btn-info {
-  .btn-pseudo-states(@btn-background-info, @btn-border-info);
+  .btn-pseudo-states(@btn-bg-info, @btn-info-border);
 }
 
 

diff --git a/less/variables.less b/less/variables.less
index 060e0c97e57e4f42e5385b3898c005916aa6956d..31522165ca3bed72cefa3c251a914bd871676e18 100644 (file)
--- a/less/variables.less
+++ b/less/variables.less
@@ -84,24 +84,24 @@
 // Buttons
 // -------------------------
 
-@btn-color:                          #fff;
-@btn-background:                     #a7a9aa;
-@btn-border:                         @btn-background;
+@btn-color:                      #fff;
+@btn-bg:                         #a7a9aa;
+@btn-border:                     @btn-bg;
 
-@btn-background-primary:             @brand-primary;
-@btn-border-primary:                 @btn-background-primary;
+@btn-primary-bg:                 @brand-primary;
+@btn-primary-border:             @btn-primary-bg;
 
-@btn-background-success:             @brand-success;
-@btn-border-success:                 @btn-background-success;
+@btn-bg-success:                 @brand-success;
+@btn-success-border:             @btn-bg-success;
 
-@btn-background-warning:             @brand-warning;
-@btn-border-warning:                 @btn-background-warning;
+@btn-bg-warning:                 @brand-warning;
+@btn-warning-border:             @btn-bg-warning;
 
-@btn-background-danger:              @brand-danger;
-@btn-border-danger:                  @btn-background-danger;
+@btn-bg-danger:                  @brand-danger;
+@btn-danger-border:              @btn-bg-danger;
 
-@btn-background-info:                @brand-info;
-@btn-border-info:                    @btn-background-info;
+@btn-bg-info:                    @brand-info;
+@btn-info-border:                @btn-bg-info;