diff options
| author | Mark Otto <[email protected]> | 2012-12-20 14:02:54 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-12-20 14:02:54 -0800 |
| commit | be74ad7e0d44c30333b08e8200ce128b1ead5b38 (patch) | |
| tree | 6a62ee8e00a5eebebf682acae96d1778286f9589 /less/button-groups.less | |
| parent | 28c928f01038a3edf61e7a3c9144a6456b929040 (diff) | |
| parent | 8eb1549842ef25e07cc062ba1d1c50c6b01381d7 (diff) | |
| download | bootstrap-be74ad7e0d44c30333b08e8200ce128b1ead5b38.tar.xz bootstrap-be74ad7e0d44c30333b08e8200ce128b1ead5b38.zip | |
Merge branch '3.0.0-wip' into bs3-normalize
Conflicts:
less/bootstrap.less
Diffstat (limited to 'less/button-groups.less')
| -rw-r--r-- | less/button-groups.less | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/less/button-groups.less b/less/button-groups.less index 4648245c7..04f3e5d72 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -126,22 +126,16 @@ background-color: @btn-background-highlight; } .btn-primary.dropdown-toggle { - background-color: @btn-backround-primary-highlight; + background-color: @btn-background-primary-highlight; } .btn-warning.dropdown-toggle { - background-color: @btn-backround-warning-highlight; + background-color: @btn-background-warning-highlight; } .btn-danger.dropdown-toggle { - background-color: @btn-backround-danger-highlight; + background-color: @btn-background-danger-highlight; } .btn-success.dropdown-toggle { - background-color: @btn-backround-success-highlight; - } - .btn-info.dropdown-toggle { - background-color: @btn-backround-info-highlight; - } - .btn-inverse.dropdown-toggle { - background-color: @btn-backround-inverse-highlight; + background-color: @btn-background-success-highlight; } } @@ -152,8 +146,6 @@ margin-left: 0; } // Carets in other button sizes -.btn-mini .caret, -.btn-small .caret, .btn-large .caret { margin-top: 6px; } @@ -162,6 +154,10 @@ border-right-width: 5px; border-top-width: 5px; } +.btn-mini .caret, +.btn-small .caret { + margin-top: 8px; +} // Upside down carets for .dropup .dropup .btn-large .caret { border-bottom-width: 5px; |