aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-01-02 11:48:51 -0800
committerMark Otto <[email protected]>2017-01-02 11:48:51 -0800
commit20b05e42e33bea09e0632d607e70bcf9552b8d65 (patch)
tree154b081d33fdba9b9fcae8c259aa05eedb285e98 /scss
parent4dc6f44796c2b73d40f72fff0f809cc3f87b7343 (diff)
downloadbootstrap-20b05e42e33bea09e0632d607e70bcf9552b8d65.tar.xz
bootstrap-20b05e42e33bea09e0632d607e70bcf9552b8d65.zip
update rest of docs, remove navbar specific modifiers, fix docs example css
Diffstat (limited to 'scss')
-rw-r--r--scss/_navbar.scss29
-rw-r--r--scss/_variables.scss16
2 files changed, 8 insertions, 37 deletions
diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index 8448df47b..9be577db5 100644
--- a/scss/_navbar.scss
+++ b/scss/_navbar.scss
@@ -173,35 +173,6 @@
}
-// Navbar position
-//
-// Display the navbar across the entirety of the page or fixed it to the top or
-// bottom of the page.
-
-// 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;
-}
-
-.navbar-sticky-top {
- position: sticky;
- top: 0;
- z-index: $zindex-navbar-sticky;
-}
-
-
// Navbar themes
//
// Styles for switching between navbars with light or dark background.
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 7db751d4c..44e4d5737 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -593,14 +593,14 @@ $dropdown-header-color: $gray-light !default;
// of components dependent on the z-axis and are designed to all work together.
$zindex-dropdown-backdrop: 990 !default;
-$zindex-navbar: 1000 !default;
-$zindex-dropdown: 1000 !default;
-$zindex-navbar-fixed: 1030 !default;
-$zindex-navbar-sticky: 1030 !default;
-$zindex-modal-backdrop: 1040 !default;
-$zindex-modal: 1050 !default;
-$zindex-popover: 1060 !default;
-$zindex-tooltip: 1070 !default;
+$zindex-navbar: 1000 !default;
+$zindex-dropdown: 1000 !default;
+$zindex-fixed: 1030 !default;
+$zindex-sticky: 1030 !default;
+$zindex-modal-backdrop: 1040 !default;
+$zindex-modal: 1050 !default;
+$zindex-popover: 1060 !default;
+$zindex-tooltip: 1070 !default;
// Navbar