1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-21 04:41:36 +02:00

Merge branch '3.0.0-wip' into bs3_restore_glyphicons

Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-08-18 10:28:32 -07:00
11 changed files with 381 additions and 76 deletions

View File

@@ -3449,11 +3449,12 @@ input[type="button"].btn-block {
}
.btn-lg .caret {
border-width: 5px;
border-width: 5px 5px 0;
border-bottom-width: 0;
}
.dropup .btn-lg .caret {
border-bottom-width: 5px;
border-width: 0 5px 5px;
}
.btn-group-vertical > .btn,