From: Mark Otto <markotto@twitter.com>
Date: Sun, 12 Feb 2012 01:27:08 +0000 (-0800)
Subject: fix tabs content wrapping per #1620
X-Git-Tag: v2.0.1~1^2~17^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b22cf5cc3f06d4f63dfbd7579cfec32eb2c2c79;p=thirdparty%2Fbootstrap.git

fix tabs content wrapping per #1620
---

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 9055e367ec..3284ea5eb0 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 9654d856fa..407ded7756 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 a29cb712bb..0d37ea388e 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,