2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-15 11:59:39 +03:00

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

This commit is contained in:
Mark Otto
2013-08-18 10:07:34 -07:00
3 changed files with 7 additions and 3 deletions
+3 -1
View File
@@ -2633,10 +2633,12 @@ input[type="button"].btn-block {
.btn-lg .caret {
border-width: 5px;
border-bottom-width: 0;
}
.dropup .btn-lg .caret {
border-bottom-width: 5px;
border-width: 5px;
border-top-width: 0;
}
.btn-group-vertical > .btn,
+1 -1
View File
File diff suppressed because one or more lines are too long
+3 -1
View File
@@ -160,10 +160,12 @@
// Carets in other button sizes
.btn-lg .caret {
border-width: @caret-width-large;
border-bottom-width: 0;
}
// Upside down carets for .dropup
.dropup .btn-lg .caret {
border-bottom-width: @caret-width-large;
border-width: @caret-width-large;
border-top-width: 0;
}