Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
b3dd2034
Commit
b3dd2034
authored
8 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
drop the flex-grow: 10 in favor of auto margin utils
parent
c56547a8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docs/components/navbar.md
+7
-7
docs/components/navbar.md
scss/_navbar.scss
+0
-1
scss/_navbar.scss
with
7 additions
and
8 deletions
+7
-8
docs/components/navbar.md
+
7
-
7
View file @
b3dd2034
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
scss/_navbar.scss
+
0
-
1
View file @
b3dd2034
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets