Skip to content

B
bootstrap
Commit 4bac2c56 authored by Mark Otto's avatar Mark Otto
Browse files
Options

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

Conflicts:
	dist/css/bootstrap.min.css
parents a0c44329 56aedcb7
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
dist/css/bootstrap.css
View file @ 4bac2c56
...@@ -3268,6 +3268,7 @@ button.close { ...@@ -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 {
......
dist/css/bootstrap.min.css
View file @ 4bac2c56
This source diff could not be displayed because it is too large. You can view the blob instead.
less/button-groups.less
View file @ 4bac2c56
...@@ -157,6 +157,7 @@ ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment