mirror of
https://github.com/Hopiu/bootstrap.git
synced 2026-03-24 08:20:23 +00:00
Merge branch 'btngroup' of https://github.com/liuyl/bootstrap into liuyl-btngroup
Conflicts: dist/css/bootstrap.min.css
This commit is contained in:
commit
4bac2c567a
3 changed files with 3 additions and 1 deletions
1
dist/css/bootstrap.css
vendored
1
dist/css/bootstrap.css
vendored
|
|
@ -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
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 {
|
||||
display: table;
|
||||
width: 100%;
|
||||
table-layout: fixed;
|
||||
.btn {
|
||||
float: none;
|
||||
display: table-cell;
|
||||
|
|
|
|||
Loading…
Reference in a new issue