Skip to content

B
bootstrap
Commit 783120df authored by Mark Otto's avatar Mark Otto
Browse files
Options

Fixes #5927: Scope button group 5px button left margin to immediate children

parent 014d3ced
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
docs/assets/css/bootstrap.css
View file @ 783120df
......@@ -3573,9 +3573,9 @@ input[type="submit"].btn.btn-mini {
font-size: 0;
}
.btn-toolbar .btn + .btn,
.btn-toolbar .btn-group + .btn,
.btn-toolbar .btn + .btn-group {
.btn-toolbar > .btn + .btn,
.btn-toolbar > .btn-group + .btn,
.btn-toolbar > .btn + .btn-group {
margin-left: 5px;
}
......
less/button-groups.less
View file @ 783120df
......@@ -24,9 +24,9 @@
font-size: 0; // Hack to remove whitespace that results from using inline-block
margin-top: @baseLineHeight / 2;
margin-bottom: @baseLineHeight / 2;
.btn + .btn,
.btn-group + .btn,
.btn + .btn-group {
> .btn + .btn,
> .btn-group + .btn,
> .btn + .btn-group {
margin-left: 5px;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment