aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-02-11 17:27:08 -0800
committerMark Otto <[email protected]>2012-02-11 17:27:08 -0800
commit5b22cf5cc3f06d4f63dfbd7579cfec32eb2c2c79 (patch)
tree3c21843cb09555c24a15af35fc4a8c093ff570b8
parenta84092d2257ba8e000e2c656e6cb1b8415d0d9ac (diff)
downloadbootstrap-5b22cf5cc3f06d4f63dfbd7579cfec32eb2c2c79.tar.xz
bootstrap-5b22cf5cc3f06d4f63dfbd7579cfec32eb2c2c79.zip
fix tabs content wrapping per #1620
-rw-r--r--docs/assets/bootstrap.zipbin52683 -> 52687 bytes
-rw-r--r--docs/assets/css/bootstrap.css3
-rw-r--r--less/navs.less3
3 files changed, 6 insertions, 0 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 9055e367e..3284ea5eb 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 9654d856f..407ded775 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2282,6 +2282,9 @@ button.btn.small, input[type="submit"].btn.small {
.tabbable:after {
clear: both;
}
+.tab-content {
+ overflow: hidden;
+}
.tabs-below .nav-tabs, .tabs-right .nav-tabs, .tabs-left .nav-tabs {
border-bottom: 0;
}
diff --git a/less/navs.less b/less/navs.less
index a29cb712b..0d37ea388 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -249,6 +249,9 @@
.tabbable {
.clearfix();
}
+.tab-content {
+ overflow: hidden; // prevent content from running below tabs
+}
// Remove border on bottom, left, right
.tabs-below .nav-tabs,