]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
rgba text color on active buttons for a bit more contrast from their non-active siblings
authorMark Otto <markdotto@gmail.com>
Sat, 28 Jan 2012 05:08:04 +0000 (21:08 -0800)
committerMark Otto <markdotto@gmail.com>
Sat, 28 Jan 2012 05:08:04 +0000 (21:08 -0800)
docs/assets/css/bootstrap.css
less/button-groups.less
less/buttons.less

index 861ef91414c22505bed93754f71b7e97d046b2d9..002c937a083ac881bc53f465099e06a17273cc80 100644 (file)
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Fri Jan 27 20:16:25 PST 2012
+ * Date: Fri Jan 27 21:07:37 PST 2012
  */
 article,
 aside,
@@ -2486,6 +2486,12 @@ table .span12 {
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
   color: #ffffff;
 }
+.btn.primary.active,
+.btn.danger.active,
+.btn.success.active,
+.btn.info.active {
+  color: rgba(255, 255, 255, 0.75);
+}
 .btn.primary {
   background-color: #0074cc;
   background-image: -moz-linear-gradient(top, #0088cc, #0055cc);
@@ -2630,6 +2636,7 @@ table .span12 {
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
   background-color: #e6e6e6;
   background-color: #d9d9d9 \9;
+  color: rgba(0, 0, 0, 0.5);
 }
 .btn.disabled, .btn[disabled] {
   cursor: default;
@@ -2747,7 +2754,10 @@ button.btn.small, input[type="submit"].btn.small {
   -moz-border-radius-bottomright: 6px;
   border-bottom-right-radius: 6px;
 }
-.btn-group .btn:hover, .btn-group .btn:focus, .btn-group .btn:active {
+.btn-group .btn:hover,
+.btn-group .btn:focus,
+.btn-group .btn:active,
+.btn-group .btn.active {
   z-index: 2;
 }
 .btn-group .dropdown-toggle {
index 471d337481989764630fbe4a97a9c7972cb26e9e..3e08e6b0922093e53fddfb00d123a223bbe38c19 100644 (file)
@@ -73,7 +73,8 @@
 // On hover/focus/active, bring the proper btn to front
 .btn-group .btn:hover,
 .btn-group .btn:focus,
-.btn-group .btn:active {
+.btn-group .btn:active,
+.btn-group .btn.active {
   z-index: 2;
 }
 
index 8d75248b3aedf9a6bfcb7c49e6cadcb49157706c..f1060dc6bbd13885f38cc24ef46604646d850053 100644 (file)
     text-shadow: 0 -1px 0 rgba(0,0,0,.25);
     color: @white
   }
+  &.primary.active,
+  &.danger.active,
+  &.success.active,
+  &.info.active {
+    color: rgba(255,255,255,.75);
+  }
   &.primary {
     .buttonBackground(@primaryButtonBackground, spin(@primaryButtonBackground, 15));
   }
@@ -81,6 +87,7 @@
     .box-shadow(@shadow);
     background-color: darken(@white, 10%);
     background-color: darken(@white, 15%) e("\9");
+    color: rgba(0,0,0,.5);
   }
   &.disabled,
   &[disabled] {