aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-06 17:40:33 -0700
committerMark Otto <[email protected]>2013-08-06 17:40:33 -0700
commitab79b4ac2defa9c9d86cc208ee203871f18af642 (patch)
treefddac501b523634e880ea34235a97e0e3df8e2f8 /dist/css/bootstrap.css
parentf3bf32ffc51c1bafd60f5704a638fc56cf464386 (diff)
parent167753273adbe944fac615025ff52ac89d36221d (diff)
downloadbootstrap-ab79b4ac2defa9c9d86cc208ee203871f18af642.tar.xz
bootstrap-ab79b4ac2defa9c9d86cc208ee203871f18af642.zip
Merge branch '3.0.0-wip' into bs3_third_party_support_docs
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css31
1 files changed, 30 insertions, 1 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index bc7894a7a..b3954d47d 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2811,7 +2811,6 @@ button.close {
}
.navbar-nav {
- margin-top: 10px;
margin-bottom: 15px;
}
@@ -2869,6 +2868,35 @@ button.close {
margin-bottom: 0;
}
+.nav-collapse {
+ padding-bottom: 15px;
+}
+
+.nav-collapse:before,
+.nav-collapse:after {
+ display: table;
+ content: " ";
+}
+
+.nav-collapse:after {
+ clear: both;
+}
+
+.nav-collapse:before,
+.nav-collapse:after {
+ display: table;
+ content: " ";
+}
+
+.nav-collapse:after {
+ clear: both;
+}
+
+.navbar-toggle + .nav-collapse {
+ width: 100%;
+ margin-top: 50px;
+}
+
@media (max-width: 768px) {
.nav-collapse-scrollable {
max-height: 360px;
@@ -3103,6 +3131,7 @@ button.close {
.nav-collapse.collapse {
display: block !important;
height: auto !important;
+ padding-bottom: 0;
overflow: visible !important;
}
}