Skip to content
GitLab
Commit b77ed4a3 authored by Mark Otto's avatar Mark Otto
Browse files

fix dropdowns in button groups after font-size hack

parent 244a9ab7
Hide whitespace changes
Inline Side-by-side
Showing
with 9 additions and 2 deletions
+9 -2
docs/assets/css/bootstrap.css
+ 5
- 1
View file @ b77ed4a3
...@@ -3119,12 +3119,16 @@ input[type="submit"].btn.btn-mini { ...@@ -3119,12 +3119,16 @@ input[type="submit"].btn.btn-mini {
.btn-group > .btn { .btn-group > .btn {
position: relative; position: relative;
margin-left: -1px; margin-left: -1px;
font-size: 13px;
-webkit-border-radius: 0; -webkit-border-radius: 0;
-moz-border-radius: 0; -moz-border-radius: 0;
border-radius: 0; border-radius: 0;
} }
.btn-group > .btn,
.btn-group > .dropdown-menu {
font-size: 13px;
}
.btn-group > .btn-mini, .btn-group > .btn-mini,
.btn-group > .btn-small { .btn-group > .btn-small {
font-size: 11px; font-size: 11px;
......
less/button-groups.less
+ 4
- 1
View file @ b77ed4a3
...@@ -29,9 +29,12 @@ ...@@ -29,9 +29,12 @@
.btn-group > .btn { .btn-group > .btn {
position: relative; position: relative;
margin-left: -1px; margin-left: -1px;
font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack
.border-radius(0); .border-radius(0);
} }
.btn-group > .btn,
.btn-group > .dropdown-menu {
font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack
}
// Reset fonts for other sizes // Reset fonts for other sizes
.btn-group > .btn-mini, .btn-group > .btn-mini,
......
Supports Markdown
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