Holy shit, buttons, button states, and input states updated

4 files changed, 13 insertions, 9 deletions

diff --git a/less/buttons.less b/less/buttons.less
index 14de3529c..fe80fa44b 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -13,13 +13,10 @@
   margin-bottom: 0; // For input.btn
   font-size: @font-size-base;
   line-height: @line-height-base;
-  color: @gray;
   text-align: center;
-  text-shadow: 0 1px 0 rgba(255,255,255,.75);
   vertical-align: middle;
   cursor: pointer;
-  #gradient > .vertical(@btn-background, @btn-background-highlight);
-  border: 1px solid darken(@btn-background, 20%);
+  border: 1px solid #ccc;
   border-radius: @border-radius-base;
   .box-shadow(inset 0 1px 0 rgba(255,255,255,.25));
 
@@ -35,7 +32,7 @@
   &.active {
     outline: 0;
     background-image: none;
-    .box-shadow(~"inset 0 3px 5px rgba(0,0,0,.15), 0 1px 0 rgba(255,255,255,.1)");
+    .box-shadow(~"inset 0 3px 5px rgba(0,0,0,.125), 0 1px 0 rgba(255,255,255,.1)");
   }
 
   &.disabled,
@@ -116,6 +113,10 @@ input[type="button"] {
 // Alternate buttons
 // --------------------------------------------------
 
+.btn {
+  .buttonBackground(@btn-background, @btn-background-highlight, @gray, 0 1px 0 rgba(255,255,255,.75));
+}
+// Primary appears as blue
 .btn-primary {
   .buttonBackground(@btn-background-primary, @btn-background-primary-highlight);
 }
diff --git a/less/forms.less b/less/forms.less
index 8fa985415..b444ba765 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -307,7 +307,7 @@ input[class*="span"],
 select[class*="span"],
 textarea[class*="span"],
 .uneditable-input[class*="span"] {
-  height: 30px;
+  height: @input-height;
 }
 // Control row for multiple inputs per line
 .controls-row {
diff --git a/less/mixins.less b/less/mixins.less
index ebfce5f91..a90e61bc7 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -409,7 +409,7 @@
   color: @text-color;
   text-shadow: @text-shadow;
   #gradient > .vertical(@background-start, @background-end);
-  border-color: darken(@background-end, 5%);
+  border-color: darken(@background-end, 7.5%);
 
   &:hover,
   &:active,
@@ -419,7 +419,10 @@
     background-position: 0 -15px;
   }
   &:active,
-  &.active {
+  &.active,
+  &[disabled],
+  &.disabled,
+  fieldset[disabled] & {
     background-image: none;
   }
 }
diff --git a/less/variables.less b/less/variables.less
index 7daff461e..358784e57 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -79,7 +79,7 @@
 @btn-background-highlight:           #dadada;
 
 @btn-background-primary:              @link-color;
-@btn-background-primary-highlight:    spin(@btn-background-primary, 20%);
+@btn-background-primary-highlight:    darken(@link-color, 10%);
 
 @btn-background-success:              #62c462;
 @btn-background-success-highlight:    #51a351;