diff options
| author | Mark Otto <[email protected]> | 2017-01-02 11:48:51 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-01-02 11:48:51 -0800 |
| commit | 20b05e42e33bea09e0632d607e70bcf9552b8d65 (patch) | |
| tree | 154b081d33fdba9b9fcae8c259aa05eedb285e98 | |
| parent | 4dc6f44796c2b73d40f72fff0f809cc3f87b7343 (diff) | |
| download | bootstrap-20b05e42e33bea09e0632d607e70bcf9552b8d65.tar.xz bootstrap-20b05e42e33bea09e0632d607e70bcf9552b8d65.zip | |
update rest of docs, remove navbar specific modifiers, fix docs example css
| -rw-r--r-- | docs/assets/scss/_component-examples.scss | 10 | ||||
| -rw-r--r-- | docs/layout/overview.md | 4 | ||||
| -rw-r--r-- | js/tests/visual/scrollspy.html | 2 | ||||
| -rw-r--r-- | scss/_navbar.scss | 29 | ||||
| -rw-r--r-- | 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 a9c12a9c8..3cba772e6 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 0bf0b33a1..736b9ed12 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 853a6a7ee..3d6ea95cf 100644 --- a/js/tests/visual/scrollspy.html +++ b/js/tests/visual/scrollspy.html @@ -11,7 +11,7 @@ </head> <body data-spy="scroll" data-target=".navbar" data-offset="70"> <div class="container"> - <nav class="navbar navbar-fixed-top navbar-dark bg-inverse"> + <nav class="navbar fixed-top navbar-dark bg-inverse"> <a class="navbar-brand" href="#">Scrollspy test</a> <ul class="nav navbar-nav"> <li class="nav-item"> 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 |