rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-19 16:54:24 +01:00
Code Issues Actions Packages Releases Activity

update rest of docs, remove navbar specific modifiers, fix docs example css

Browse Source
This commit is contained in:
Mark Otto 2017-01-02 11:48:51 -08:00
parent 4dc6f44796
commit 20b05e42e3
5 changed files with 17 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/assets/scss/_component-examples.scss
View File

@ -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;
}
}

4
docs/layout/overview.md
View File

@ -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;

2
js/tests/visual/scrollspy.html
View File

@ -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">

29
scss/_navbar.scss
View File

@ -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.

16
scss/_variables.scss
View File

@ -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