diff options
| author | Mark Otto <[email protected]> | 2016-10-27 20:04:04 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-10-27 20:04:04 -0700 |
| commit | 6608b2a9eef7110ebe028ec90d2d4284d2022306 (patch) | |
| tree | 9ae0d14a58421a727d0de1c80be96bd8017986cb /docs | |
| parent | fde7101f13f1106727334afa2a56ddc5272b3d36 (diff) | |
| parent | 020a8c691829d02cf749142a71af76e7b71c80d5 (diff) | |
| download | bootstrap-6608b2a9eef7110ebe028ec90d2d4284d2022306.tar.xz bootstrap-6608b2a9eef7110ebe028ec90d2d4284d2022306.zip | |
Merge branch 'v4-dev' of github.com:twbs/bootstrap into v4-dev
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/components/badge.md | 12 | ||||
| -rw-r--r-- | docs/components/list-group.md | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/docs/components/badge.md b/docs/components/badge.md index 71b550f3b..55a6df4f7 100644 --- a/docs/components/badge.md +++ b/docs/components/badge.md @@ -41,10 +41,10 @@ Add any of the below mentioned modifier classes to change the appearance of a ba Use the `.badge-pill` modifier class to make badges more rounded (with a larger `border-radius` and additional horizontal `padding`). Useful if you miss the badges from v3. {% example html %} -<span class="badge badge-pill tag-default">Default</span> -<span class="badge badge-pill tag-primary">Primary</span> -<span class="badge badge-pill tag-success">Success</span> -<span class="badge badge-pill tag-info">Info</span> -<span class="badge badge-pill tag-warning">Warning</span> -<span class="badge badge-pill tag-danger">Danger</span> +<span class="badge badge-pill badge-default">Default</span> +<span class="badge badge-pill badge-primary">Primary</span> +<span class="badge badge-pill badge-success">Success</span> +<span class="badge badge-pill badge-info">Info</span> +<span class="badge badge-pill badge-warning">Warning</span> +<span class="badge badge-pill badge-danger">Danger</span> {% endexample %} diff --git a/docs/components/list-group.md b/docs/components/list-group.md index a04347455..bc7c8b194 100644 --- a/docs/components/list-group.md +++ b/docs/components/list-group.md @@ -25,22 +25,22 @@ The most basic list group is simply an unordered list with list items, and the p </ul> {% endexample %} -## Tags +## Badge -Add tags to any list group item to show unread counts, activity, etc. +Add badges to any list group item to show unread counts, activity, etc. {% example html %} <ul class="list-group"> <li class="list-group-item"> - <span class="badge badge-default tag-pill float-xs-right">14</span> + <span class="badge badge-default badge-pill float-xs-right">14</span> Cras justo odio </li> <li class="list-group-item"> - <span class="badge badge-default tag-pill float-xs-right">2</span> + <span class="badge badge-default badge-pill float-xs-right">2</span> Dapibus ac facilisis in </li> <li class="list-group-item"> - <span class="badge badge-default tag-pill float-xs-right">1</span> + <span class="badge badge-default badge-pill float-xs-right">1</span> Morbi leo risus </li> </ul> |