diff options
| author | James Friend <[email protected]> | 2014-08-28 09:32:08 +0800 |
|---|---|---|
| committer | James Friend <[email protected]> | 2014-08-28 09:32:08 +0800 |
| commit | 9aeaf19b1dca68ee71e916ae415a0c270a47d301 (patch) | |
| tree | bc8385acb8ec7a46bba03ff2ef7e4283cd9f1146 /docs/_includes/components/badges.html | |
| parent | e7991a9a1e2f474c8f1d8a2e0ed113816f1c5e82 (diff) | |
| parent | 35f09315ed543a0479719afa2143240952c215db (diff) | |
| download | bootstrap-9aeaf19b1dca68ee71e916ae415a0c270a47d301.tar.xz bootstrap-9aeaf19b1dca68ee71e916ae415a0c270a47d301.zip | |
Merge remote-tracking branch 'upstream/master' into node-requirable
Conflicts:
Gruntfile.js
Diffstat (limited to 'docs/_includes/components/badges.html')
| -rw-r--r-- | docs/_includes/components/badges.html | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/docs/_includes/components/badges.html b/docs/_includes/components/badges.html index daa0636cb..7c67ba769 100644 --- a/docs/_includes/components/badges.html +++ b/docs/_includes/components/badges.html @@ -21,21 +21,21 @@ <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"> - <ul class="nav nav-pills"> - <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> + <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> <br> - <ul class="nav nav-pills nav-stacked" style="max-width: 260px;"> - <li class="active"> + <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><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 @@ -48,8 +48,8 @@ </button> </div> {% highlight html %} -<ul class="nav nav-pills nav-stacked"> - <li class="active"> +<ul class="nav nav-pills nav-stacked" role="tablist"> + <li role="presentation" class="active"> <a href="#"> <span class="badge pull-right">42</span> Home |