aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-07-12 21:11:08 -0700
committerMark Otto <[email protected]>2017-07-12 21:11:08 -0700
commitf2e912bb0e5041fead48bdbcaaa23de1c40291d5 (patch)
treed675d29992c1b33d4b9ba3fcdbfbaf5b03887559 /docs
parentc6652eb862cd0a9ac33f5cff4fa777324853466a (diff)
parentc00437ec1b47d1ec9c7e0b181afec87c2c480631 (diff)
downloadbootstrap-f2e912bb0e5041fead48bdbcaaa23de1c40291d5.tar.xz
bootstrap-f2e912bb0e5041fead48bdbcaaa23de1c40291d5.zip
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to 'docs')
-rw-r--r--docs/4.0/components/badge.md30
-rw-r--r--docs/4.0/components/collapse.md2
2 files changed, 31 insertions, 1 deletions
diff --git a/docs/4.0/components/badge.md b/docs/4.0/components/badge.md
index e2d92b08b..4e80828a4 100644
--- a/docs/4.0/components/badge.md
+++ b/docs/4.0/components/badge.md
@@ -28,6 +28,36 @@ Badges scale to match the size of the immediate parent element by using relative
<h6>Example heading <span class="badge badge-secondary">New</span></h6>
{% endhighlight %}
+Badges can be used as part of links or buttons to provide a counter.
+
+<div class="bd-example">
+<button class="btn">
+ Notifications <span class="badge badge-secondary">4</span>
+</button>
+</div>
+
+{% highlight html %}
+<button class="btn">
+ Notifications <span class="badge badge-secondary">4</span>
+</button>
+{% endhighlight %}
+
+Note that depending on how they are used, badges may be confusing for users of screen readers and similar assistive technologies. While the styling of badges provides a visual cue as to their purpose, these users will simply be presented with the content of the badge. Depending on the specific situation, these badges may seem like random additional words or numbers at the end of a sentence, link or button. Unless the context is clear (as with the "Notifications" example, where it is arguably understandable that the "4" gives a count of the number of notifications), consider including additional context – for instance using a visually hidden piece of additional text.
+
+<div class="bd-example">
+<button class="btn">
+ Profile <span class="badge badge-secondary">9</span>
+ <span class="sr-only">unread messages</span>
+</button>
+</div>
+
+{% highlight html %}
+<button class="btn">
+ Profile <span class="badge badge-secondary">9</span>
+ <span class="sr-only">unread messages</span>
+</button>
+{% endhighlight %}
+
## Contextual variations
Add any of the below mentioned modifier classes to change the appearance of a badge.
diff --git a/docs/4.0/components/collapse.md b/docs/4.0/components/collapse.md
index 25b236e74..c77d436fb 100644
--- a/docs/4.0/components/collapse.md
+++ b/docs/4.0/components/collapse.md
@@ -113,7 +113,7 @@ Using the [card]({{ site.baseurl }}/docs/{{ site.docs_version }}/components/card
</div>
{% endexample %}
-You can also create accordions with custom markup. Add the `data-children` attribute and specify a set of sibling elements to toggle (e.g., `.item`). Then, use the same attributes and classes as shown above for connectinh toggles to their associated content.
+You can also create accordions with custom markup. Add the `data-children` attribute and specify a set of sibling elements to toggle (e.g., `.item`). Then, use the same attributes and classes as shown above for connecting toggles to their associated content.
{% example html %}
<div id="exampleAccordion" data-children=".item">