Fixes #8786 (part 2): new default button styles

Also relevant: http://www.youtube.com/watch?v=Ldyx3KHOFXw
twbs · Aug 5, 2013 · 41eef69 · 41eef69
1 parent 2ee9bea
commit 41eef69
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 22 deletions.
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
@@ -1728,7 +1728,7 @@ textarea.input-sm {
 
 .btn:hover,
 .btn:focus {
-  color: #ffffff;
+  color: #333333;
   text-decoration: none;
 }
 
@@ -1751,17 +1751,18 @@ fieldset[disabled] .btn {
 }
 
 .btn-default {
-  color: #ffffff;
-  background-color: #474949;
-  border-color: #474949;
+  color: #333333;
+  background-color: #ffffff;
+  border-color: #cccccc;
 }
 
 .btn-default:hover,
 .btn-default:focus,
 .btn-default:active,
 .btn-default.active {
-  background-color: #333434;
-  border-color: #292a2a;
+  color: #333333;
+  background-color: #ebebeb;
+  border-color: #adadad;
 }
 
 .btn-default.disabled,
@@ -1779,8 +1780,8 @@ fieldset[disabled] .btn-default:active,
 .btn-default.disabled.active,
 .btn-default[disabled].active,
 fieldset[disabled] .btn-default.active {
-  background-color: #474949;
-  border-color: #474949;
+  background-color: #ffffff;
+  border-color: #cccccc;
 }
 
 .btn-primary {
@@ -1793,6 +1794,7 @@ fieldset[disabled] .btn-default.active {
 .btn-primary:focus,
 .btn-primary:active,
 .btn-primary.active {
+  color: #ffffff;
   background-color: #3276b1;
   border-color: #2d6ca2;
 }
@@ -1826,6 +1828,7 @@ fieldset[disabled] .btn-primary.active {
 .btn-warning:focus,
 .btn-warning:active,
 .btn-warning.active {
+  color: #ffffff;
   background-color: #ed9c28;
   border-color: #eb9316;
 }
@@ -1859,6 +1862,7 @@ fieldset[disabled] .btn-warning.active {
 .btn-danger:focus,
 .btn-danger:active,
 .btn-danger.active {
+  color: #ffffff;
   background-color: #d2322d;
   border-color: #c12e2a;
 }
@@ -1892,6 +1896,7 @@ fieldset[disabled] .btn-danger.active {
 .btn-success:focus,
 .btn-success:active,
 .btn-success.active {
+  color: #ffffff;
   background-color: #47a447;
   border-color: #419641;
 }
@@ -1925,6 +1930,7 @@ fieldset[disabled] .btn-success.active {
 .btn-info:focus,
 .btn-info:active,
 .btn-info.active {
+  color: #ffffff;
   background-color: #39b3d7;
   border-color: #2aabd2;
 }
@@ -3111,11 +3117,11 @@ button.close {
 }
 
 .btn .caret {
-  border-top-color: #ffffff;
+  border-top-color: #333333;
 }
 
 .dropup .btn .caret {
-  border-bottom-color: #ffffff;
+  border-bottom-color: #333333;
 }
 
 .btn-group,

diff --git a/dist/css/bootstrap.min.css b/dist/css/bootstrap.min.css
diff --git a/less/buttons.less b/less/buttons.less
@@ -28,7 +28,7 @@
 
   &:hover,
   &:focus {
-    color: @btn-hover-color;
+    color: @btn-default-color;
     text-decoration: none;
   }
 

diff --git a/less/mixins.less b/less/mixins.less
@@ -372,6 +372,7 @@
   &:focus,
   &:active,
   &.active {
+    color: @color;
     background-color: darken(@background, 8%);
         border-color: darken(@border, 12%);
   }

diff --git a/less/variables.less b/less/variables.less
@@ -96,32 +96,30 @@
 // Buttons
 // -------------------------
 
-@btn-default-color:              #fff;
-@btn-default-bg:                 #474949;
-@btn-default-border:             @btn-default-bg;
+@btn-default-color:              #333;
+@btn-default-bg:                 #fff;
+@btn-default-border:             #ccc;
 
-@btn-primary-color:              @btn-default-color;
+@btn-primary-color:              #fff;
 @btn-primary-bg:                 @brand-primary;
 @btn-primary-border:             @btn-primary-bg;
 
-@btn-success-color:              @btn-default-color;
+@btn-success-color:              #fff;
 @btn-success-bg:                 @brand-success;
 @btn-success-border:             @btn-success-bg;
 
-@btn-warning-color:              @btn-default-color;
+@btn-warning-color:              #fff;
 @btn-warning-bg:                 @brand-warning;
 @btn-warning-border:             @btn-warning-bg;
 
-@btn-danger-color:               @btn-default-color;
+@btn-danger-color:               #fff;
 @btn-danger-bg:                  @brand-danger;
 @btn-danger-border:              @btn-danger-bg;
 
-@btn-info-color:                 @btn-default-color;
+@btn-info-color:                 #fff;
 @btn-info-bg:                    @brand-info;
 @btn-info-border:                @btn-info-bg;
 
-@btn-hover-color:                @btn-default-color;
-
 
 // Forms
 // -------------------------