Merge and cleanup more CSS rules

vendors/bootstrap/less/button-groups.less

@@ -10,16 +10,15 @@
   white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
 }
 
-// Space out series of button groups
-.btn-group + .btn-group {
-  margin-left: 5px;
+.btn-group:not(:first-child) {
+  margin-left: 3px;
 }
 
 // Optional: Group multiple button groups together for a toolbar
 .btn-toolbar {
   font-size: 0; // Hack to remove whitespace that results from using inline-block
-  margin-top: @baseLineHeight / 2;
-  margin-bottom: @baseLineHeight / 2;
+  margin-top: 0;
+  margin-bottom: 0;
   .btn-group {
     display: inline-block;
   }
@@ -54,14 +53,14 @@
 // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
 .btn-group > .btn:first-child {
   margin-left: 0;
-  border-top-left-radius: 4px;
-  border-bottom-left-radius: 4px;
+  border-top-left-radius: 3px;
+  border-bottom-left-radius: 3px;
 }
 // Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
 .btn-group > .btn:last-child,
 .btn-group > .dropdown-toggle {
-  border-top-right-radius: 4px;
-  border-bottom-right-radius: 4px;
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
 }
 // Reset corners for large buttons
 .btn-group > .btn.large:first-child {

vendors/bootstrap/less/buttons.less

@@ -8,6 +8,8 @@
 
 // Core
 .btn {
+  border-radius: 3px;
+
   display: inline-block;
   padding: 4px 13px;
   margin-bottom: 0; // For input.btn
@@ -16,21 +18,16 @@
   text-align: center;
   vertical-align: middle;
   cursor: pointer;
-  .buttonBackground(@btnBackground, @btnBackgroundHighlight, @grayDark, 0 1px 1px rgba(255,255,255,.75));
   border: 1px solid @btnBorder;
   border-color: rgba(0, 0, 0, 0.25) rgba(0, 0, 0, 0.25) rgba(0, 0, 0, 0.25);
   box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+  color: @grayDark;
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+  background-color: @btnBackground;
 
   // Hover state
   &:hover {
-    color: @grayDark;
-    text-decoration: none;
-    background-color: darken(@white, 10%);
-    background-position: 0 -15px;
-
-    // transition is only when going to hover, otherwise the background
-    // behind the gradient (there for IE<=9 fallback) gets mismatched
-    transition: background-position .1s linear;
+    opacity: 0.9;
   }
 
   // Focus state for keyboard and accessibility
@@ -41,8 +38,7 @@
   // Active state
   &.active,
   &:active {
-    background-color: darken(@white, 10%);
-    background-image: none;
+    opacity: 0.9;
     outline: 0;
     box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
   }
@@ -51,9 +47,7 @@
   &.disabled,
   &[disabled] {
     cursor: default;
-    background-color: darken(@white, 10%);
-    background-image: none;
-	opacity: 0.8;
+	opacity: 0.7;
     box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
   }
 
@@ -67,7 +61,7 @@
 // Large
 .btn-large {
   padding: 9px 14px;
-  font-size: @baseFontSize + 2px;
+  font-size: @baseFontSize + 3px;
   line-height: normal;
   border-radius: 5px;
 }
@@ -112,18 +106,21 @@
 // -------------------------
 .btn {
   // reset here as of 2.0.3 due to Recess property order
-  border-color: #c5c5c5;
   border-color: rgba(0,0,0,.15) rgba(0,0,0,.15) rgba(0,0,0,.25);
 }
 // Warning appears are orange
 .btn-warning {
-  .buttonBackground(@btnWarningBackground, @btnWarningBackgroundHighlight);
+  color: #fff;
+  background-color: @btnWarningBackground;
 }
 // Danger and error appear as red
 .btn-danger {
-  .buttonBackground(@btnDangerBackground, @btnDangerBackgroundHighlight);
+  color: #fff;
+  background-color: @btnDangerBackground;
 }
 // Success appears as green
 .btn-success {
-  .buttonBackground(@btnSuccessBackground, @btnSuccessBackgroundHighlight);
+  background-color: @btnSuccessBackground;
+  color: #fff;
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
 }

vendors/bootstrap/less/dropdowns.less

@@ -59,7 +59,7 @@
   // Links within the dropdown menu
   a {
     display: block;
-    padding: 3px 20px;
+    padding: 3px 10px;
     clear: both;
     font-weight: normal;
     line-height: @baseLineHeight;
@@ -75,7 +75,6 @@
   text-decoration: none;
   color: @dropdownLinkColorHover;
   background-color: @dropdownLinkBackgroundHover;
-  #gradient > .vertical(@dropdownLinkBackgroundHover, darken(@dropdownLinkBackgroundHover, 5%));
 }
 
 // Active state
@@ -86,7 +85,6 @@
   text-decoration: none;
   outline: 0;
   background-color: @dropdownLinkBackgroundActive;
-  #gradient > .vertical(@dropdownLinkBackgroundActive, darken(@dropdownLinkBackgroundActive, 5%));
 }
 
 // Disabled state

vendors/bootstrap/less/forms.less

@@ -156,7 +156,7 @@ input[type="file"] {
 
 // Make select elements obey height by applying a border
 select {
-  width: 220px; // default input width + 10px of padding that doesn't get applied
+  width: 223px; // default input width + 10px of padding that doesn't get applied
   border: 1px solid #bbb;
   background-color: @inputBackground; // Chrome on Linux and Mobile Safari need background-color
 }

vendors/bootstrap/less/mixins.less

@@ -76,39 +76,9 @@
 
 
 
-// BACKGROUNDS
-// --------------------------------------------------
-
-// Gradients
-#gradient {
-  .vertical(@startColor: #555, @endColor: #333) {
-    background-color: mix(@startColor, @endColor, 60%);
-    background-image: linear-gradient(to bottom, @startColor, @endColor); // Standard, IE10
-    background-repeat: repeat-x;
-  }
-}
-
-
-
 // COMPONENT MIXINS
 // --------------------------------------------------
 
-// Button backgrounds
-// ------------------
-.buttonBackground(@startColor, @endColor, @textColor: #fff, @textShadow: 0 -1px 0 rgba(0,0,0,.25)) {
-  color: @textColor;
-  text-shadow: @textShadow;
-  #gradient > .vertical(@startColor, @endColor);
-  border-color: @endColor @endColor darken(@endColor, 15%);
-  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
-
-  // in these cases the gradient won't cover the background, so we override
-  &:hover, &:active, &.active, &.disabled, &[disabled] {
-    color: @textColor;
-    background-color: @endColor;
-  }
-}
-
 // Grid System
 // -----------
 

vendors/bootstrap/less/variables.less

@@ -78,7 +78,7 @@
 @btnInfoBackground:                 #5bc0de;
 @btnInfoBackgroundHighlight:        #2f96b4;
 
-@btnSuccessBackground:              #62c462;
+@btnSuccessBackground:              #84AB04;
 @btnSuccessBackgroundHighlight:     #51a351;
 
 @btnWarningBackground:              lighten(@orange, 15%);