aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-07-24 16:42:13 -0700
committerMark Otto <[email protected]>2013-07-24 16:42:13 -0700
commit61ac20ebb5f30094d287048300348d58d5622afd (patch)
treeb4a99532d7fb90fd97d737abc0fdf1e1622ca35a /dist/css/bootstrap.css
parent3080104642cd952d830e534eddd38ec67fee914b (diff)
parent0caab585f557513f936f4664ad1cdbddbfde9add (diff)
downloadbootstrap-61ac20ebb5f30094d287048300348d58d5622afd.tar.xz
bootstrap-61ac20ebb5f30094d287048300348d58d5622afd.zip
Merge branch '3.0.0-wip' of https://github.com/salman-javed-confiz/bootstrap into salman-javed-confiz-3.0.0-wip
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css6
1 files changed, 4 insertions, 2 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index c77092ed2..418a2663f 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2605,6 +2605,7 @@ button.close {
}
.nav-tabs.nav-justified {
+ display: table;
width: 100%;
border-bottom: 0;
}
@@ -2612,7 +2613,7 @@ button.close {
.nav-tabs.nav-justified > li {
display: table-cell;
float: none;
- width: 1%;
+ width: auto;
}
.nav-tabs.nav-justified > li > a {
@@ -2657,13 +2658,14 @@ button.close {
}
.nav-justified {
+ display: table;
width: 100%;
}
.nav-justified > li {
display: table-cell;
float: none;
- width: 1%;
+ width: auto;
}
.nav-justified > li > a {