Skip to content

B
bootstrap
Commit 53a3ff74 authored by Mark Otto's avatar Mark Otto
Browse files
Options

redo sidenav

parent 982c255c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 83 additions and 49 deletions
dist/css/bootstrap.css
View file @ 53a3ff74
...@@ -194,24 +194,16 @@ td, th { ...@@ -194,24 +194,16 @@ td, th {
@media print { @media print {
*, *:before, *:after { *, *:before, *:after {
color: #000 !important;
text-shadow: none !important; text-shadow: none !important;
background: transparent !important;
-webkit-box-shadow: none !important; -webkit-box-shadow: none !important;
box-shadow: none !important; box-shadow: none !important;
} }
a, a:visited { a, a:visited {
text-decoration: underline; text-decoration: underline;
} }
a[href]:after {
content: " (" attr(href) ")";
}
abbr[title]:after { abbr[title]:after {
content: " (" attr(title) ")"; content: " (" attr(title) ")";
} }
a[href^="#"]:after, a[href^="javascript:"]:after {
content: "";
}
pre, blockquote { pre, blockquote {
border: 1px solid #999; border: 1px solid #999;
...@@ -3243,6 +3235,19 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto ...@@ -3243,6 +3235,19 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
bottom: 0; bottom: 0;
} }
.navbar-sticky-top {
position: -webkit-sticky;
position: sticky;
top: 0;
z-index: 1030;
width: 100%;
}
@media (min-width: 34em) {
.navbar-sticky-top {
border-radius: 0;
}
}
.navbar-brand { .navbar-brand {
float: left; float: left;
padding: .725rem .75rem; padding: .725rem .75rem;
......
dist/css/bootstrap.css.map
View file @ 53a3ff74
This diff was suppressed by a .gitattributes entry.
dist/css/bootstrap.min.css
View file @ 53a3ff74
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/assets/css/docs.min.css
View file @ 53a3ff74
This diff is collapsed.
docs/assets/css/docs.min.css.map
View file @ 53a3ff74
This diff was suppressed by a .gitattributes entry.
docs/assets/scss/docs.scss
View file @ 53a3ff74
...@@ -646,7 +646,7 @@ body { ...@@ -646,7 +646,7 @@ body {
.bs-docs-sidebar { .bs-docs-sidebar {
padding: 0; padding: 0;
margin-bottom: 0; margin-bottom: 0;
background-color: #322f38; // background-color: #322f38;
} }
.bs-docs-sidebar .navbar-toggle { .bs-docs-sidebar .navbar-toggle {
...@@ -682,7 +682,8 @@ body { ...@@ -682,7 +682,8 @@ body {
width: 240px; width: 240px;
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
@include gradient-vertical(#29262f, #322f38); border-right: 1px solid #eee;
// @include gradient-vertical(#29262f, #322f38);
} }
} }
...@@ -694,16 +695,21 @@ body { ...@@ -694,16 +695,21 @@ body {
font-size: 20px; font-size: 20px;
font-weight: 500; font-weight: 500;
line-height: 1; line-height: 1;
color: #fff; // color: #fff;
} }
.bs-docs-sidebar-brand:hover, .bs-docs-sidebar-brand:hover,
.bs-docs-sidebar-brand:focus { .bs-docs-sidebar-brand:focus {
color: #fff; // color: #fff;
text-decoration: none; text-decoration: none;
} }
.bs-docs-search { .bs-docs-search {
position: relative; position: relative;
// .form-control {
// width: 12rem;
// }
margin-right: 1.25rem; margin-right: 1.25rem;
margin-bottom: 1.5rem; margin-bottom: 1.5rem;
margin-left: 1.25rem; margin-left: 1.25rem;
...@@ -712,14 +718,14 @@ body { ...@@ -712,14 +718,14 @@ body {
height: 2.45rem; height: 2.45rem;
padding-top: .4rem; padding-top: .4rem;
padding-bottom: .4rem; padding-bottom: .4rem;
color: rgba(255,255,255,.5); // color: rgba(255,255,255,.5);
background-color: lighten(#29262f, 10%); // background-color: lighten(#29262f, 10%);
border-color: lighten(#29262f, 15%); // border-color: lighten(#29262f, 15%);
&:focus { // &:focus {
border-color: rgba(255,255,255,.25); // border-color: rgba(255,255,255,.25);
box-shadow: 0 0 .5rem rgba(255,255,255,.25); // box-shadow: 0 0 .5rem rgba(255,255,255,.25);
} // }
} }
} }
...@@ -754,44 +760,48 @@ body { ...@@ -754,44 +760,48 @@ body {
.bs-docs-toc-link { .bs-docs-toc-link {
display: block; display: block;
padding: 4px 20px; padding: .25rem 1.25rem;
font-size: 16px; color: $gray;
color: #fff; // font-size: 1rem;
// color: #fff;
} }
.bs-docs-toc-link:hover, .bs-docs-toc-link:hover,
.bs-docs-toc-link:focus { .bs-docs-toc-link:focus {
color: $bs-yellow; // color: $bs-yellow;
color: $brand-primary;
text-decoration: none; text-decoration: none;
} }
.active > .bs-docs-toc-link { .active > .bs-docs-toc-link {
font-weight: 500; font-weight: 500;
color: $bs-yellow; color: $gray-dark;
// color: $bs-yellow;
} }
.active > .bs-docs-sidenav { .active > .bs-docs-sidenav {
display: block; display: block;
} }
.bs-docs-toc-item.active { .bs-docs-toc-item.active {
margin-top: 15px; margin-top: 1rem;
margin-bottom: 15px; margin-bottom: 1rem;
} }
.bs-docs-toc-item:first-child { .bs-docs-toc-item:first-child {
margin-top: 0; margin-top: 0;
} }
.bs-docs-toc-item:last-child { .bs-docs-toc-item:last-child {
margin-bottom: 30px; margin-bottom: 2rem;
} }
// All levels of nav // All levels of nav
.bs-docs-sidebar .nav > li > a { .bs-docs-sidebar .nav > li > a {
display: block; display: block;
padding: 4px 20px; padding: .25rem 1.25rem;
font-size: 14px; font-size: 90%;
color: #99979c; color: #99979c;
} }
.bs-docs-sidebar .nav > li > a:hover, .bs-docs-sidebar .nav > li > a:hover,
.bs-docs-sidebar .nav > li > a:focus { .bs-docs-sidebar .nav > li > a:focus {
color: $bs-yellow; color: $brand-primary;
// color: $bs-yellow;
text-decoration: none; text-decoration: none;
background-color: transparent; background-color: transparent;
} }
...@@ -799,20 +809,21 @@ body { ...@@ -799,20 +809,21 @@ body {
.bs-docs-sidebar .nav > .active:hover > a, .bs-docs-sidebar .nav > .active:hover > a,
.bs-docs-sidebar .nav > .active:focus > a { .bs-docs-sidebar .nav > .active:focus > a {
font-weight: 500; font-weight: 500;
color: $bs-yellow; color: $gray-dark;
// color: $bs-yellow;
background-color: transparent; background-color: transparent;
} }
// Nav: second level (shown on .active) // Nav: second level (shown on .active)
.bs-docs-sidebar .nav .nav { .bs-docs-sidebar .nav .nav {
display: none; // Hide by default, but at >768px, show it display: none; // Hide by default, but at >768px, show it
padding-bottom: 10px; padding-bottom: .75rem;
} }
.bs-docs-sidebar .nav .nav > li > a { .bs-docs-sidebar .nav .nav > li > a {
padding-top: 1px; padding-top: 1px;
padding-bottom: 1px; padding-bottom: 1px;
padding-left: 30px; padding-left: 2rem;
font-size: 12px; font-size: 75%;
font-weight: normal; font-weight: normal;
} }
.bs-docs-sidebar .nav .nav > .active > a, .bs-docs-sidebar .nav .nav > .active > a,
...@@ -825,10 +836,10 @@ body { ...@@ -825,10 +836,10 @@ body {
display: block; display: block;
} }
.bs-docs-sidebar .nav .nav > li > a { .bs-docs-sidebar .nav .nav > li > a {
padding-top: 2px; padding-top: .125rem;
padding-bottom: 2px; padding-bottom: .125rem;
padding-left: 30px; padding-left: 2rem;
font-size: 13px; font-size: 80%;
} }
......
docs/dist/css/bootstrap.css
View file @ 53a3ff74
...@@ -194,24 +194,16 @@ td, th { ...@@ -194,24 +194,16 @@ td, th {
@media print { @media print {
*, *:before, *:after { *, *:before, *:after {
color: #000 !important;
text-shadow: none !important; text-shadow: none !important;
background: transparent !important;
-webkit-box-shadow: none !important; -webkit-box-shadow: none !important;
box-shadow: none !important; box-shadow: none !important;
} }
a, a:visited { a, a:visited {
text-decoration: underline; text-decoration: underline;
} }
a[href]:after {
content: " (" attr(href) ")";
}
abbr[title]:after { abbr[title]:after {
content: " (" attr(title) ")"; content: " (" attr(title) ")";
} }
a[href^="#"]:after, a[href^="javascript:"]:after {
content: "";
}
pre, blockquote { pre, blockquote {
border: 1px solid #999; border: 1px solid #999;
...@@ -3243,6 +3235,19 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto ...@@ -3243,6 +3235,19 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
bottom: 0; bottom: 0;
} }
.navbar-sticky-top {
position: -webkit-sticky;
position: sticky;
top: 0;
z-index: 1030;
width: 100%;
}
@media (min-width: 34em) {
.navbar-sticky-top {
border-radius: 0;
}
}
.navbar-brand { .navbar-brand {
float: left; float: left;
padding: .725rem .75rem; padding: .725rem .75rem;
......
docs/dist/css/bootstrap.css.map
View file @ 53a3ff74
This diff was suppressed by a .gitattributes entry.
docs/dist/css/bootstrap.min.css
View file @ 53a3ff74
This source diff could not be displayed because it is too large. You can view the blob instead.
scss/_navbar.scss
View file @ 53a3ff74
...@@ -58,6 +58,18 @@ ...@@ -58,6 +58,18 @@
bottom: 0; bottom: 0;
} }
.navbar-sticky-top {
position: sticky;
top: 0;
width: 100%;
z-index: $zindex-navbar-sticky;
// Undo the rounded corners
@include media-breakpoint-up(sm) {
@include border-radius(0);
}
}
// Brand/project name // Brand/project name
......
scss/_variables.scss
View file @ 53a3ff74
...@@ -225,6 +225,7 @@ $zindex-dropdown: 1000 !default; ...@@ -225,6 +225,7 @@ $zindex-dropdown: 1000 !default;
$zindex-popover: 1060 !default; $zindex-popover: 1060 !default;
$zindex-tooltip: 1070 !default; $zindex-tooltip: 1070 !default;
$zindex-navbar-fixed: 1030 !default; $zindex-navbar-fixed: 1030 !default;
$zindex-navbar-sticky: 1030 !default;
$zindex-modal-bg: 1040 !default; $zindex-modal-bg: 1040 !default;
$zindex-modal: 1050 !default; $zindex-modal: 1050 !default;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment