aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-02 20:19:20 -0700
committerMark Otto <[email protected]>2013-08-02 20:19:20 -0700
commit4bac2c567a139958cb2ff35f7ad30c7dcd8527a3 (patch)
tree15ff3959662ad861714d70529d7f5f233c5c5fe9 /dist/css/bootstrap.css
parenta0c44329e31f4ab3f1a5ea241074f0e7bd50a3f8 (diff)
parent56aedcb71397c867396455b6860d627c1efe2707 (diff)
downloadbootstrap-4bac2c567a139958cb2ff35f7ad30c7dcd8527a3.tar.xz
bootstrap-4bac2c567a139958cb2ff35f7ad30c7dcd8527a3.zip
Merge branch 'btngroup' of https://github.com/liuyl/bootstrap into liuyl-btngroup
Conflicts: dist/css/bootstrap.min.css
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css1
1 files changed, 1 insertions, 0 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 5e9656918..219940b2a 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -3268,6 +3268,7 @@ button.close {
.btn-group-justified {
display: table;
width: 100%;
+ table-layout: fixed;
}
.btn-group-justified .btn {