mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-06 21:56:42 +02:00
Merge branch 'btngroup' of https://github.com/liuyl/bootstrap into liuyl-btngroup
Conflicts: dist/css/bootstrap.min.css
This commit is contained in:
1
dist/css/bootstrap.css
vendored
1
dist/css/bootstrap.css
vendored
@@ -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 {
|
||||||
|
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
@@ -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;
|
||||||
|
Reference in New Issue
Block a user