diff --git a/docs/_includes/nav-home.html b/docs/_includes/nav-home.html index 513a34bdcc..d92fab0695 100644 --- a/docs/_includes/nav-home.html +++ b/docs/_includes/nav-home.html @@ -1,4 +1,4 @@ - + {% comment %} diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html index f617c57904..6ccb108051 100644 --- a/docs/examples/carousel/index.html +++ b/docs/examples/carousel/index.html @@ -17,7 +17,7 @@ - + Carousel diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html index ccdcfd9f6e..33f5e05494 100644 --- a/docs/examples/dashboard/index.html +++ b/docs/examples/dashboard/index.html @@ -17,7 +17,7 @@ - + Dashboard diff --git a/docs/examples/jumbotron/index.html b/docs/examples/jumbotron/index.html index c07cb27d0d..d2cb0a4b76 100644 --- a/docs/examples/jumbotron/index.html +++ b/docs/examples/jumbotron/index.html @@ -18,7 +18,7 @@ - + Navbar diff --git a/docs/examples/justified-nav/index.html b/docs/examples/justified-nav/index.html index 5306423fab..303def254a 100644 --- a/docs/examples/justified-nav/index.html +++ b/docs/examples/justified-nav/index.html @@ -27,7 +27,7 @@ - + Home (current) diff --git a/docs/examples/navbar-top-fixed/index.html b/docs/examples/navbar-top-fixed/index.html index f9a1eb3dbc..b7eee96cde 100644 --- a/docs/examples/navbar-top-fixed/index.html +++ b/docs/examples/navbar-top-fixed/index.html @@ -18,7 +18,7 @@ - + Fixed navbar diff --git a/docs/examples/navbar-top/index.html b/docs/examples/navbar-top/index.html index 2c37d0e183..e010069862 100644 --- a/docs/examples/navbar-top/index.html +++ b/docs/examples/navbar-top/index.html @@ -18,7 +18,7 @@ - + Top navbar diff --git a/docs/examples/navbars/index.html b/docs/examples/navbars/index.html index b6a7ad8e38..ecd667dc19 100644 --- a/docs/examples/navbars/index.html +++ b/docs/examples/navbars/index.html @@ -18,8 +18,8 @@ - - Navbar + + Never expand @@ -45,13 +45,172 @@ - - Search + - + + Expand + + + + + + + + Home (current) + + + Link + + + Disabled + + + Dropdown + + Action + Another action + Something else here + + + + + + + + + + + Expand at sm + + + + + + + + Home (current) + + + Link + + + Disabled + + + Dropdown + + Action + Another action + Something else here + + + + + + + + + + + Expand at md + + + + + + + + Home (current) + + + Link + + + Disabled + + + Dropdown + + Action + Another action + Something else here + + + + + + + + + + + Expand at lg + + + + + + + + Home (current) + + + Link + + + Disabled + + + Dropdown + + Action + Another action + Something else here + + + + + + + + + + + Expand at xl + + + + + + + + Home (current) + + + Link + + + Disabled + + + Dropdown + + Action + Another action + Something else here + + + + + + + + + + Container @@ -79,14 +238,13 @@ - - Search + - + @@ -115,7 +273,7 @@ - + Navbar @@ -142,13 +300,12 @@ - - Search + - + diff --git a/docs/examples/offcanvas/index.html b/docs/examples/offcanvas/index.html index fd428cecc9..001e50871a 100644 --- a/docs/examples/offcanvas/index.html +++ b/docs/examples/offcanvas/index.html @@ -18,7 +18,7 @@ - + Navbar diff --git a/docs/examples/starter-template/index.html b/docs/examples/starter-template/index.html index ba6e427bf3..e99674e5d2 100644 --- a/docs/examples/starter-template/index.html +++ b/docs/examples/starter-template/index.html @@ -18,7 +18,7 @@ - + Navbar diff --git a/docs/examples/sticky-footer-navbar/index.html b/docs/examples/sticky-footer-navbar/index.html index 981bc7c088..0d7ee66ef1 100644 --- a/docs/examples/sticky-footer-navbar/index.html +++ b/docs/examples/sticky-footer-navbar/index.html @@ -19,7 +19,7 @@ - + Fixed navbar diff --git a/docs/migration.md b/docs/migration.md index 166533db10..9cbdca52cd 100644 --- a/docs/migration.md +++ b/docs/migration.md @@ -151,7 +151,7 @@ New to Bootstrap 4 is the Reboot, a new stylesheet that builds on Normalize with The navbar has been entirely rewritten in flexbox with improved support for alignment, responsiveness, and customization. -- Responsive navbar behaviors are now applied to the `.navbar` class via the **required** `.navbar-toggleable-{breakpoint}` where you choose where to collapse the navbar. Previously this was a Less variable modification and required recompiling. +- Responsive navbar behaviors are now applied to the `.navbar` class via the **required** `.navbar-expand-{breakpoint}` where you choose where to collapse the navbar. Previously this was a Less variable modification and required recompiling. - `.navbar-default` is now `.navbar-light`, though `.navbar-inverse` remains the same. **One of these is required on each navbar.** However, these classes no longer set `background-color`s; instead they essentiatlly only affect `color`. - Navbars now require a background declaration of some kind. Choose from our background utilities (`.bg-*`) or set your own with the light/inverse classes above [for mad customization]({{ site.baseurl }}/components/navbar/#color-schemes). - Given flexbox styles, navbars can now use flexbox utilities for easy alignment options. diff --git a/js/tests/visual/dropdown.html b/js/tests/visual/dropdown.html index 181c130ac3..cc8a6e709c 100644 --- a/js/tests/visual/dropdown.html +++ b/js/tests/visual/dropdown.html @@ -10,7 +10,7 @@ Dropdown Bootstrap Visual Test - + Navbar diff --git a/js/tests/visual/modal.html b/js/tests/visual/modal.html index 3aca0c96f0..d971a45c70 100644 --- a/js/tests/visual/modal.html +++ b/js/tests/visual/modal.html @@ -15,7 +15,7 @@ - + This shouldn't jump! diff --git a/scss/_navbar.scss b/scss/_navbar.scss index 2c5cbe2ee1..1ec5d26454 100644 --- a/scss/_navbar.scss +++ b/scss/_navbar.scss @@ -127,9 +127,9 @@ background-size: 100% 100%; } -// Generate series of `.navbar-toggleable-*` responsive classes for configuring +// Generate series of `.navbar-expand-*` responsive classes for configuring // where your navbar collapses. -.navbar-toggleable { +.navbar-expand { @each $breakpoint in map-keys($grid-breakpoints) { $next: breakpoint-next($breakpoint, $grid-breakpoints); $infix: breakpoint-infix($next, $grid-breakpoints);