diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/_includes/nav-home.html | 50 | ||||
| -rw-r--r-- | docs/components/navbar.md | 16 |
2 files changed, 40 insertions, 26 deletions
diff --git a/docs/_includes/nav-home.html b/docs/_includes/nav-home.html index 5b7e9bf7b..9faa22f6c 100644 --- a/docs/_includes/nav-home.html +++ b/docs/_includes/nav-home.html @@ -24,22 +24,36 @@ </nav> {% endcomment %} - <div class="clearfix"> - <button class="navbar-toggler pull-xs-right hidden-sm-up" type="button" data-toggle="collapse" data-target="#bd-main-nav"> - ☰ - </button> - <a class="navbar-brand hidden-sm-up" href="{{ site.baseurl }}/"> - Bootstrap - </a> - </div> - <div class="collapse navbar-toggleable-xs" id="bd-main-nav"> - <nav class="nav navbar-nav"> - <a class="nav-item nav-link {% if page.layout == "home" %}active{% endif %}" href="{{ site.baseurl }}/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Bootstrap');">Bootstrap</a> - <a class="nav-item nav-link {% if page.layout == "docs" %}active{% endif %}" href="{{ site.baseurl }}/getting-started/introduction/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Docs');">Documentation</a> - <a class="nav-item nav-link {% if page.title == "Examples" %}active{% endif %}" href="{{ site.baseurl }}/examples/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Examples');">Examples</a> - <a class="nav-item nav-link" href="{{ site.themes }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Themes');">Themes</a> - <a class="nav-item nav-link" href="{{ site.expo }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Expo');">Expo</a> - <a class="nav-item nav-link" href="{{ site.blog }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Blog');">Blog</a> - </nav> - </div> + <nav> + <div class="clearfix"> + <button class="navbar-toggler pull-xs-right hidden-sm-up" type="button" data-toggle="collapse" data-target="#bd-main-nav" aria-controls="bd-main-nav" aria-expanded="false" aria-label="Toggle navigation"> + ☰ + </button> + <a class="navbar-brand hidden-sm-up" href="{{ site.baseurl }}/"> + Bootstrap + </a> + </div> + <div class="collapse navbar-toggleable-xs" id="bd-main-nav"> + <ul class="nav navbar-nav"> + <li class="nav-item active"> + <a class="nav-item nav-link {% if page.layout == "home" %}active{% endif %}" href="{{ site.baseurl }}/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Bootstrap');">Bootstrap</a> + </li> + <li class="nav-item"> + <a class="nav-item nav-link {% if page.layout == "docs" %}active{% endif %}" href="{{ site.baseurl }}/getting-started/introduction/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Docs');">Documentation</a> + </li> + <li class="nav-item"> + <a class="nav-item nav-link {% if page.title == "Examples" %}active{% endif %}" href="{{ site.baseurl }}/examples/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Examples');">Examples</a> + </li> + <li class="nav-item"> + <a class="nav-item nav-link" href="{{ site.themes }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Themes');">Themes</a> + </li> + <li class="nav-item"> + <a class="nav-item nav-link" href="{{ site.expo }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Expo');">Expo</a> + </li> + <li class="nav-item"> + <a class="nav-item nav-link" href="{{ site.blog }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Blog');">Blog</a> + </li> + </ul> + </div> + </nav> </header> diff --git a/docs/components/navbar.md b/docs/components/navbar.md index d5d911c1b..d18308d66 100644 --- a/docs/components/navbar.md +++ b/docs/components/navbar.md @@ -240,16 +240,16 @@ Navbars can be statically placed (their default behavior), static without rounde Our collapse plugin allows you to use a `<button>` or `<a>` to toggle hidden content. {% example html %} -<div class="collapse" id="exCollapsingNavbar"> - <div class="bg-inverse p-a-1"> - <h4>Collapsed content</h4> - <span class="text-muted">Toggleable via the navbar brand.</span> - </div> -</div> <nav class="navbar navbar-light bg-faded"> - <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar"> + <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar" aria-controls="exCollapsingNavbar" aria-expanded="false" aria-label="Toggle navigation"> ☰ </button> + <div class="collapse" id="exCollapsingNavbar"> + <div class="bg-inverse p-a-1"> + <h4>Collapsed content</h4> + <span class="text-muted">Toggleable via the navbar brand.</span> + </div> + </div> </nav> {% endexample %} @@ -257,7 +257,7 @@ For more complex navbar patterns, like those used in Bootstrap v3, use the `.nav {% example html %} <nav class="navbar navbar-light bg-faded"> - <button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar2"> + <button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar2" aria-controls="exCollapsingNavbar2" aria-expanded="false" aria-label="Toggle navigation"> ☰ </button> <div class="collapse navbar-toggleable-xs" id="exCollapsingNavbar2"> |