aboutsummaryrefslogtreecommitdiff
path: root/docs/components
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-01-03 19:14:14 -0800
committerMark Otto <[email protected]>2016-01-03 19:14:14 -0800
commit09c3942986cfb64262615d60a7e2d591c1c1d667 (patch)
treec05af3e0c26f90dfb6132db3b84cf3de82aec207 /docs/components
parent5c43dff1559424efba4515fd6d1f19e7e1a864d4 (diff)
parent88064925a490b3771522e05fc853f6c5be3acb17 (diff)
downloadbootstrap-09c3942986cfb64262615d60a7e2d591c1c1d667.tar.xz
bootstrap-09c3942986cfb64262615d60a7e2d591c1c1d667.zip
Merge pull request #18662 from patrickhlauke/docs-collapse-accessibility-patch1
Docs: accessibility fix-up of collapsible content navbar, change site-wide main navbar
Diffstat (limited to 'docs/components')
-rw-r--r--docs/components/navbar.md16
1 files changed, 8 insertions, 8 deletions
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">
&#9776;
</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">
&#9776;
</button>
<div class="collapse navbar-toggleable-xs" id="exCollapsingNavbar2">