]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4dc6f44)
update rest of docs, remove navbar specific modifiers, fix docs example css
authorMark Otto <markdotto@gmail.com>
Mon, 2 Jan 2017 19:48:51 +0000 (11:48 -0800)
committerMark Otto <markdotto@gmail.com>
Mon, 2 Jan 2017 19:48:51 +0000 (11:48 -0800)
docs/assets/scss/_component-examples.scss patch | blob | blame | history
docs/layout/overview.md patch | blob | blame | history
js/tests/visual/scrollspy.html patch | blob | blame | history
scss/_navbar.scss patch | blob | blame | history
scss/_variables.scss patch | blob | blame | history

diff --git a/docs/assets/scss/_component-examples.scss b/docs/assets/scss/_component-examples.scss
index a9c12a9c89a7683d985c62c2dab2d76d7aa99a11..3cba772e6a019f6a0d013aba192d04f8a78b0df3 100644 (file)
--- 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 0bf0b33a1071197de1825378f65daa8091667339..736b9ed12da68a8e43689e9f0809368f253c19f6 100644 (file)
--- 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 853a6a7eeb1b0446cd76b010e12be5eed9fef0a7..3d6ea95cf9229388642224bba6d208f278c6388f 100644 (file)
--- 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 8448df47b7ecb2852f083a53ba045490a05c45ee..9be577db5c32d7f2de290eedf0d9fa8f4c6e5c28 100644 (file)
--- 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 7db751d4c6eb66f53e943bb8125373330bdf9123..44e4d57370050681bfe2f8930f422009e5e830c2 100644 (file)
--- 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
Mirror of https://github.com/twbs/bootstrap.git