Merge remote-tracking branch 'upstream/master' into node-requirable

Conflicts: Gruntfile.js
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/examples/theme
parent: e7991a9a1e2f474c8f1d8a2e0ed113816f1c5e82 (diff)
parent: 35f09315ed543a0479719afa2143240952c215db (diff)
download: bootstrap-9aeaf19b1dca68ee71e916ae415a0c270a47d301.tar.xz
bootstrap-9aeaf19b1dca68ee71e916ae415a0c270a47d301.zip
1 files changed, 28 insertions, 24 deletions
diff --git a/docs/examples/theme/index.html b/docs/examples/theme/index.html
index 2916b2f3a..8e8c72a1d 100644
--- a/docs/examples/theme/index.html
+++ b/docs/examples/theme/index.html
@@ -22,9 +22,6 @@
     <!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
     <script src="../../assets/js/ie-emulation-modes-warning.js"></script>
 
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
-
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
       <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
@@ -35,10 +32,10 @@
   <body role="document">
 
     <!-- Fixed navbar -->
-    <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+    <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
       <div class="container">
         <div class="navbar-header">
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+          <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
             <span class="sr-only">Toggle navigation</span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
@@ -66,7 +63,7 @@
           </ul>
         </div><!--/.nav-collapse -->
       </div>
-    </div>
+    </nav>
 
     <div class="container theme-showcase" role="main">
 
@@ -338,10 +335,10 @@
       <p>
         <a href="#">Inbox <span class="badge">42</span></a>
       </p>
-      <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>
 
 
@@ -365,14 +362,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">
-        <li class="active"><a href="#">Home</a></li>
-        <li><a href="#">Profile</a></li>
-        <li><a href="#">Messages</a></li>
+      <ul class="nav nav-pills" role="tablist">
+        <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>
 
 
@@ -381,10 +378,10 @@
         <h1>Navbars</h1>
       </div>
 
-      <div class="navbar navbar-default">
+      <nav class="navbar navbar-default">
         <div class="container">
           <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
               <span class="sr-only">Toggle navigation</span>
               <span class="icon-bar"></span>
               <span class="icon-bar"></span>
@@ -412,12 +409,12 @@
             </ul>
           </div><!--/.nav-collapse -->
         </div>
-      </div>
+      </nav>
 
-      <div class="navbar navbar-inverse">
+      <nav class="navbar navbar-inverse">
         <div class="container">
           <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
               <span class="sr-only">Toggle navigation</span>
               <span class="icon-bar"></span>
               <span class="icon-bar"></span>
@@ -445,7 +442,7 @@
             </ul>
           </div><!--/.nav-collapse -->
         </div>
-      </div>
+      </nav>
 
 
 
@@ -486,6 +483,9 @@
         <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="80" aria-valuemin="0" aria-valuemax="100" style="width: 80%"><span class="sr-only">80% Complete (danger)</span></div>
       </div>
       <div class="progress">
+        <div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%"><span class="sr-only">60% Complete</span></div>
+      </div>
+      <div class="progress">
         <div class="progress-bar progress-bar-success" style="width: 35%"><span class="sr-only">35% Complete (success)</span></div>
         <div class="progress-bar progress-bar-warning" style="width: 20%"><span class="sr-only">20% Complete (warning)</span></div>
         <div class="progress-bar progress-bar-danger" style="width: 10%"><span class='sr-only'>10% Complete (danger)</span></div>
@@ -617,7 +617,7 @@
           <li data-target="#carousel-example-generic" data-slide-to="1"></li>
           <li data-target="#carousel-example-generic" data-slide-to="2"></li>
         </ol>
-        <div class="carousel-inner">
+        <div class="carousel-inner" role="listbox">
           <div class="item active">
             <img data-src="holder.js/1140x500/auto/#777:#555/text:First slide" alt="First slide">
           </div>
@@ -630,9 +630,11 @@
         </div>
         <a class="left carousel-control" href="#carousel-example-generic" role="button" data-slide="prev">
           <span class="glyphicon glyphicon-chevron-left"></span>
+          <span class="sr-only">Previous</span>
         </a>
         <a class="right carousel-control" href="#carousel-example-generic" role="button" data-slide="next">
           <span class="glyphicon glyphicon-chevron-right"></span>
+          <span class="sr-only">Next</span>
         </a>
       </div>
 
@@ -646,5 +648,7 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
     <script src="../../assets/js/docs.min.js"></script>
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
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/examples/theme
parent	e7991a9a1e2f474c8f1d8a2e0ed113816f1c5e82 (diff)
parent	35f09315ed543a0479719afa2143240952c215db (diff)
download	bootstrap-9aeaf19b1dca68ee71e916ae415a0c270a47d301.tar.xz bootstrap-9aeaf19b1dca68ee71e916ae415a0c270a47d301.zip