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

Conflicts: dist/css/bootstrap.min.css

Merge branch 'btngroup' of https://github.com/liuyl/bootstrap into liuyl-btngroup
Conflicts: dist/css/bootstrap.min.css
4bac2c56 · Mark Otto · a0c44329 · 56aedcb7 · 4bac2c56 · 4bac2c56
Commit 4bac2c56 authored Aug 02, 2013 by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

dist/css/bootstrap.css dist/css/bootstrap.css +1 -0

dist/css/bootstrap.min.css dist/css/bootstrap.min.css +1 -1

less/button-groups.less less/button-groups.less +1 -0

No files found.
--- 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 {

--- a/dist/css/bootstrap.min.css
+++ b/dist/css/bootstrap.min.css
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -157,6 +157,7 @@
 .btn-group-justified {
  display: table;
  width: 100%;
+  table-layout: fixed;
  .btn {
    float: none;
    display: table-cell;