finetune buttons flattened colors

3 files changed, 55 insertions, 24 deletions

diff --git a/less/button-groups.less b/less/button-groups.less
index 7113b583c..8b6e78ff8 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -107,7 +107,7 @@
   }
 
   // Keep the hover's background when dropdown is open
-  .btn.dropdown-toggle {
+/*  .btn.dropdown-toggle {
     background-color: @btn-background-highlight;
   }
   .btn-primary.dropdown-toggle {
@@ -122,7 +122,7 @@
   .btn-success.dropdown-toggle {
     background-color: @btn-background-success-highlight;
   }
-}
+*/}
 
 
 // Reposition the caret
diff --git a/less/buttons.less b/less/buttons.less
index b9ed8e330..d0ada16ff 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -9,17 +9,17 @@
 // Core styles
 .btn {
   display: inline-block;
-  padding: 7px 13px;
+  padding: 6px 12px;
   margin-bottom: 0; // For input.btn
   font-size: @font-size-base;
   font-weight: bold;
   line-height: @line-height-base;
   text-align: center;
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
   vertical-align: middle;
   cursor: pointer;
-  border: 0;
+  border: 1px solid @btn-border;
   border-radius: @border-radius-base;
-  //.box-shadow(inset 0 1px 0 rgba(255,255,255,.25));
 
   &:focus {
     .tab-focus();
@@ -33,7 +33,7 @@
   &.active {
     outline: 0;
     background-image: none;
-    .box-shadow(~"inset 0 3px 5px rgba(0,0,0,.125), 0 1px 0 rgba(255,255,255,.1)");
+    .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
   }
 
   &.disabled,
@@ -116,28 +116,58 @@ input[type="button"] {
 
 .btn {
   color: #fff;
-  background-color: #ccc;
-  //.buttonBackground(@btn-background, @btn-background-highlight, @gray, 0 1px 0 rgba(255,255,255,.75));
+  background-color: @btn-background;
+  border-color: @btn-border;
+  &:hover,
+  &:focus,
+  &:active {
+    background-color: darken(@btn-background, 5%);
+        border-color: darken(@btn-border, 10%);
+  }
 }
 // Primary appears as blue
 .btn-primary {
   background-color: @btn-background-primary;
-  //.buttonBackground(@btn-background-primary, @btn-background-primary-highlight);
+      border-color: @btn-border-primary;
+  &:hover,
+  &:focus,
+  &:active {
+    background-color: darken(@btn-background-primary, 5%);
+        border-color: darken(@btn-border-primary, 10%);
+  }
 }
 // Warning appears are orange
 .btn-warning {
   background-color: @btn-background-warning;
-  //.buttonBackground(@btn-background-warning, @btn-background-warning-highlight);
+      border-color: @btn-border-warning;
+  &:hover,
+  &:focus,
+  &:active {
+    background-color: darken(@btn-background-warning, 5%);
+        border-color: darken(@btn-border-warning, 10%);
+  }
 }
 // Danger and error appear as red
 .btn-danger {
   background-color: @btn-background-danger;
-  //.buttonBackground(@btn-background-danger, @btn-background-danger-highlight);
+      border-color: @btn-border-danger;
+  &:hover,
+  &:focus,
+  &:active {
+    background-color: darken(@btn-background-danger, 5%);
+        border-color: darken(@btn-border-danger, 10%);
+  }
 }
 // Success appears as green
 .btn-success {
   background-color: @btn-background-success;
-  //.buttonBackground(@btn-background-success, @btn-background-success-highlight);
+      border-color: @btn-border-success;
+  &:hover,
+  &:focus,
+  &:active {
+    background-color: darken(@btn-background-success, 5%);
+        border-color: darken(@btn-border-success, 10%);
+  }
 }
 
 
@@ -154,9 +184,10 @@ fieldset[disabled] .btn-link {
   .box-shadow(none);
 }
 .btn-link {
-  border-color: transparent;
-  cursor: pointer;
   color: @link-color;
+  font-weight: normal;
+  cursor: pointer;
+  border-color: transparent;
   border-radius: 0;
 }
 .btn-link:hover {
diff --git a/less/variables.less b/less/variables.less
index 860c71ad4..84490a9fa 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -26,7 +26,7 @@
 // Links
 // -------------------------
 
-@link-color:              #08c;
+@link-color:              #428bca;
 @link-color-hover:        darken(@link-color, 15%);
 
 
@@ -75,20 +75,20 @@
 // Buttons
 // -------------------------
 
-@btn-background:                     #fff;
-@btn-background-highlight:           #eaeaea;
+@btn-background:                     #a7a9aa;
+@btn-border:                         @btn-background;
 
 @btn-background-primary:             @link-color;
-@btn-background-primary-highlight:   darken(@link-color, 10%);
+@btn-border-primary:                 @btn-background-primary;
 
-@btn-background-success:             #62c462;
-@btn-background-success-highlight:   #51a351;
+@btn-background-success:             #5cb85c;
+@btn-border-success:                 @btn-background-success;
 
-@btn-background-warning:             lighten(#f89406, 15%);
-@btn-background-warning-highlight:   #f89406;
+@btn-background-warning:             #f0ad4e;
+@btn-border-warning:                 @btn-background-warning;
 
-@btn-background-danger:              #ee5f5b;
-@btn-background-danger-highlight:    #bd362f;
+@btn-background-danger:              #d9534f;
+@btn-border-danger:                  @btn-background-danger;
 
 
 // Forms