diff options
| author | Mark Otto <[email protected]> | 2014-05-12 19:57:49 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-05-12 19:57:49 -0700 |
| commit | 31956be6ef6d1b1a2537c3441e69120ef3c99a2b (patch) | |
| tree | a118376f0f415826265828377904778f8e788b44 /docs/_includes/components | |
| parent | 510f4fe50ad30499adf1d19dd65ef694c414aacd (diff) | |
| parent | be18f50fd0e36e35342a100216b01fe00692d0db (diff) | |
| download | bootstrap-31956be6ef6d1b1a2537c3441e69120ef3c99a2b.tar.xz bootstrap-31956be6ef6d1b1a2537c3441e69120ef3c99a2b.zip | |
Merge branch 'master' into icon_paths
Conflicts:
dist/css/bootstrap-rtl.css
dist/css/bootstrap.css.map
dist/js/bootstrap.min.js
docs/dist/css/bootstrap.css.map
docs/dist/js/bootstrap.min.js
Diffstat (limited to 'docs/_includes/components')
| -rw-r--r-- | docs/_includes/components/navs.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/_includes/components/navs.html b/docs/_includes/components/navs.html index 9cad335d0..d9c45fa2d 100644 --- a/docs/_includes/components/navs.html +++ b/docs/_includes/components/navs.html @@ -6,14 +6,14 @@ <h2 id="nav-tabs">Tabs</h2> <p>Note the <code>.nav-tabs</code> class requires the <code>.nav</code> base class.</p> <div class="bs-example"> - <ul class="nav nav-tabs"> + <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> </ul> </div> {% highlight html %} -<ul class="nav nav-tabs"> +<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> @@ -62,7 +62,7 @@ <p>As of v7.0.1, Safari exhibits a bug in which resizing your browser horizontally causes rendering errors in the justified nav that are cleared upon refreshing. This bug is also shown in the <a href="../examples/justified-nav/">justified nav example</a>.</p> </div> <div class="bs-example"> - <ul class="nav nav-tabs nav-justified"> + <ul class="nav nav-tabs nav-justified" role="tablist"> <li class="active"><a href="#">Home</a></li> <li><a href="#">Profile</a></li> <li><a href="#">Messages</a></li> @@ -75,7 +75,7 @@ </ul> </div> {% highlight html %} -<ul class="nav nav-tabs nav-justified"> +<ul class="nav nav-tabs nav-justified" role="tablist"> ... </ul> <ul class="nav nav-pills nav-justified"> @@ -113,7 +113,7 @@ <h3>Tabs with dropdowns</h3> <div class="bs-example"> - <ul class="nav nav-tabs"> + <ul class="nav nav-tabs" role="tablist"> <li class="active"><a href="#">Home</a></li> <li><a href="#">Help</a></li> <li class="dropdown"> @@ -131,7 +131,7 @@ </ul> </div> {% highlight html %} -<ul class="nav nav-tabs"> +<ul class="nav nav-tabs" role="tablist"> ... <li class="dropdown"> <a class="dropdown-toggle" data-toggle="dropdown" href="#"> |