1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-18 05:58:25 +01:00

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

Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto 2013-08-02 20:19:20 -07:00
commit 4bac2c567a
3 changed files with 3 additions and 1 deletions

View File

@ -3268,6 +3268,7 @@ button.close {
.btn-group-justified { .btn-group-justified {
display: table; display: table;
width: 100%; width: 100%;
table-layout: fixed;
} }
.btn-group-justified .btn { .btn-group-justified .btn {

File diff suppressed because one or more lines are too long

View File

@ -157,6 +157,7 @@
.btn-group-justified { .btn-group-justified {
display: table; display: table;
width: 100%; width: 100%;
table-layout: fixed;
.btn { .btn {
float: none; float: none;
display: table-cell; display: table-cell;