fix up buttons after recess property order

SimpleUpdates · Apr 23, 2012 · 419e50e · 419e50e
1 parent 091a97c
commit 419e50e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
@@ -2694,6 +2694,10 @@ button.close {
   color: rgba(255, 255, 255, 0.75);
 }
 
+.btn {
+  border-color: #ccc;
+}
+
 .btn-primary {
   background-color: #0074cc;
   *background-color: #0055cc;

diff --git a/less/button-groups.less b/less/button-groups.less
@@ -41,6 +41,7 @@
       -moz-border-radius-bottomleft: 4px;
           border-bottom-left-radius: 4px;
 }
+// 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 {
      -webkit-border-top-right-radius: 4px;

diff --git a/less/buttons.less b/less/buttons.less
@@ -131,6 +131,9 @@
 
 // Set the backgrounds
 // -------------------------
+.btn {
+  border-color: #ccc; // reset here as of 2.0.3 due to Recess property order
+}
 .btn-primary {
   .buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight);
 }

diff --git a/less/variables.less b/less/variables.less
@@ -71,7 +71,7 @@
 // -------------------------
 @btnBackground:                     @white;
 @btnBackgroundHighlight:            darken(@white, 10%);
-@btnBorder:                         darken(@white, 20%);
+@btnBorder:                         #ccc;
 
 @btnPrimaryBackground:              @linkColor;
 @btnPrimaryBackgroundHighlight:     spin(@btnPrimaryBackground, 15%);