_navbar – fix .navbar-expand output order

See less/less.js#3340
calvinjuarez · Dec 6, 2018 · 6ee7936 · 6ee7936
1 parent 9e6f6b1
commit 6ee7936
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 100 deletions.
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
diff --git a/dist/css/bootstrap.css.map b/dist/css/bootstrap.css.map
diff --git a/dist/css/bootstrap.min.css b/dist/css/bootstrap.min.css
diff --git a/dist/css/bootstrap.min.css.map b/dist/css/bootstrap.min.css.map
diff --git a/less/_navbar.less b/less/_navbar.less
@@ -137,106 +137,106 @@
 
 // Generate series of `.navbar-expand-*` responsive classes for configuring
 // where your navbar collapses.
-.navbar-expand {
-	//@each @breakpoint in map-keys(@grid-breakpoints) {
-	//  @next: breakpoint-next(@breakpoint, @grid-breakpoints);
-	//  @infix: breakpoint-infix(@next, @grid-breakpoints);
-	//
-	//  &@{infix} {
-	//    @include media-breakpoint-down(@breakpoint) {
-	//      > .container,
-	//      > .container-fluid {
-	//        padding-right: 0;
-	//        padding-left: 0;
-	//      }
-	//    }
-	//
-	//    @include media-breakpoint-up(@next) {
-	//      flex-flow: row nowrap;
-	//      justify-content: flex-start;
-	//
-	//      .navbar-nav {
-	//        flex-direction: row;
-	//
-	//        .dropdown-menu {
-	//          position: absolute;
-	//        }
-	//
-	//        .nav-link {
-	//          padding-right: $navbar-nav-link-padding-x;
-	//          padding-left: $navbar-nav-link-padding-x;
-	//        }
-	//      }
-	//
-	//      // For nesting containers, have to redeclare for alignment purposes
-	//      > .container,
-	//      > .container-fluid {
-	//        flex-wrap: nowrap;
-	//      }
-	//
-	//      .navbar-collapse {
-	//        display: flex !important;  // stylelint-disable-line declaration-no-important
-	//
-	//        // Changes flex-bases to auto because of an IE10 bug
-	//        flex-basis: auto;
-	//      }
-	//
-	//      .navbar-toggler {
-	//        display: none;
-	//      }
-	//    }
-	//  }
-	//}
-	each(keys(@grid-breakpoints), #(@breakpoint) {
-		@next: breakpoint-next(@breakpoint, @grid-breakpoints);
-		@infix: breakpoint-infix(@next, @grid-breakpoints);
-
-		&@{infix} {
-			#media-breakpoint-down(@breakpoint, {
-				> .container,
-				> .container-fluid {
-					padding-right: 0;
-					padding-left: 0;
-				}
-			});
-
-			#media-breakpoint-up(@next, {
-				flex-flow: row nowrap;
-				justify-content: flex-start;
+//.navbar-expand {
+//  @each @breakpoint in map-keys(@grid-breakpoints) {
+//    @next: breakpoint-next(@breakpoint, @grid-breakpoints);
+//    @infix: breakpoint-infix(@next, @grid-breakpoints);
+//
+//    &@{infix} {
+//      @include media-breakpoint-down(@breakpoint) {
+//        > .container,
+//        > .container-fluid {
+//          padding-right: 0;
+//          padding-left: 0;
+//        }
+//      }
+//
+//      @include media-breakpoint-up(@next) {
+//        flex-flow: row nowrap;
+//        justify-content: flex-start;
+//
+//        .navbar-nav {
+//          flex-direction: row;
+//
+//          .dropdown-menu {
+//            position: absolute;
+//          }
+//
+//          .nav-link {
+//            padding-right: $navbar-nav-link-padding-x;
+//            padding-left: $navbar-nav-link-padding-x;
+//          }
+//        }
+//
+//        // For nesting containers, have to redeclare for alignment purposes
+//        > .container,
+//        > .container-fluid {
+//          flex-wrap: nowrap;
+//        }
+//
+//        .navbar-collapse {
+//          display: flex !important;  // stylelint-disable-line declaration-no-important
+//
+//          // Changes flex-bases to auto because of an IE10 bug
+//          flex-basis: auto;
+//        }
+//
+//        .navbar-toggler {
+//          display: none;
+//        }
+//      }
+//    }
+//  }
+//}
+each(keys(@grid-breakpoints), #(@breakpoint) {
+	@next: breakpoint-next(@breakpoint, @grid-breakpoints);
+	@infix: breakpoint-infix(@next, @grid-breakpoints);
+
+	.navbar-expand@{infix} {
+		#media-breakpoint-down(@breakpoint, {
+			> .container,
+			> .container-fluid {
+				padding-right: 0;
+				padding-left: 0;
+			}
+		});
 
-				.navbar-nav {
-					flex-direction: row;
+		#media-breakpoint-up(@next, {
+			flex-flow: row nowrap;
+			justify-content: flex-start;
 
-					.dropdown-menu {
-						position: absolute;
-					}
+			.navbar-nav {
+				flex-direction: row;
 
-					.nav-link {
-						padding-right: @navbar-nav-link-padding-x;
-						padding-left: @navbar-nav-link-padding-x;
-					}
+				.dropdown-menu {
+					position: absolute;
 				}
 
-				// For nesting containers, have to redeclare for alignment purposes
-				> .container,
-				> .container-fluid {
-					flex-wrap: nowrap;
+				.nav-link {
+					padding-right: @navbar-nav-link-padding-x;
+					padding-left: @navbar-nav-link-padding-x;
 				}
+			}
 
-				.navbar-collapse {
-					display: flex !important;
+			// For nesting containers, have to redeclare for alignment purposes
+			> .container,
+			> .container-fluid {
+				flex-wrap: nowrap;
+			}
 
-					// Changes flex-bases to auto because of an IE10 bug
-					flex-basis: auto;
-				}
+			.navbar-collapse {
+				display: flex !important;
 
-				.navbar-toggler {
-					display: none;
-				}
-			});
-		}
-	});
-}
+				// Changes flex-bases to auto because of an IE10 bug
+				flex-basis: auto;
+			}
+
+			.navbar-toggler {
+				display: none;
+			}
+		});
+	}
+});
 
 
 // Navbar themes