rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-20 12:52:19 +01:00
Code Issues Actions Packages Releases Activity

drop the flex-grow: 10 in favor of auto margin utils

Browse Source
This commit is contained in:
Mark Otto 2016-12-28 16:39:52 -08:00
parent c56547a841
commit b3dd2034a1
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docs/components/navbar.md
View File

@ -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>

1
scss/_navbar.scss
View File

@ -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;