From f38e50cdf146fb99f0f0178e7ea7f636544d7ce2 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sat, 16 Feb 2013 00:19:17 -0800
Subject: [PATCH] Don't affix the fixed navbars in mobile views
---
docs/assets/css/bootstrap.css | 25 +++++++++++++------------
docs/assets/css/docs.css | 6 +++---
less/navbar.less | 19 ++++++++++++-------
3 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 42d53fdd64..73db5262db 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3116,21 +3116,9 @@ button.close {
.navbar-fixed-top,
.navbar-fixed-bottom {
- position: fixed;
- right: 0;
- left: 0;
- z-index: 1030;
border-radius: 0;
}
-.navbar-fixed-top {
- top: 0;
-}
-
-.navbar-fixed-bottom {
- bottom: 0;
-}
-
.navbar .brand {
display: inline-block;
padding: 7px 15px;
@@ -3329,6 +3317,19 @@ button.close {
.navbar-inverse .nav > .divider {
border-right-color: #2f2f2f;
}
+ .navbar-fixed-top,
+ .navbar-fixed-bottom {
+ position: fixed;
+ right: 0;
+ left: 0;
+ z-index: 1030;
+ }
+ .navbar-fixed-top {
+ top: 0;
+ }
+ .navbar-fixed-bottom {
+ bottom: 0;
+ }
.navbar .btn-navbar {
display: none;
}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index e42e5e8690..5f19d11b6c 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -10,7 +10,7 @@
body {
position: relative; /* For scrollyspy */
- padding-top: 62px; /* Default height of navbar */
+ /* We add the padding to the body for >768px only */
}
/* */
@@ -534,9 +534,9 @@ input.focused {
/* Tablets and up */
@media screen and (min-width: 768px) {
- /* Account for fixed navbar */
+ /* Account for fixed navbar (which is static to start) */
body {
- padding-top: 50px;
+ padding-top: 62px; /* Default height of navbar */
}
/* Tweak display of docs jumbotrons */
diff --git a/less/navbar.less b/less/navbar.less
index c043d8462a..b82534e430 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -49,17 +49,11 @@
border-radius: 0;
}
-// Fixed navbar
+// Fixed navbars aren't fixed to start; that comes at >768px
.navbar-fixed-top,
.navbar-fixed-bottom {
- position: fixed;
- right: 0;
- left: 0;
- z-index: @zindex-navbar-fixed;
border-radius: 0;
}
-.navbar-fixed-top { top: 0; }
-.navbar-fixed-bottom { bottom: 0; }
@@ -276,6 +270,17 @@
border-right-color: lighten(@navbar-inverse-bg, 5%);
}
+ // Fix the top/bottom navbars when screen real estate supports it
+ .navbar-fixed-top,
+ .navbar-fixed-bottom {
+ position: fixed;
+ right: 0;
+ left: 0;
+ z-index: @zindex-navbar-fixed;
+ }
+ .navbar-fixed-top { top: 0; }
+ .navbar-fixed-bottom { bottom: 0; }
+
// Required to make the collapsing navbar work on regular desktops
.navbar .btn-navbar {
display: none;
--
GitLab