aboutsummaryrefslogtreecommitdiff
path: root/docs
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 /docs
parent4dc6f44796c2b73d40f72fff0f809cc3f87b7343 (diff)
downloadbootstrap-20b05e42e33bea09e0632d607e70bcf9552b8d65.tar.xz
bootstrap-20b05e42e33bea09e0632d607e70bcf9552b8d65.zip
update rest of docs, remove navbar specific modifiers, fix docs example css
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/scss/_component-examples.scss10
-rw-r--r--docs/layout/overview.md4
2 files changed, 8 insertions, 6 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;