diff options
| author | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-16 15:31:38 -0500 |
|---|---|---|
| committer | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-16 15:31:38 -0500 |
| commit | 8da2815e47704b84610b65fecbbd29527c5abce6 (patch) | |
| tree | eb636d2b90ea67836f34604e273917df6bc8beee /docs/components | |
| parent | a85b80fa75aa9ecc7da252411f6209a002e4bdfb (diff) | |
| parent | 8167682deb6146e1949cb49baf6e87d350befe3d (diff) | |
| download | bootstrap-8da2815e47704b84610b65fecbbd29527c5abce6.tar.xz bootstrap-8da2815e47704b84610b65fecbbd29527c5abce6.zip | |
Merge branch 'twbs/v4-dev' into dropdown-keyboard
Diffstat (limited to 'docs/components')
| -rw-r--r-- | docs/components/alerts.md | 3 | ||||
| -rw-r--r-- | docs/components/badge.md | 13 | ||||
| -rw-r--r-- | docs/components/collapse.md | 2 |
3 files changed, 16 insertions, 2 deletions
diff --git a/docs/components/alerts.md b/docs/components/alerts.md index da72e322e..dae4ec7d3 100644 --- a/docs/components/alerts.md +++ b/docs/components/alerts.md @@ -55,12 +55,13 @@ Use the `.alert-link` utility class to quickly provide matching colored links wi ### Additional content -Alerts can also contain additional HTML elements like headings and paragraphs. +Alerts can also contain additional HTML elements like headings, paragraphs and dividers. {% example html %} <div class="alert alert-success" role="alert"> <h4 class="alert-heading">Well done!</h4> <p>Aww yeah, you successfully read this important alert message. This example text is going to run a bit longer so that you can see how spacing within an alert works with this kind of content.</p> + <hr> <p class="mb-0">Whenever you need to, be sure to use margin utilities to keep things nice and tidy.</p> </div> {% endexample %} diff --git a/docs/components/badge.md b/docs/components/badge.md index 4e4bafcde..896c917f3 100644 --- a/docs/components/badge.md +++ b/docs/components/badge.md @@ -53,3 +53,16 @@ Use the `.badge-pill` modifier class to make badges more rounded (with a larger <span class="badge badge-pill badge-warning">Warning</span> <span class="badge badge-pill badge-danger">Danger</span> {% endexample %} + +## Links + +Using the `.badge` classes with the `<a>` element quickly provide _actionable_ badges with hover and focus states. + +{% example html %} +<a href="#" class="badge badge-default">Default</a> +<a href="#" class="badge badge-primary">Primary</a> +<a href="#" class="badge badge-success">Success</a> +<a href="#" class="badge badge-info">Info</a> +<a href="#" class="badge badge-warning">Warning</a> +<a href="#" class="badge badge-danger">Danger</a> +{% endexample %} diff --git a/docs/components/collapse.md b/docs/components/collapse.md index 18d1c1298..c269bb382 100644 --- a/docs/components/collapse.md +++ b/docs/components/collapse.md @@ -40,7 +40,7 @@ You can use a link with the `href` attribute, or a button with the `data-target` ## Accordion example -Extend the default collapse behavior to create an accordion. +Using the [card]({{ site.baseurl }}/components/card) component, you can extend the default collapse behavior to create an accordion. {% example html %} <div id="accordion" role="tablist"> |