From e8f1ae007339c98ea71b0f56b37c037d11fa6276 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Mon, 29 Aug 2011 21:52:45 -0700
Subject: btn's need &nbps; seperating them for ie7

---
 docs/index.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'docs')

diff --git a/docs/index.html b/docs/index.html
index 3d7f38ba0..db31ca296 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -863,11 +863,7 @@
       <h3>Example buttons</h3>
       <p>Button styles can be applied to anything with the <code>.btn</code> applied. Typically you’ll want to apply these to only <code>&lt;a&gt;</code>, <code>&lt;button&gt;</code>, and select <code>&lt;input&gt;</code> elements. Here’s how it looks:</p>
       <div class="well" style="padding: 14px 19px;">
-        <button class="btn primary">Primary</button>
-        <button class="btn">Default</button>
-        <button class="btn info">Info</button>
-        <button class="btn success">Success</button>
-        <button class="btn danger">Danger</button>
+        <button class="btn primary">Primary</button>&nbps;<button class="btn">Default</button>&nbps;<button class="btn info">Info</button>&nbps;<button class="btn success">Success</button>&nbps; <button class="btn danger">Danger</button>
       </div>
       <h3>Alternate sizes</h3>
       <p>Fancy larger or smaller buttons? Have at it!</p>
-- 
cgit v1.2.3


From fc0471a450d8cf3fdeb0971ce2636ac11053891d Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Mon, 29 Aug 2011 22:34:13 -0700
Subject: lulz nbsp

---
 docs/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/index.html b/docs/index.html
index db31ca296..415ea6a3b 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -863,7 +863,7 @@
       <h3>Example buttons</h3>
       <p>Button styles can be applied to anything with the <code>.btn</code> applied. Typically you’ll want to apply these to only <code>&lt;a&gt;</code>, <code>&lt;button&gt;</code>, and select <code>&lt;input&gt;</code> elements. Here’s how it looks:</p>
       <div class="well" style="padding: 14px 19px;">
-        <button class="btn primary">Primary</button>&nbps;<button class="btn">Default</button>&nbps;<button class="btn info">Info</button>&nbps;<button class="btn success">Success</button>&nbps; <button class="btn danger">Danger</button>
+        <button class="btn primary">Primary</button>&nbsp;<button class="btn">Default</button>&nbsp;<button class="btn info">Info</button>&nbsp;<button class="btn success">Success</button>&nbsp;<button class="btn danger">Danger</button>
       </div>
       <h3>Alternate sizes</h3>
       <p>Fancy larger or smaller buttons? Have at it!</p>
-- 
cgit v1.2.3


From 55022228bcdfea8d87eefb0c21249e6a9e219263 Mon Sep 17 00:00:00 2001
From: David Haywood Smith <davehs@gmail.com>
Date: Tue, 30 Aug 2011 11:47:40 +0100
Subject: Fixed duplicate element ids

Also updated labels where required
---
 docs/index.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'docs')

diff --git a/docs/index.html b/docs/index.html
index bc0e216ab..b04e35292 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -651,9 +651,9 @@
             </div>
           </div><!-- /clearfix -->
           <div class="clearfix error">
-            <label for="xlInput">X-Large Input</label>
+            <label for="xlInput2">X-Large Input</label>
             <div class="input">
-              <input class="xlarge error" id="xlInput" name="xlInput" size="30" type="text" />
+              <input class="xlarge error" id="xlInput2" name="xlInput2" size="30" type="text" />
               <span class="help-inline">Small snippet of help text</span>
             </div>
           </div><!-- /clearfix -->
@@ -688,7 +688,7 @@
             </div>
           </div><!-- /clearfix -->
           <div class="clearfix">
-            <label for="xlInput">File Input</label>
+            <label for="fileInput">File Input</label>
             <div class="input">
               <input class="input-file" id="fileInput" name="fileInput" type="file" />
             </div>
@@ -791,9 +791,9 @@
         <fieldset>
           <legend>Example form legend</legend>
           <div class="clearfix">
-            <label for="xlInput">X-Large Input</label>
+            <label for="xlInput3">X-Large Input</label>
             <div class="input">
-              <input class="xlarge" id="xlInput" name="xlInput" size="30" type="text" />
+              <input class="xlarge" id="xlInput3" name="xlInput3" size="30" type="text" />
             </div>
           </div><!-- /clearfix -->
           <div class="clearfix">
@@ -812,9 +812,9 @@
         <fieldset>
           <legend>Example form legend</legend>
           <div class="clearfix error">
-            <label for="xlInput">X-Large Input</label>
+            <label for="xlInput4">X-Large Input</label>
             <div class="input">
-              <input class="xlarge error" id="xlInput" name="xlInput" size="30" type="text" />
+              <input class="xlarge error" id="xlInput4" name="xlInput4" size="30" type="text" />
               <span class="help-inline">Small snippet of help text</span>
             </div>
           </div><!-- /clearfix -->
-- 
cgit v1.2.3


From 4fb1c5bd4b527797183a60e752f0276b01637fd5 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Tue, 30 Aug 2011 23:34:19 -0700
Subject: rename all 1.1.1 stuff -> 1.2.0 and remove templates dir and
 fluid.html

---
 docs/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/docs/index.html b/docs/index.html
index 415ea6a3b..9ec827fb1 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -12,7 +12,7 @@
     <![endif]-->
 
     <!-- Le styles -->
-    <link href="../bootstrap-1.1.1.css" rel="stylesheet">
+    <link href="../bootstrap-1.2.0.css" rel="stylesheet">
     <link href="assets/css/docs.css" rel="stylesheet">
     <link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
 
@@ -78,7 +78,7 @@
             <h6>Hotlink the CSS</h6>
             <p>For the quickest and easiest start, just copy this snippet into your webpage.</p>
             <form>
-              <textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.1.1.min.css"></textarea>
+              <textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.2.0.min.css"></textarea>
             </form>
           </div>
           <div class="span5 columns">
-- 
cgit v1.2.3