From: Mark Otto Date: Wed, 28 Jun 2017 02:59:09 +0000 (-0700) Subject: Merge branch 'v4-dev' into colors-redux X-Git-Tag: v4.0.0-beta~115^2~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64008ad721cab6171fcce431709a982f21e6094e;p=thirdparty%2Fbootstrap.git Merge branch 'v4-dev' into colors-redux --- 64008ad721cab6171fcce431709a982f21e6094e diff --cc docs/4.0/migration.md index 189929ae38,061f598a96..f82bb4aef5 --- a/docs/4.0/migration.md +++ b/docs/4.0/migration.md @@@ -164,7 -164,7 +164,7 @@@ New to Bootstrap 4 is the [Reboot]({{ s 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-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-dark` 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`. -- `.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 essentially only affect `color`. ++- `.navbar-default` is now `.navbar-light`, though `.navbar-dark` remains the same. **One of these is required on each navbar.** However, these classes no longer set `background-color`s; instead they essentially 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 }}/docs/{{ site.docs_version }}/components/navbar/#color-schemes). - Given flexbox styles, navbars can now use flexbox utilities for easy alignment options. - `.navbar-toggle` is now `.navbar-toggler` and has different styles and inner markup (no more three ``s).