diff options
| -rw-r--r-- | docs/assets/css/bootstrap.css | 20 | ||||
| -rw-r--r-- | less/button-groups.less | 15 | ||||
| -rw-r--r-- | less/buttons.less | 2 | ||||
| -rw-r--r-- | less/variables.less | 1 |
4 files changed, 14 insertions, 24 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 01c603b26..66002d292 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1679,7 +1679,7 @@ input[type="button"].btn-block { } .btn { - color: #fff; + color: #ffffff; background-color: #a7a9aa; border-color: #a7a9aa; } @@ -3245,9 +3245,12 @@ button.close { */ -.caret { - border-top-color: #fff; - border-bottom-color: #fff; +.btn .caret { + border-top-color: #ffffff; +} + +.dropup .btn .caret { + border-bottom-color: #ffffff; } .btn-group { @@ -3345,18 +3348,9 @@ button.close { } .btn-large .caret { - margin-top: 6px; -} - -.btn-large .caret { border-width: 5px; } -.btn-mini .caret, -.btn-small .caret { - margin-top: 8px; -} - .dropup .btn-large .caret { border-bottom-width: 5px; } diff --git a/less/button-groups.less b/less/button-groups.less index 43bf73ca1..340b342e7 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -3,9 +3,11 @@ // -------------------------------------------------- // Button carets -.caret { - border-top-color: #fff; - border-bottom-color: #fff; +.btn .caret { + border-top-color: @btn-color; +} +.dropup .btn .caret { + border-bottom-color: @btn-color; } // Make the div behave like a button @@ -105,15 +107,8 @@ } // Carets in other button sizes .btn-large .caret { - margin-top: 6px; -} -.btn-large .caret { border-width: 5px; } -.btn-mini .caret, -.btn-small .caret { - margin-top: 8px; -} // Upside down carets for .dropup .dropup .btn-large .caret { border-bottom-width: 5px; diff --git a/less/buttons.less b/less/buttons.less index f825bd429..80d19494d 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -115,7 +115,7 @@ input[type="button"] { // -------------------------------------------------- .btn { - color: #fff; + color: @btn-color; background-color: @btn-background; border-color: @btn-border; &:hover, diff --git a/less/variables.less b/less/variables.less index 53de5a6ac..1f8b8ae59 100644 --- a/less/variables.less +++ b/less/variables.less @@ -82,6 +82,7 @@ // Buttons // ------------------------- +@btn-color: #fff; @btn-background: #a7a9aa; @btn-border: @btn-background; |
