aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-10-26 18:33:58 -0700
committerMark Otto <[email protected]>2016-10-26 18:33:58 -0700
commitd9fa3fd7971b5331b6582b46b568048458bb5544 (patch)
treea493abbb40bcfe09c32b5c2b63681838f569f484 /docs
parentd9d75f4d544936a497161156afcf37c2bd20b4aa (diff)
downloadbootstrap-d9fa3fd7971b5331b6582b46b568048458bb5544.tar.xz
bootstrap-d9fa3fd7971b5331b6582b46b568048458bb5544.zip
Rename .tag to .badge to avoid conflicting with WordPress
Diffstat (limited to 'docs')
-rw-r--r--docs/_data/nav.yml2
-rw-r--r--docs/components/badge.md50
-rw-r--r--docs/components/list-group.md6
-rw-r--r--docs/components/tag.md50
4 files changed, 54 insertions, 54 deletions
diff --git a/docs/_data/nav.yml b/docs/_data/nav.yml
index f89a136f8..847375422 100644
--- a/docs/_data/nav.yml
+++ b/docs/_data/nav.yml
@@ -31,6 +31,7 @@
- title: Components
pages:
- title: Alerts
+ - title: Badge
- title: Breadcrumb
- title: Buttons
- title: Button group
@@ -49,7 +50,6 @@
- title: Popovers
- title: Progress
- title: Scrollspy
- - title: Tag
- title: Tooltips
- title: Utilities
diff --git a/docs/components/badge.md b/docs/components/badge.md
new file mode 100644
index 000000000..71b550f3b
--- /dev/null
+++ b/docs/components/badge.md
@@ -0,0 +1,50 @@
+---
+layout: docs
+title: Badges
+description: Documentation and examples for badges, our small count and labelling component.
+group: components
+---
+
+Small and adaptive tag for adding context to just about any content.
+
+## Example
+
+Badges scale to match the size of the immediate parent element by using relative font sizing and `em` units.
+
+{% example html %}
+<h1>Example heading <span class="badge badge-default">New</span></h1>
+<h2>Example heading <span class="badge badge-default">New</span></h2>
+<h3>Example heading <span class="badge badge-default">New</span></h3>
+<h4>Example heading <span class="badge badge-default">New</span></h4>
+<h5>Example heading <span class="badge badge-default">New</span></h5>
+<h6>Example heading <span class="badge badge-default">New</span></h6>
+{% endexample %}
+
+## Contextual variations
+
+Add any of the below mentioned modifier classes to change the appearance of a badge.
+
+{% example html %}
+<span class="badge badge-default">Default</span>
+<span class="badge badge-primary">Primary</span>
+<span class="badge badge-success">Success</span>
+<span class="badge badge-info">Info</span>
+<span class="badge badge-warning">Warning</span>
+<span class="badge badge-danger">Danger</span>
+{% endexample %}
+
+{% capture callout-include %}{% include callout-warning-color-assistive-technologies.md %}{% endcapture %}
+{{ callout-include | markdownify }}
+
+## Pill badges
+
+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>
+{% endexample %}
diff --git a/docs/components/list-group.md b/docs/components/list-group.md
index 22982d1b9..a04347455 100644
--- a/docs/components/list-group.md
+++ b/docs/components/list-group.md
@@ -32,15 +32,15 @@ Add tags to any list group item to show unread counts, activity, etc.
{% example html %}
<ul class="list-group">
<li class="list-group-item">
- <span class="tag tag-default tag-pill float-xs-right">14</span>
+ <span class="badge badge-default tag-pill float-xs-right">14</span>
Cras justo odio
</li>
<li class="list-group-item">
- <span class="tag tag-default tag-pill float-xs-right">2</span>
+ <span class="badge badge-default tag-pill float-xs-right">2</span>
Dapibus ac facilisis in
</li>
<li class="list-group-item">
- <span class="tag tag-default tag-pill float-xs-right">1</span>
+ <span class="badge badge-default tag-pill float-xs-right">1</span>
Morbi leo risus
</li>
</ul>
diff --git a/docs/components/tag.md b/docs/components/tag.md
deleted file mode 100644
index d292cad22..000000000
--- a/docs/components/tag.md
+++ /dev/null
@@ -1,50 +0,0 @@
----
-layout: docs
-title: Tags
-description: Documentation and examples for tags, our small label-badge component.
-group: components
----
-
-Small and adaptive tag for adding context to just about any content.
-
-## Example
-
-Tags scale to match the size of the immediate parent element by using relative font sizing and `em` units.
-
-{% example html %}
-<h1>Example heading <span class="tag tag-default">New</span></h1>
-<h2>Example heading <span class="tag tag-default">New</span></h2>
-<h3>Example heading <span class="tag tag-default">New</span></h3>
-<h4>Example heading <span class="tag tag-default">New</span></h4>
-<h5>Example heading <span class="tag tag-default">New</span></h5>
-<h6>Example heading <span class="tag tag-default">New</span></h6>
-{% endexample %}
-
-## Contextual variations
-
-Add any of the below mentioned modifier classes to change the appearance of a tag.
-
-{% example html %}
-<span class="tag tag-default">Default</span>
-<span class="tag tag-primary">Primary</span>
-<span class="tag tag-success">Success</span>
-<span class="tag tag-info">Info</span>
-<span class="tag tag-warning">Warning</span>
-<span class="tag tag-danger">Danger</span>
-{% endexample %}
-
-{% capture callout-include %}{% include callout-warning-color-assistive-technologies.md %}{% endcapture %}
-{{ callout-include | markdownify }}
-
-## Pill tags
-
-Use the `.tag-pill` modifier class to make tags more rounded (with a larger `border-radius` and additional horizontal `padding`). Useful if you miss the badges from v3.
-
-{% example html %}
-<span class="tag tag-pill tag-default">Default</span>
-<span class="tag tag-pill tag-primary">Primary</span>
-<span class="tag tag-pill tag-success">Success</span>
-<span class="tag tag-pill tag-info">Info</span>
-<span class="tag tag-pill tag-warning">Warning</span>
-<span class="tag tag-pill tag-danger">Danger</span>
-{% endexample %}