2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-21 13:24:08 +03:00

Merge branch 'pr/11493'

Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-11-29 23:30:26 -08:00
4 changed files with 6 additions and 4 deletions
+2 -1
View File
@@ -3776,7 +3776,8 @@ input[type="button"].btn-block {
}
.btn-group-vertical > .btn,
.btn-group-vertical > .btn-group {
.btn-group-vertical > .btn-group,
.btn-group-vertical > .btn-group > .btn {
display: block;
float: none;
width: 100%;
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+2 -1
View File
@@ -147,7 +147,8 @@
.btn-group-vertical {
> .btn,
> .btn-group {
> .btn-group,
> .btn-group > .btn {
display: block;
float: none;
width: 100%;