From 22f1cc44caa1eb8557fad4bbb1d652d486b56a52 Mon Sep 17 00:00:00 2001 From: Greg Raven Date: Tue, 22 Jan 2013 06:46:53 -0800 Subject: [PATCH 1/8] Update docs/templates/pages/getting-started.mustache Add meta tag for viewport in the ; revise the URL for the latest version of jQuery. --- docs/templates/pages/getting-started.mustache | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache index 2eec7ff769..3e2134ea7f 100644 --- a/docs/templates/pages/getting-started.mustache +++ b/docs/templates/pages/getting-started.mustache @@ -134,10 +134,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> @@ -152,7 +153,7 @@ </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> From 6afb1055e35a65ef8180745b945b715eb8d25514 Mon Sep 17 00:00:00 2001 From: baslr Date: Sat, 26 Jan 2013 01:01:10 +0100 Subject: [PATCH 2/8] .icon-folder-close same width as icon-folder-open MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit .icon-folder-close same width as icon-folder-open. this prevents buttons from wobbling if the icon changes from closed folder to open folder  --- less/sprites.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/less/sprites.less b/less/sprites.less index 9cd2ae3bfd..65a3d1bc3b 100644 --- a/less/sprites.less +++ b/less/sprites.less @@ -166,7 +166,7 @@ .icon-chevron-down { background-position: -313px -119px; } // 1px, 1px off .icon-retweet { background-position: -336px -120px; } .icon-shopping-cart { background-position: -360px -120px; } -.icon-folder-close { background-position: -384px -120px; } +.icon-folder-close { background-position: -384px -120px; width: 16px; } .icon-folder-open { background-position: -408px -120px; width: 16px; } .icon-resize-vertical { background-position: -432px -119px; } // 1px, 1px off .icon-resize-horizontal { background-position: -456px -118px; } // 1px, 2px off From d6e3b6b5a449b7929e48916a77aca48d1266f5af Mon Sep 17 00:00:00 2001 From: Fred Sauer Date: Mon, 28 Jan 2013 10:01:59 -0800 Subject: [PATCH 3/8] Fix form-actions documentation --- docs/base-css.html | 2 +- docs/templates/pages/base-css.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/base-css.html b/docs/base-css.html index 3294336b6e..abc5a3a6e8 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/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}}

From f20c3368e41cb654dfcb568968b171c45de22127 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 30 Jan 2013 17:42:03 -0800 Subject: [PATCH 4/8] Update pagination example HTML to match examples --- docs/components.html | 5 +++-- docs/templates/pages/components.mustache | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/components.html b/docs/components.html index e8b74cf825..849d1f9c35 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1515,6 +1515,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> </div> @@ -1544,7 +1545,7 @@ 
 <div class="pagination">
   <ul>
-    <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>
@@ -1554,7 +1555,7 @@
 
 <div class="pagination">
   <ul>
-    <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/components.mustache b/docs/templates/pages/components.mustache
index 53ab3d2a62..6d3ff9beee 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1444,6 +1444,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>
 </div>
@@ -1473,7 +1474,7 @@
 
 <div class="pagination">
   <ul>
-    <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>
@@ -1483,7 +1484,7 @@
 
 <div class="pagination">
   <ul>
-    <li class="disabled"><span>Prev</span></li>
+    <li class="disabled"><span>&laquo;</span></li>
     <li class="active"><span>1</span></li>
     ...
   </ul>

From a5fc3e06676769a0586d0cfed93632691c6e79a6 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 30 Jan 2013 17:45:02 -0800
Subject: [PATCH 5/8] make on prev commit

---
 docs/getting-started.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/getting-started.html b/docs/getting-started.html
index ad83385906..91026e0090 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -205,10 +205,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>
 

@@ -223,7 +224,7 @@
   </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>

From dd4ce35ddc262f0b70a4851009317f153fbf6057 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 30 Jan 2013 17:46:18 -0800
Subject: [PATCH 6/8] add meta tag to second example

---
 docs/getting-started.html                     | 1 +
 docs/templates/pages/getting-started.mustache | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docs/getting-started.html b/docs/getting-started.html
index 91026e0090..6479b9fb24 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -219,6 +219,7 @@
 <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>
diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache
index a2124b9a11..ae1534ce36 100644
--- a/docs/templates/pages/getting-started.mustache
+++ b/docs/templates/pages/getting-started.mustache
@@ -148,6 +148,7 @@
 <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>

From 3cc65cb86c10a6534935f3945090a33b4e87105e Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 30 Jan 2013 18:16:14 -0800
Subject: [PATCH 7/8] clear up show-grid stuff

---
 docs/assets/css/docs.css      | 4 ++--
 docs/assets/js/application.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 1142414040..af65540928 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -339,8 +339,8 @@ only screen and (     -o-min-device-pixel-ratio: 2/1) {
   min-height: 40px;
   line-height: 40px;
 }
-.show-grid:hover [class*="span"] {
-  background: #ddd;
+.show-grid [class*="span"]:hover {
+  background-color: #ddd;
 }
 .show-grid .show-grid {
   margin-top: 0;
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index cc442ade4f..f880bc05d5 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -36,7 +36,7 @@
     // add tipsies to grid for scaffolding
     if ($('#gridSystem').length) {
       $('#gridSystem').tooltip({
-          selector: '.show-grid > div:not(.tooltip)'
+          selector: '.show-grid > [class*="span"]'
         , title: function () { return $(this).width() + 'px' }
       })
     }

From baadc33c88f701a068d468e15500ed87b84df43b Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 30 Jan 2013 18:22:20 -0800
Subject: [PATCH 8/8] make on prev commit

---
 docs/assets/css/bootstrap.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 71c42f3196..c0c5ac91e3 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2763,6 +2763,7 @@ table th[class*="span"],
 }
 
 .icon-folder-close {
+  width: 16px;
   background-position: -384px -120px;
 }