2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-15 11:59:39 +03: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
3 changed files with 3 additions and 1 deletions
+1
View File
@@ -3268,6 +3268,7 @@ button.close {
.btn-group-justified {
display: table;
width: 100%;
table-layout: fixed;
}
.btn-group-justified .btn {
+1 -1
View File
File diff suppressed because one or more lines are too long
+1
View File
@@ -157,6 +157,7 @@
.btn-group-justified {
display: table;
width: 100%;
table-layout: fixed;
.btn {
float: none;
display: table-cell;