diff options
| author | Mark Otto <[email protected]> | 2014-07-07 22:10:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-07 22:10:22 -0700 |
| commit | 81b59d35368bc51d361d0352cc92fe99dc580fbf (patch) | |
| tree | 2395d5e79edaaa8c0a7ad82e99931ec895421532 /docs/_includes/components/badges.html | |
| parent | fed2b0f7eb78438eb1b768782b04651881d88740 (diff) | |
| parent | ddee04038f946ac103eb4e70c8eb7adeb2cf563b (diff) | |
| download | bootstrap-81b59d35368bc51d361d0352cc92fe99dc580fbf.tar.xz bootstrap-81b59d35368bc51d361d0352cc92fe99dc580fbf.zip | |
Merge branch 'master' into derp
Conflicts:
docs/_layouts/default.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/docs.min.js
docs/assets/js/src/application.js
Diffstat (limited to 'docs/_includes/components/badges.html')
| -rw-r--r-- | docs/_includes/components/badges.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/_includes/components/badges.html b/docs/_includes/components/badges.html index daa0636cb..95aea2e40 100644 --- a/docs/_includes/components/badges.html +++ b/docs/_includes/components/badges.html @@ -21,13 +21,13 @@ <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"> + <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> </ul> <br> - <ul class="nav nav-pills nav-stacked" style="max-width: 260px;"> + <ul class="nav nav-pills nav-stacked" role="tablist" style="max-width: 260px;"> <li class="active"> <a href="#"> <span class="badge pull-right">42</span> @@ -48,7 +48,7 @@ </button> </div> {% highlight html %} -<ul class="nav nav-pills nav-stacked"> +<ul class="nav nav-pills nav-stacked" role="tablist"> <li class="active"> <a href="#"> <span class="badge pull-right">42</span> |