diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 177e2487c8..0196c64481 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -149,6 +149,9 @@ section > ul li { background-color: #eee; border: 1px solid #ddd; } +.show-grid [class*="span"]:hover { + background-color: #ddd; +} @@ -522,4 +525,4 @@ input.focused { .bs-docs-sidenav { width: 260px; } -} \ No newline at end of file +} diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 4fd6d36170..f880bc05d5 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -34,12 +34,12 @@ }) // add tipsies to grid for scaffolding - // if ($('#gridSystem').length) { - // $('#gridSystem').tooltip({ - // selector: '.show-grid > div:not(.tooltip)' - // , title: function () { return $(this).width() + 'px' } - // }) - // } + if ($('#gridSystem').length) { + $('#gridSystem').tooltip({ + selector: '.show-grid > [class*="span"]' + , title: function () { return $(this).width() + 'px' } + }) + } // tooltip demo $('.tooltip-demo').tooltip({ diff --git a/docs/base-css.html b/docs/base-css.html index 904c8dc633..9e0a3c1ec2 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1535,7 +1535,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped

Form actions

-

End a form with a group of actions (buttons). When placed within a .form-horizontal, the buttons will automatically indent to line up with the form controls.

+

End a form with a group of actions (buttons). When placed within a .form-actions, the buttons will automatically indent to line up with the form controls.

diff --git a/docs/components.html b/docs/components.html index b88e54b88c..aff2088cc0 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1171,6 +1171,7 @@ <li><a href="#">2</a></li> <li><a href="#">3</a></li> <li><a href="#">4</a></li> + <li><a href="#">5</a></li> <li><a href="#">Next</a></li> </ul> @@ -1196,7 +1197,7 @@
 <ul class="pagination">
-  <li class="disabled"><a href="#">Prev</a></li>
+  <li class="disabled"><a href="#">&laquo;</a></li>
   <li class="active"><a href="#">1</a></li>
   ...
 </ul>
@@ -1204,7 +1205,7 @@
           

You can optionally swap out active or disabled anchors for spans to remove click functionality while retaining intended styles.

 <ul class="pagination">
-  <li class="disabled"><span>Prev</span></li>
+  <li class="disabled"><span>&laquo;</span></li>
   <li class="active"><span>1</span></li>
   ...
 </ul>
diff --git a/docs/getting-started.html b/docs/getting-started.html
index 88ceb00011..e336c3347d 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -185,10 +185,11 @@
 <html>
   <head>
     <title>Bootstrap 101 Template</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
   </head>
   <body>
     <h1>Hello, world!</h1>
-    <script src="http://code.jquery.com/jquery-latest.js"></script>
+    <script src="http://code.jquery.com/jquery.js"></script>
   </body>
 </html>
 
@@ -198,12 +199,13 @@ <html> <head> <title>Bootstrap 101 Template</title> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> <!-- Bootstrap --> <link href="css/bootstrap.min.css" rel="stylesheet" media="screen"> </head> <body> <h1>Hello, world!</h1> - <script src="http://code.jquery.com/jquery-latest.js"></script> + <script src="http://code.jquery.com/jquery.js"></script> <script src="js/bootstrap.min.js"></script> </body> </html> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 4ec1eee296..a544d319d8 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1472,7 +1472,7 @@

{{_i}}Form actions{{/i}}

-

{{_i}}End a form with a group of actions (buttons). When placed within a .form-horizontal, the buttons will automatically indent to line up with the form controls.{{/i}}

+

{{_i}}End a form with a group of actions (buttons). When placed within a .form-actions, the buttons will automatically indent to line up with the form controls.{{/i}}

diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index bbaae5f1a0..788801eaba 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -1100,6 +1100,7 @@ <li><a href="#">2</a></li> <li><a href="#">3</a></li> <li><a href="#">4</a></li> + <li><a href="#">5</a></li> <li><a href="#">Next</a></li> </ul> @@ -1125,7 +1126,7 @@
 <ul class="pagination">
-  <li class="disabled"><a href="#">Prev</a></li>
+  <li class="disabled"><a href="#">&laquo;</a></li>
   <li class="active"><a href="#">1</a></li>
   ...
 </ul>
@@ -1133,7 +1134,7 @@
           

You can optionally swap out active or disabled anchors for spans to remove click functionality while retaining intended styles.

 <ul class="pagination">
-  <li class="disabled"><span>Prev</span></li>
+  <li class="disabled"><span>&laquo;</span></li>
   <li class="active"><span>1</span></li>
   ...
 </ul>
diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache
index 44a70c693c..aac7dba4f0 100644
--- a/docs/templates/pages/getting-started.mustache
+++ b/docs/templates/pages/getting-started.mustache
@@ -114,10 +114,11 @@
 <html>
   <head>
     <title>Bootstrap 101 Template</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
   </head>
   <body>
     <h1>Hello, world!</h1>
-    <script src="http://code.jquery.com/jquery-latest.js"></script>
+    <script src="http://code.jquery.com/jquery.js"></script>
   </body>
 </html>
 
@@ -127,12 +128,13 @@ <html> <head> <title>Bootstrap 101 Template</title> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> <!-- Bootstrap --> <link href="css/bootstrap.min.css" rel="stylesheet" media="screen"> </head> <body> <h1>Hello, world!</h1> - <script src="http://code.jquery.com/jquery-latest.js"></script> + <script src="http://code.jquery.com/jquery.js"></script> <script src="js/bootstrap.min.js"></script> </body> </html>