diff options
| author | Mark Otto <[email protected]> | 2014-09-06 21:21:13 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-09-06 21:21:13 -0700 |
| commit | c20d00cf058a85dea22c6073623e93549bce32e0 (patch) | |
| tree | 9e17011fd6594c8f28b014c56d3f40eef3d6c120 /docs/_includes | |
| parent | f5a05fe9e96bb0ee877e4b19149b9512eeb52956 (diff) | |
| parent | bb8ca6b786ce194e0de977c0410c4b208afc0217 (diff) | |
| download | bootstrap-c20d00cf058a85dea22c6073623e93549bce32e0.tar.xz bootstrap-c20d00cf058a85dea22c6073623e93549bce32e0.zip | |
Merge pull request #14546 from twbs/address-14541
Address #14541 by tweaking badge docs
Diffstat (limited to 'docs/_includes')
| -rw-r--r-- | docs/_includes/components/badges.html | 40 |
1 files changed, 12 insertions, 28 deletions
diff --git a/docs/_includes/components/badges.html b/docs/_includes/components/badges.html index 7c67ba769..98c615491 100644 --- a/docs/_includes/components/badges.html +++ b/docs/_includes/components/badges.html @@ -5,9 +5,17 @@ <div class="bs-example"> <a href="#">Inbox <span class="badge">42</span></a> + <br><br> + <button class="btn btn-primary" type="button"> + Messages <span class="badge">4</span> + </button> </div> {% highlight html %} <a href="#">Inbox <span class="badge">42</span></a> + +<button class="btn btn-primary" type="button"> + Messages <span class="badge">4</span> +</button> {% endhighlight %} <h4>Self collapsing</h4> @@ -26,36 +34,12 @@ <li role="presentation"><a href="#">Profile</a></li> <li role="presentation"><a href="#">Messages <span class="badge">3</span></a></li> </ul> - <br> - <ul class="nav nav-pills nav-stacked" role="tablist" style="max-width: 260px;"> - <li role="presentation" class="active"> - <a href="#"> - <span class="badge pull-right">42</span> - Home - </a> - </li> - <li role="presentation"><a href="#">Profile</a></li> - <li role="presentation"> - <a href="#"> - <span class="badge pull-right">3</span> - Messages - </a> - </li> - </ul> - <br> - <button class="btn btn-primary" type="button"> - Messages <span class="badge">4</span> - </button> </div> {% highlight html %} -<ul class="nav nav-pills nav-stacked" role="tablist"> - <li role="presentation" class="active"> - <a href="#"> - <span class="badge pull-right">42</span> - Home - </a> - </li> - ... +<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> + <li role="presentation"><a href="#">Messages <span class="badge">3</span></a></li> </ul> {% endhighlight %} </div> |