mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-26 06:44:35 +02:00
Code Issues Releases Wiki Activity

Simplify generation and get rid of previously added "breakpoint-previous" function

Browse Source
This commit is contained in:
Pierre-Denis Vanduynslager
2017-01-14 00:33:21 -05:00
committed by Mark Otto
parent c1325a756e
commit 89b47efc32
2 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scss/_navbar.scss
View File

@@ -126,11 +126,11 @@
// where your navbar collapses. // where your navbar collapses.
.navbar-toggleable { .navbar-toggleable {
@each $breakpoint in map-keys($grid-breakpoints) { @each $breakpoint in map-keys($grid-breakpoints) {
$previous: breakpoint-previous($breakpoint, $grid-breakpoints); $next: breakpoint-next($breakpoint, $grid-breakpoints);
$infix: breakpoint-infix($breakpoint, $grid-breakpoints); $infix: breakpoint-infix($next, $grid-breakpoints);
&#{$infix} { &#{$infix} {
@include media-breakpoint-down($previous) { @include media-breakpoint-down($breakpoint) {
.navbar-nav { .navbar-nav {
.dropdown-menu { .dropdown-menu {
position: static; position: static;
@@ -144,7 +144,7 @@
} }
} }
@include media-breakpoint-up($breakpoint) { @include media-breakpoint-up($next) {
flex-direction: row; flex-direction: row;
flex-wrap: nowrap; flex-wrap: nowrap;
align-items: center; align-items: center;

15
scss/mixins/_breakpoints.scss
View File

@@ -16,22 +16,9 @@
// md // md
@function breakpoint-next($name, $breakpoints: $grid-breakpoints, $breakpoint-names: map-keys($breakpoints)) { @function breakpoint-next($name, $breakpoints: $grid-breakpoints, $breakpoint-names: map-keys($breakpoints)) {
$n: index($breakpoint-names, $name); $n: index($breakpoint-names, $name);
@return if($n, if($n < length($breakpoint-names), nth($breakpoint-names, $n + 1), null), null); @return if($n < length($breakpoint-names), nth($breakpoint-names, $n + 1), null);
} }
// Name of the previous breakpoint, or null for the first breakpoint.
//
// >> breakpoint-previous(sm)
// xs
// >> breakpoint-next(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px))
// xs
// >> breakpoint-next(sm, $breakpoint-names: (xs sm md lg xl))
// xs
@function breakpoint-previous($name, $breakpoints: $grid-breakpoints, $breakpoint-names: map-keys($breakpoints)) {
$n: index($breakpoint-names, $name);
@return if($n != 1, nth($breakpoint-names, $n - 1), null);
};
// Minimum breakpoint width. Null for the smallest (first) breakpoint. // Minimum breakpoint width. Null for the smallest (first) breakpoint.
// //
// >> breakpoint-min(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px)) // >> breakpoint-min(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px))