From: Pierre-Denis Vanduynslager <pierre.denis.vanduynslager@gmail.com>
Date: Sat, 14 Jan 2017 05:33:21 +0000 (-0500)
Subject: Simplify generation and get rid of previously added "breakpoint-previous" function
X-Git-Tag: v4.0.0-beta~147^2~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89b47efc32f2c6575ab16f71c2c8e5db3c581d21;p=thirdparty%2Fbootstrap.git

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

diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index a0856cb816..517a8aa928 100644
--- a/scss/_navbar.scss
+++ b/scss/_navbar.scss
@@ -126,11 +126,11 @@
 // where your navbar collapses.
 .navbar-toggleable {
   @each $breakpoint in map-keys($grid-breakpoints) {
-    $previous: breakpoint-previous($breakpoint, $grid-breakpoints);
-    $infix: breakpoint-infix($breakpoint, $grid-breakpoints);
+    $next: breakpoint-next($breakpoint, $grid-breakpoints);
+    $infix: breakpoint-infix($next, $grid-breakpoints);
 
     &#{$infix} {
-      @include media-breakpoint-down($previous) {
+      @include media-breakpoint-down($breakpoint) {
         .navbar-nav {
           .dropdown-menu {
             position: static;
@@ -144,7 +144,7 @@
         }
       }
 
-      @include media-breakpoint-up($breakpoint) {
+      @include media-breakpoint-up($next) {
         flex-direction: row;
         flex-wrap: nowrap;
         align-items: center;
diff --git a/scss/mixins/_breakpoints.scss b/scss/mixins/_breakpoints.scss
index b2d90c4470..904b60f7ad 100644
--- a/scss/mixins/_breakpoints.scss
+++ b/scss/mixins/_breakpoints.scss
@@ -16,22 +16,9 @@
 //    md
 @function breakpoint-next($name, $breakpoints: $grid-breakpoints, $breakpoint-names: map-keys($breakpoints)) {
   $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.
 //
 //    >> breakpoint-min(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px))