clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-22 11:07:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

flexbox shiz

Browse Source
This commit is contained in:
Mark Otto 2016-12-21 14:16:04 -08:00 committed by Mark Otto
parent 60234f023b
commit 96346f0b44
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scss/_navbar.scss
View File

@ -9,7 +9,13 @@
@include media-breakpoint-up(sm) { @include media-breakpoint-up(sm) {
display: flex; display: flex;
flex: 0 0 auto; // flex: 0 0 auto;
flex-wrap: nowrap;
align-items: center;
}
// For nesting containers, have to redeclare for alignment purposes
> .container {
flex-wrap: nowrap; flex-wrap: nowrap;
align-items: center; align-items: center;
} }
@ -26,7 +32,6 @@
} }
// Navbar alignment options // Navbar alignment options
// //
// Display the navbar across the entirety of the page or fixed it to the top or // Display the navbar across the entirety of the page or fixed it to the top or
@ -62,19 +67,14 @@
.navbar-brand { .navbar-brand {
display: inline-block; display: inline-block;
padding-top: .25rem; margin-right: $navbar-padding-x;
padding-bottom: .25rem;
font-size: $font-size-lg; font-size: $font-size-lg;
line-height: inherit; line-height: inherit;
white-space: nowrap;
@include hover-focus { @include hover-focus {
text-decoration: none; text-decoration: none;
} }
@include media-breakpoint-up(sm) {
padding-right: .5rem;
padding-left: .5rem;
}
} }
.navbar-divider { .navbar-divider {
@ -258,6 +258,8 @@
$infix: breakpoint-infix($breakpoint, $grid-breakpoints); $infix: breakpoint-infix($breakpoint, $grid-breakpoints);
&#{$infix} { &#{$infix} {
@include media-breakpoint-down($breakpoint) { @include media-breakpoint-down($breakpoint) {
flex-grow: 10;
.navbar-nav { .navbar-nav {
.dropdown-menu { .dropdown-menu {
position: static; position: static;