mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-01 01:21:49 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.0.0-wip' into bs3_restore_glyphicons

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-08-18 10:28:32 -07:00
parent 6b24297c5b 6496ffb7d4
commit f8b65b41ab
11 changed files with 381 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dist/css/bootstrap.css vendored
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,

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long