Revamp button: rename .btn-default to .btn-secondary, drop .btn-info

3 files changed, 12 insertions, 26 deletions

diff --git a/less/buttons.less b/less/buttons.less
index fe5d8c990..a178e5c83 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -32,7 +32,6 @@
   &:hover,
   &:focus,
   &.focus {
-    color: @btn-default-color;
     text-decoration: none;
   }
 
@@ -57,25 +56,18 @@
 // Alternate buttons
 // --------------------------------------------------
 
-.btn-default {
-  .button-variant(@btn-default-color; @btn-default-bg; @btn-default-border);
-}
 .btn-primary {
   .button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border);
 }
-// Success appears as green
+.btn-secondary {
+  .button-variant(@btn-secondary-color; @btn-secondary-bg; @btn-secondary-border);
+}
 .btn-success {
   .button-variant(@btn-success-color; @btn-success-bg; @btn-success-border);
 }
-// Info appears as blue-green
-.btn-info {
-  .button-variant(@btn-info-color; @btn-info-bg; @btn-info-border);
-}
-// Warning appears as orange
 .btn-warning {
   .button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border);
 }
-// Danger and error appear as red
 .btn-danger {
   .button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border);
 }
diff --git a/less/theme.less b/less/theme.less
index 2902a3d20..e12b73599 100644
--- a/less/theme.less
+++ b/less/theme.less
@@ -16,7 +16,6 @@
 .btn-default,
 .btn-primary,
 .btn-success,
-.btn-info,
 .btn-warning,
 .btn-danger {
   text-shadow: 0 -1px 0 rgba(0,0,0,.2);
@@ -65,12 +64,11 @@
 }
 
 // Apply the mixin to the buttons
-.btn-default { .btn-styles(@btn-default-bg); text-shadow: 0 1px 0 #fff; border-color: #ccc; }
-.btn-primary { .btn-styles(@btn-primary-bg); }
-.btn-success { .btn-styles(@btn-success-bg); }
-.btn-info    { .btn-styles(@btn-info-bg); }
-.btn-warning { .btn-styles(@btn-warning-bg); }
-.btn-danger  { .btn-styles(@btn-danger-bg); }
+.btn-primary   { .btn-styles(@btn-primary-bg); }
+.btn-secondary { .btn-styles(@btn-secondary-bg); text-shadow: 0 1px 0 #fff; border-color: #ccc; }
+.btn-success   { .btn-styles(@btn-success-bg); }
+.btn-warning   { .btn-styles(@btn-warning-bg); }
+.btn-danger    { .btn-styles(@btn-danger-bg); }
 
 
 
diff --git a/less/variables.less b/less/variables.less
index 92b056b61..05568d922 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -143,22 +143,18 @@
 
 @btn-font-weight:                normal;
 
-@btn-default-color:              #333;
-@btn-default-bg:                 #fff;
-@btn-default-border:             #ccc;
-
 @btn-primary-color:              #fff;
 @btn-primary-bg:                 @brand-primary;
 @btn-primary-border:             darken(@btn-primary-bg, 5%);
 
+@btn-secondary-color:            @gray-dark;
+@btn-secondary-bg:               #fff;
+@btn-secondary-border:           @gray-lighter;
+
 @btn-success-color:              #fff;
 @btn-success-bg:                 @brand-success;
 @btn-success-border:             darken(@btn-success-bg, 5%);
 
-@btn-info-color:                 #fff;
-@btn-info-bg:                    @brand-info;
-@btn-info-border:                darken(@btn-info-bg, 5%);
-
 @btn-warning-color:              #fff;
 @btn-warning-bg:                 @brand-warning;
 @btn-warning-border:             darken(@btn-warning-bg, 5%);