2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00

Merge branch 'v4-dev' into colors-redux

This commit is contained in:
Mark Otto
2017-06-18 02:19:34 -07:00
57 changed files with 588 additions and 485 deletions
+2
View File
@@ -5,6 +5,8 @@
//
.bd-content {
order: 1;
// Hack the sticky header
> h2[id],
> h3[id],
+6 -7
View File
@@ -1,5 +1,3 @@
// scss-lint:disable VendorPrefix
//
// Main navbar
//
@@ -17,7 +15,7 @@
max-width: 100%;
height: 2.5rem;
margin-top: .25rem;
overflow-x: hidden;
overflow: hidden;
font-size: .875rem;
.navbar-nav {
@@ -30,10 +28,11 @@
}
@include media-breakpoint-up(md) {
position: -webkit-sticky;
position: sticky;
top: 0;
z-index: 1071; // over everything in bootstrap
@supports (position: sticky) {
position: sticky;
top: 0;
z-index: 1071; // over everything in bootstrap
}
}
.navbar-nav {
+2
View File
@@ -10,6 +10,7 @@
top: 4rem;
max-height: calc(100vh - 4rem);
}
order: 2;
padding-top: 1.5rem;
padding-bottom: 1.5rem;
overflow-x: visible;
@@ -49,6 +50,7 @@
//
.bd-sidebar {
order: 0;
background-color: #f5f2f9;
border-bottom: 1px solid rgba(0,0,0,.1);