Commit c64aa26d authored by Mark Otto's avatar Mark Otto

Add @btn-color variable and use in buttons and carets; fixes dropup caret as well

parent 94e256c0
...@@ -1679,7 +1679,7 @@ input[type="button"].btn-block { ...@@ -1679,7 +1679,7 @@ input[type="button"].btn-block {
} }
.btn { .btn {
color: #fff; color: #ffffff;
background-color: #a7a9aa; background-color: #a7a9aa;
border-color: #a7a9aa; border-color: #a7a9aa;
} }
...@@ -3245,9 +3245,12 @@ button.close { ...@@ -3245,9 +3245,12 @@ button.close {
*/ */
.caret { .btn .caret {
border-top-color: #fff; border-top-color: #ffffff;
border-bottom-color: #fff; }
.dropup .btn .caret {
border-bottom-color: #ffffff;
} }
.btn-group { .btn-group {
...@@ -3344,19 +3347,10 @@ button.close { ...@@ -3344,19 +3347,10 @@ button.close {
margin-left: 0; margin-left: 0;
} }
.btn-large .caret {
margin-top: 6px;
}
.btn-large .caret { .btn-large .caret {
border-width: 5px; border-width: 5px;
} }
.btn-mini .caret,
.btn-small .caret {
margin-top: 8px;
}
.dropup .btn-large .caret { .dropup .btn-large .caret {
border-bottom-width: 5px; border-bottom-width: 5px;
} }
......
...@@ -3,9 +3,11 @@ ...@@ -3,9 +3,11 @@
// -------------------------------------------------- // --------------------------------------------------
// Button carets // Button carets
.caret { .btn .caret {
border-top-color: #fff; border-top-color: @btn-color;
border-bottom-color: #fff; }
.dropup .btn .caret {
border-bottom-color: @btn-color;
} }
// Make the div behave like a button // Make the div behave like a button
...@@ -104,16 +106,9 @@ ...@@ -104,16 +106,9 @@
margin-left: 0; margin-left: 0;
} }
// Carets in other button sizes // Carets in other button sizes
.btn-large .caret {
margin-top: 6px;
}
.btn-large .caret { .btn-large .caret {
border-width: 5px; border-width: 5px;
} }
.btn-mini .caret,
.btn-small .caret {
margin-top: 8px;
}
// Upside down carets for .dropup // Upside down carets for .dropup
.dropup .btn-large .caret { .dropup .btn-large .caret {
border-bottom-width: 5px; border-bottom-width: 5px;
......
...@@ -115,7 +115,7 @@ input[type="button"] { ...@@ -115,7 +115,7 @@ input[type="button"] {
// -------------------------------------------------- // --------------------------------------------------
.btn { .btn {
color: #fff; color: @btn-color;
background-color: @btn-background; background-color: @btn-background;
border-color: @btn-border; border-color: @btn-border;
&:hover, &:hover,
......
...@@ -82,6 +82,7 @@ ...@@ -82,6 +82,7 @@
// Buttons // Buttons
// ------------------------- // -------------------------
@btn-color: #fff;
@btn-background: #a7a9aa; @btn-background: #a7a9aa;
@btn-border: @btn-background; @btn-border: @btn-background;
......
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