diff options
| author | Mark Otto <[email protected]> | 2013-08-05 11:30:50 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-05 11:30:50 -0700 |
| commit | 01c46bfc0f6f23697326bc5f8d69baa4f7ef3052 (patch) | |
| tree | 1a8b087fca6f42fa4786eacdd1633f096a125c10 /less | |
| parent | 6af693d1602d9e4c052c23215ac3130580bfcb17 (diff) | |
| download | bootstrap-01c46bfc0f6f23697326bc5f8d69baa4f7ef3052.tar.xz bootstrap-01c46bfc0f6f23697326bc5f8d69baa4f7ef3052.zip | |
More button updates
- Fixes #9113 (caret colors in dropdown buttons)
- Darken borders around buttons for contrast in button groups
Diffstat (limited to 'less')
| -rw-r--r-- | less/button-groups.less | 29 | ||||
| -rw-r--r-- | less/variables.less | 10 |
2 files changed, 30 insertions, 9 deletions
diff --git a/less/button-groups.less b/less/button-groups.less index ac58b38ce..76936691a 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -3,11 +3,32 @@ // -------------------------------------------------- // Button carets -.btn .caret { - border-top-color: @btn-default-color; +// +// Match the button text color to the arrow/caret for indicating dropdown-ness. + +.caret { + .btn-default & { + border-top-color: @btn-default-color; + } + .btn-primary &, + .btn-success &, + .btn-warning &, + .btn-danger &, + .btn-info & { + border-top-color: #fff; + } } -.dropup .btn .caret { - border-bottom-color: @btn-default-color; +.dropup .caret { + .btn-default & { + border-bottom-color: @btn-default-color; + } + .btn-primary &, + .btn-success &, + .btn-warning &, + .btn-danger &, + .btn-info & { + border-bottom-color: #fff; + } } // Make the div behave like a button diff --git a/less/variables.less b/less/variables.less index a333d45ea..48c6d88b2 100644 --- a/less/variables.less +++ b/less/variables.less @@ -102,23 +102,23 @@ @btn-primary-color: #fff; @btn-primary-bg: @brand-primary; -@btn-primary-border: @btn-primary-bg; +@btn-primary-border: darken(@btn-primary-bg, 5%); @btn-success-color: #fff; @btn-success-bg: @brand-success; -@btn-success-border: @btn-success-bg; +@btn-success-border: darken(@btn-success-bg, 5%); @btn-warning-color: #fff; @btn-warning-bg: @brand-warning; -@btn-warning-border: @btn-warning-bg; +@btn-warning-border: darken(@btn-warning-bg, 5%); @btn-danger-color: #fff; @btn-danger-bg: @brand-danger; -@btn-danger-border: @btn-danger-bg; +@btn-danger-border: darken(@btn-danger-bg, 5%); @btn-info-color: #fff; @btn-info-bg: @brand-info; -@btn-info-border: @btn-info-bg; +@btn-info-border: darken(@btn-info-bg, 5%); // Forms |