Commit 3934d1b6 authored by Mark Otto's avatar Mark Otto

rgba text color on active buttons for a bit more contrast from their non-active siblings

parent 4e191c42
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * 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, article,
aside, aside,
...@@ -2486,6 +2486,12 @@ table .span12 { ...@@ -2486,6 +2486,12 @@ table .span12 {
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
color: #ffffff; color: #ffffff;
} }
.btn.primary.active,
.btn.danger.active,
.btn.success.active,
.btn.info.active {
color: rgba(255, 255, 255, 0.75);
}
.btn.primary { .btn.primary {
background-color: #0074cc; background-color: #0074cc;
background-image: -moz-linear-gradient(top, #0088cc, #0055cc); background-image: -moz-linear-gradient(top, #0088cc, #0055cc);
...@@ -2630,6 +2636,7 @@ table .span12 { ...@@ -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); 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: #e6e6e6;
background-color: #d9d9d9 \9; background-color: #d9d9d9 \9;
color: rgba(0, 0, 0, 0.5);
} }
.btn.disabled, .btn[disabled] { .btn.disabled, .btn[disabled] {
cursor: default; cursor: default;
...@@ -2747,7 +2754,10 @@ button.btn.small, input[type="submit"].btn.small { ...@@ -2747,7 +2754,10 @@ button.btn.small, input[type="submit"].btn.small {
-moz-border-radius-bottomright: 6px; -moz-border-radius-bottomright: 6px;
border-bottom-right-radius: 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; z-index: 2;
} }
.btn-group .dropdown-toggle { .btn-group .dropdown-toggle {
......
...@@ -73,7 +73,8 @@ ...@@ -73,7 +73,8 @@
// On hover/focus/active, bring the proper btn to front // On hover/focus/active, bring the proper btn to front
.btn-group .btn:hover, .btn-group .btn:hover,
.btn-group .btn:focus, .btn-group .btn:focus,
.btn-group .btn:active { .btn-group .btn:active,
.btn-group .btn.active {
z-index: 2; z-index: 2;
} }
......
...@@ -18,6 +18,12 @@ ...@@ -18,6 +18,12 @@
text-shadow: 0 -1px 0 rgba(0,0,0,.25); text-shadow: 0 -1px 0 rgba(0,0,0,.25);
color: @white color: @white
} }
&.primary.active,
&.danger.active,
&.success.active,
&.info.active {
color: rgba(255,255,255,.75);
}
&.primary { &.primary {
.buttonBackground(@primaryButtonBackground, spin(@primaryButtonBackground, 15)); .buttonBackground(@primaryButtonBackground, spin(@primaryButtonBackground, 15));
} }
...@@ -81,6 +87,7 @@ ...@@ -81,6 +87,7 @@
.box-shadow(@shadow); .box-shadow(@shadow);
background-color: darken(@white, 10%); background-color: darken(@white, 10%);
background-color: darken(@white, 15%) e("\9"); background-color: darken(@white, 15%) e("\9");
color: rgba(0,0,0,.5);
} }
&.disabled, &.disabled,
&[disabled] { &[disabled] {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment