diff options
| author | Mark Otto <[email protected]> | 2013-11-30 23:35:56 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-30 23:35:56 -0800 |
| commit | 53047fa587fc8ca5cc0cad751f71fca5470d453a (patch) | |
| tree | a013806bef23a01e7ff0615f82b629703c553d6a /less/button-groups.less | |
| parent | ba4c5dae9b8e34e90e86ba28aa6bd5acf3351f0d (diff) | |
| parent | 57070dcf4525fe82cab6a93300861867aa7f2d1e (diff) | |
| download | bootstrap-53047fa587fc8ca5cc0cad751f71fca5470d453a.tar.xz bootstrap-53047fa587fc8ca5cc0cad751f71fca5470d453a.zip | |
Merge branch 'master' into pr/11536
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'less/button-groups.less')
| -rw-r--r-- | less/button-groups.less | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/less/button-groups.less b/less/button-groups.less index bba9d0295..05fda149a 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -2,37 +2,6 @@ // Button groups // -------------------------------------------------- -// Button carets -// -// 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-default .caret { - border-bottom-color: @btn-default-color; - } - .btn-primary, - .btn-success, - .btn-warning, - .btn-danger, - .btn-info { - .caret { - border-bottom-color: #fff; - } - } -} - // Make the div behave like a button .btn-group, .btn-group-vertical { @@ -178,7 +147,8 @@ .btn-group-vertical { > .btn, - > .btn-group { + > .btn-group, + > .btn-group > .btn { display: block; float: none; width: 100%; |