From 20b05e42e33bea09e0632d607e70bcf9552b8d65 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 2 Jan 2017 11:48:51 -0800 Subject: [PATCH] update rest of docs, remove navbar specific modifiers, fix docs example css --- docs/assets/scss/_component-examples.scss | 10 ++++---- docs/layout/overview.md | 4 ++-- js/tests/visual/scrollspy.html | 2 +- scss/_navbar.scss | 29 ----------------------- scss/_variables.scss | 16 ++++++------- 5 files changed, 17 insertions(+), 44 deletions(-) diff --git a/docs/assets/scss/_component-examples.scss b/docs/assets/scss/_component-examples.scss index a9c12a9c89..3cba772e6a 100644 --- a/docs/assets/scss/_component-examples.scss +++ b/docs/assets/scss/_component-examples.scss @@ -203,20 +203,22 @@ // Navbars .bd-example { - .navbar-fixed-top { + .fixed-top, + .sticky-top { position: static; margin: -1rem -1rem 1rem; } - .navbar-fixed-bottom { + .fixed-bottom { position: static; margin: 1rem -1rem -1rem; } @include media-breakpoint-up(sm) { - .navbar-fixed-top { + .fixed-top, + .sticky-top { margin: -1.5rem -1.5rem 1rem; } - .navbar-fixed-bottom { + .fixed-bottom { margin: 1rem -1.5rem -1.5rem; } } diff --git a/docs/layout/overview.md b/docs/layout/overview.md index 0bf0b33a10..736b9ed12d 100644 --- a/docs/layout/overview.md +++ b/docs/layout/overview.md @@ -171,8 +171,8 @@ We don't encourage customization of these values; should you change one, you lik $zindex-dropdown-backdrop: 990 !default; $zindex-navbar: 1000 !default; $zindex-dropdown: 1000 !default; -$zindex-navbar-fixed: 1030 !default; -$zindex-navbar-sticky: 1030 !default; +$zindex-fixed: 1030 !default; +$zindex-sticky: 1030 !default; $zindex-modal-backdrop: 1040 !default; $zindex-modal: 1050 !default; $zindex-popover: 1060 !default; diff --git a/js/tests/visual/scrollspy.html b/js/tests/visual/scrollspy.html index 853a6a7eeb..3d6ea95cf9 100644 --- a/js/tests/visual/scrollspy.html +++ b/js/tests/visual/scrollspy.html @@ -11,7 +11,7 @@
-