aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-04-01 00:15:04 -0700
committerMark Otto <[email protected]>2012-04-01 00:15:04 -0700
commit33fa705c7fa9cc9e8c255cc2e161336ba21b3cff (patch)
treec21c1dc348402816068ee9feb2f10a36be3c294a
parentd652af10971d79cde92336700e156c63ff2c0b24 (diff)
downloadbootstrap-33fa705c7fa9cc9e8c255cc2e161336ba21b3cff.tar.xz
bootstrap-33fa705c7fa9cc9e8c255cc2e161336ba21b3cff.zip
fix #2811: left and right aligned tabbable tabs fixes so that .tab-content grows to match parent's width
-rw-r--r--docs/assets/bootstrap.zipbin57027 -> 56995 bytes
-rw-r--r--docs/assets/css/bootstrap.css7
-rw-r--r--less/navs.less7
3 files changed, 2 insertions, 12 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 674503a73..3f7c2b967 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 201d917a8..7f47a2124 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2780,8 +2780,7 @@ input[type="submit"].btn.btn-mini {
clear: both;
}
.tab-content {
- display: table;
- width: 100%;
+ overflow: auto;
}
.tabs-below .nav-tabs,
.tabs-right .nav-tabs,
@@ -2816,10 +2815,6 @@ input[type="submit"].btn.btn-mini {
.tabs-below .nav-tabs .active > a:hover {
border-color: transparent #ddd #ddd #ddd;
}
-.tabs-left .tab-content,
-.tabs-right .tab-content {
- width: auto;
-}
.tabs-left .nav-tabs > li,
.tabs-right .nav-tabs > li {
float: none;
diff --git a/less/navs.less b/less/navs.less
index a02be18f0..4f4b6c327 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -266,8 +266,7 @@
.clearfix();
}
.tab-content {
- display: table; // prevent content from running below tabs
- width: 100%;
+ overflow: auto; // prevent content from running below tabs
}
// Remove border on bottom, left, right
@@ -314,10 +313,6 @@
// ------------
// Common styles
-.tabs-left .tab-content,
-.tabs-right .tab-content {
- width: auto;
-}
.tabs-left .nav-tabs > li,
.tabs-right .nav-tabs > li {
float: none;