aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-29 16:35:55 -0800
committerMark Otto <[email protected]>2012-01-29 16:35:55 -0800
commit702d3b6dfe7a150deb090f70d7d9c2a2964a3eb2 (patch)
tree9ef1b37622f3fded54b24e09fbc7a6bc9451c52d /less
parentd637db1a23883d905db8e086bfb97435738af940 (diff)
downloadbootstrap-702d3b6dfe7a150deb090f70d7d9c2a2964a3eb2.tar.xz
bootstrap-702d3b6dfe7a150deb090f70d7d9c2a2964a3eb2.zip
fix broken navbar collapse
Diffstat (limited to 'less')
-rw-r--r--less/responsive.less21
1 files changed, 16 insertions, 5 deletions
diff --git a/less/responsive.less b/less/responsive.less
index 7ae28b825..a1d4cf2c8 100644
--- a/less/responsive.less
+++ b/less/responsive.less
@@ -22,6 +22,7 @@
}
+
// UP TO LANDSCAPE PHONE
// ---------------------
@@ -103,11 +104,11 @@
}
+
// LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
// --------------------------------------------------
@media (max-width: 768px) {
-
// GRID & CONTAINERS
// -----------------
// Remove width from containers
@@ -133,6 +134,7 @@
}
+
// PORTRAIT TABLET TO DEFAULT DESKTOP
// ----------------------------------
@@ -225,6 +227,7 @@
}
+
// TABLETS AND BELOW
// -----------------
@media (max-width: 940px) {
@@ -335,17 +338,25 @@
}
// Hide everything in the navbar save .brand and toggle button */
- .nav-collapse.collapse {
+ .nav-collapse {
overflow: hidden;
height: 0;
}
- .nav-collapse.collapse.in {
- height: auto;
- }
+}
+
+
+
+// DEFAULT DESKTOP
+// ---------------
+@media (min-width: 940px) {
+ .nav-collapse.collapse {
+ height: auto !important;
+ }
}
+
// LARGE DESKTOP & UP
// ------------------