diff options
| author | Mark Otto <[email protected]> | 2015-01-18 12:24:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-01-18 12:24:29 -0800 |
| commit | 1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f (patch) | |
| tree | 7a63ae1a434fae8cb51835fafd1b531d5f5da64e /docs/_includes/components/badges.html | |
| parent | dbe47654160d389c6991a312c9cecd2eeb9b6122 (diff) | |
| parent | 22b79dae3c9307c329e6722ff1be8aa0a4143812 (diff) | |
| download | bootstrap-1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f.tar.xz bootstrap-1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f.zip | |
Merge branch 'master' into pr/15278
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'docs/_includes/components/badges.html')
| -rw-r--r-- | docs/_includes/components/badges.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/_includes/components/badges.html b/docs/_includes/components/badges.html index 18ee70a16..a7fff7322 100644 --- a/docs/_includes/components/badges.html +++ b/docs/_includes/components/badges.html @@ -3,7 +3,7 @@ <p class="lead">Easily highlight new or unread items by adding a <code><span class="badge"></code> to links, Bootstrap navs, and more.</p> - <div class="bs-example"> + <div class="bs-example" data-example-id="simple-badges"> <a href="#">Inbox <span class="badge">42</span></a> <br><br> <button class="btn btn-primary" type="button"> @@ -28,7 +28,7 @@ <h4>Adapts to active nav states</h4> <p>Built-in styles are included for placing badges in active states in pill navigations.</p> - <div class="bs-example"> + <div class="bs-example" data-example-id="badges-in-pills"> <ul class="nav nav-pills" role="tablist"> <li role="presentation" class="active"><a href="#">Home <span class="badge">42</span></a></li> <li role="presentation"><a href="#">Profile</a></li> |