diff options
| author | Mark Otto <[email protected]> | 2016-12-28 16:39:52 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-12-28 16:39:52 -0800 |
| commit | b3dd2034a12a7dec77c9d0c186eb386a3f773a6a (patch) | |
| tree | c7b27c32fb165b759e9fa10f814487a6ef258ecf | |
| parent | c56547a8410164341daf01259bacbda668c1808e (diff) | |
| download | bootstrap-b3dd2034a12a7dec77c9d0c186eb386a3f773a6a.tar.xz bootstrap-b3dd2034a12a7dec77c9d0c186eb386a3f773a6a.zip | |
drop the flex-grow: 10 in favor of auto margin utils
| -rw-r--r-- | docs/components/navbar.md | 14 | ||||
| -rw-r--r-- | scss/_navbar.scss | 1 |
2 files changed, 7 insertions, 8 deletions
diff --git a/docs/components/navbar.md b/docs/components/navbar.md index 8fc4a2a64..147f98084 100644 --- a/docs/components/navbar.md +++ b/docs/components/navbar.md @@ -46,7 +46,7 @@ Here's an example of all the sub-components included in a responsive light-theme <a class="navbar-brand" href="#">Navbar</a> <div class="collapse navbar-collapse" id="navbarSupportedContent"> - <ul class="navbar-nav"> + <ul class="navbar-nav mr-auto"> <li class="nav-item active"> <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a> </li> @@ -256,7 +256,7 @@ Mix and match with other components and utilities as needed. </button> <a class="navbar-brand" href="#">Navbar w/ text</a> <div class="collapse navbar-collapse" id="navbarText"> - <ul class="navbar-nav"> + <ul class="navbar-nav mr-auto"> <li class="nav-item active"> <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a> </li> @@ -286,7 +286,7 @@ Theming the navbar has never been easier thanks to the combination of theming cl <a class="navbar-brand" href="#">Navbar</a> <div class="collapse navbar-collapse" id="navbarColor01"> - <ul class="navbar-nav"> + <ul class="navbar-nav mr-auto"> <li class="nav-item active"> <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a> </li> @@ -314,7 +314,7 @@ Theming the navbar has never been easier thanks to the combination of theming cl <a class="navbar-brand" href="#">Navbar</a> <div class="collapse navbar-collapse" id="navbarColor02"> - <ul class="navbar-nav"> + <ul class="navbar-nav mr-auto"> <li class="nav-item active"> <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a> </li> @@ -342,7 +342,7 @@ Theming the navbar has never been easier thanks to the combination of theming cl <a class="navbar-brand" href="#">Navbar</a> <div class="collapse navbar-collapse" id="navbarColor03"> - <ul class="navbar-nav"> + <ul class="navbar-nav mr-auto"> <li class="nav-item active"> <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a> </li> @@ -439,7 +439,7 @@ With no `.navbar-brand` shown in lowest breakpoint: </button> <div class="collapse navbar-collapse" id="navbarTogglerDemo01"> <a class="navbar-brand" href="#">Hidden brand</a> - <ul class="navbar-nav mt-2 mt-lg-0"> + <ul class="navbar-nav mr-auto mt-2 mt-lg-0"> <li class="nav-item active"> <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a> </li> @@ -468,7 +468,7 @@ With a brand name shown on the left and toggler on the right: <a class="navbar-brand" href="#">Navbar</a> <div class="collapse navbar-collapse" id="navbarTogglerDemo02"> - <ul class="navbar-nav mt-2 mt-md-0"> + <ul class="navbar-nav mr-auto mt-2 mt-md-0"> <li class="nav-item active"> <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a> </li> diff --git a/scss/_navbar.scss b/scss/_navbar.scss index 4c603c1db..6b2a03bb1 100644 --- a/scss/_navbar.scss +++ b/scss/_navbar.scss @@ -128,7 +128,6 @@ // Custom navbar navigation built on the base `.nav` styles. .navbar-nav { - flex-grow: 10; // high number to force alignment .nav-link { display: block; |