diff options
| author | Mark Otto <[email protected]> | 2014-07-09 22:19:23 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-09 22:19:23 -0700 |
| commit | dae1a68fb15be9015760df32e85d764ef092db44 (patch) | |
| tree | 23dbce03ca690c069a35b3577377bff9a06cf432 /docs/_includes/components/badges.html | |
| parent | 216bc3d68b6a9016b3c5fdf90d82cbb291a28f96 (diff) | |
| parent | 643effe382bb12b4ff1460e9e1987948b1763990 (diff) | |
| download | bootstrap-dae1a68fb15be9015760df32e85d764ef092db44.tar.xz bootstrap-dae1a68fb15be9015760df32e85d764ef092db44.zip | |
Merge branch 'master' into derp
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/components/navs.html
docs/_includes/css/images.html
docs/_includes/js/dropdowns.html
docs/_includes/js/tabs.html
docs/assets/css/docs.min.css
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 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/_includes/components/badges.html b/docs/_includes/components/badges.html index fe5cb9de2..df5efe476 100644 --- a/docs/_includes/components/badges.html +++ b/docs/_includes/components/badges.html @@ -22,20 +22,20 @@ <p>Built-in styles are included for placing badges in active states in pill navigations.</p> <div class="bs-example"> <ul class="nav nav-pills" role="tablist"> - <li class="active"><a href="#">Home <span class="badge">42</span></a></li> - <li><a href="#">Profile</a></li> - <li><a href="#">Messages <span class="badge">3</span></a></li> + <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> <br> <ul class="nav nav-pills nav-stacked" role="tablist" style="max-width: 260px;"> - <li class="active"> + <li role="presentation" class="active"> <a href="#"> <span class="badge pull-right">42</span> Home </a> </li> - <li><a href="#">Profile</a></li> - <li> + <li role="presentation"><a href="#">Profile</a></li> + <li role="presentation"> <a href="#"> <span class="badge pull-right">3</span> Messages @@ -60,7 +60,7 @@ </div> {% highlight html %} <ul class="nav nav-pills nav-stacked" role="tablist"> - <li class="active"> + <li role="presentation" class="active"> <a href="#"> <span class="badge pull-right">42</span> Home |