root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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
parent a0c44329e3 56aedcb713
commit 4bac2c567a
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dist/css/bootstrap.css vendored
View File

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

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

File diff suppressed because one or more lines are too long

1
less/button-groups.less
View File

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