Commit 61ac20eb authored by Mark Otto's avatar Mark Otto

Merge branch '3.0.0-wip' of https://github.com/salman-javed-confiz/bootstrap...

Merge branch '3.0.0-wip' of https://github.com/salman-javed-confiz/bootstrap into salman-javed-confiz-3.0.0-wip
parents 30801046 0caab585
...@@ -2605,6 +2605,7 @@ button.close { ...@@ -2605,6 +2605,7 @@ button.close {
} }
.nav-tabs.nav-justified { .nav-tabs.nav-justified {
display: table;
width: 100%; width: 100%;
border-bottom: 0; border-bottom: 0;
} }
...@@ -2612,7 +2613,7 @@ button.close { ...@@ -2612,7 +2613,7 @@ button.close {
.nav-tabs.nav-justified > li { .nav-tabs.nav-justified > li {
display: table-cell; display: table-cell;
float: none; float: none;
width: 1%; width: auto;
} }
.nav-tabs.nav-justified > li > a { .nav-tabs.nav-justified > li > a {
...@@ -2657,13 +2658,14 @@ button.close { ...@@ -2657,13 +2658,14 @@ button.close {
} }
.nav-justified { .nav-justified {
display: table;
width: 100%; width: 100%;
} }
.nav-justified > li { .nav-justified > li {
display: table-cell; display: table-cell;
float: none; float: none;
width: 1%; width: auto;
} }
.nav-justified > li > a { .nav-justified > li > a {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
...@@ -167,11 +167,12 @@ ...@@ -167,11 +167,12 @@
// ------------------------- // -------------------------
.nav-justified { .nav-justified {
display: table;
width: 100%; width: 100%;
> li { > li {
float: none; float: none;
display: table-cell; display: table-cell;
width: 1%; width: auto;
> a { > a {
text-align: center; text-align: center;
} }
......
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