Skip to content

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

Merge branch 'fixcaret' of https://github.com/liuyl/bootstrap into liuyl-fixcaret

parents 0c9bf6bc ce410dc3
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
dist/css/bootstrap.css
View file @ a9e741bf
...@@ -2633,10 +2633,12 @@ input[type="button"].btn-block { ...@@ -2633,10 +2633,12 @@ input[type="button"].btn-block {
.btn-lg .caret { .btn-lg .caret {
border-width: 5px; border-width: 5px;
border-bottom-width: 0;
} }
.dropup .btn-lg .caret { .dropup .btn-lg .caret {
border-bottom-width: 5px; border-width: 5px;
border-top-width: 0;
} }
.btn-group-vertical > .btn, .btn-group-vertical > .btn,
......
dist/css/bootstrap.min.css
View file @ a9e741bf
This source diff could not be displayed because it is too large. You can view the blob instead.
less/button-groups.less
View file @ a9e741bf
...@@ -160,10 +160,12 @@ ...@@ -160,10 +160,12 @@
// Carets in other button sizes // Carets in other button sizes
.btn-lg .caret { .btn-lg .caret {
border-width: @caret-width-large; border-width: @caret-width-large;
border-bottom-width: 0;
} }
// Upside down carets for .dropup // Upside down carets for .dropup
.dropup .btn-lg .caret { .dropup .btn-lg .caret {
border-bottom-width: @caret-width-large; border-width: @caret-width-large;
border-top-width: 0;
} }
......
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