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/examples/theme | |
| 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/examples/theme')
| -rw-r--r-- | docs/examples/theme/index.html | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/docs/examples/theme/index.html b/docs/examples/theme/index.html index ca8dab430..d66874eb8 100644 --- a/docs/examples/theme/index.html +++ b/docs/examples/theme/index.html @@ -329,9 +329,9 @@ <a href="#">Inbox <span class="badge">42</span></a> </p> <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> @@ -355,14 +355,14 @@ <h1>Navs</h1> </div> <ul class="nav nav-tabs" role="tablist"> - <li class="active"><a href="#">Home</a></li> - <li><a href="#">Profile</a></li> - <li><a href="#">Messages</a></li> + <li role="presentation" class="active"><a href="#">Home</a></li> + <li role="presentation"><a href="#">Profile</a></li> + <li role="presentation"><a href="#">Messages</a></li> </ul> <ul class="nav nav-pills" role="tablist"> - <li class="active"><a href="#">Home</a></li> - <li><a href="#">Profile</a></li> - <li><a href="#">Messages</a></li> + <li role="presentation" class="active"><a href="#">Home</a></li> + <li role="presentation"><a href="#">Profile</a></li> + <li role="presentation"><a href="#">Messages</a></li> </ul> |