mirror/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-23 18:40:03 +00:00
Code Issues Projects Releases Wiki Activity

fixes #4442: allow for .btn within a .btn-toolbar without .btn-group

Browse Source
This commit is contained in:
Mark Otto 2012-08-18 16:50:26 -07:00
parent 4d2f584fdd
commit e6e0e2ac9b
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/assets/css/bootstrap.css vendored
View File

@ -3328,6 +3328,7 @@ input[type="submit"].btn.btn-mini {
.btn-toolbar { .btn-toolbar {
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 10px;
font-size: 0;
} }
.btn-toolbar .btn-group { .btn-toolbar .btn-group {
@ -3338,6 +3339,11 @@ input[type="submit"].btn.btn-mini {
*zoom: 1; *zoom: 1;
} }
.btn-toolbar .btn-group + .btn,
.btn-toolbar .btn + .btn-group {
margin-left: 5px;
}
.btn-group > .btn { .btn-group > .btn {
position: relative; position: relative;
margin-left: -1px; margin-left: -1px;

5
less/button-groups.less
View File

@ -18,12 +18,17 @@
// Optional: Group multiple button groups together for a toolbar // Optional: Group multiple button groups together for a toolbar
.btn-toolbar { .btn-toolbar {
font-size: 0; // Hack to remove whitespace that results from using inline-block
margin-top: @baseLineHeight / 2; margin-top: @baseLineHeight / 2;
margin-bottom: @baseLineHeight / 2; margin-bottom: @baseLineHeight / 2;
.btn-group { .btn-group {
display: inline-block; display: inline-block;
.ie7-inline-block(); .ie7-inline-block();
} }
.btn-group + .btn,
.btn + .btn-group {
margin-left: 5px;
}
} }
// Float them, remove border radius, then re-add to first and last elements // Float them, remove border radius, then re-add to first and last elements