From 058f47b33b3978bbb484e521e7fc14c6ebadc161 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Mon, 26 Dec 2011 17:25:25 -0600
Subject: clean up some comments and fix a bug with buttons in navbar by
 removing too generic of a link color

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

(limited to 'docs')

diff --git a/docs/index.html b/docs/index.html
index 0d340fa1a..735fe7ae7 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -41,6 +41,7 @@
             <li><a href="./javascript.html">Javascript plugins</a></li>
             <li><a href="./less.html">Using LESS</a></li>
           </ul>
+          <a href="" class="btn pull-right">Button</a>
         </div>
       </div>
     </div>
-- 
cgit v1.2.3


From 324246e4f964437a2dfa7efbd2d1b6b039369b2c Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Tue, 27 Dec 2011 12:39:39 -0600
Subject: remove negative margin from .brand in docs, update navbar to support
 buttons up thurr

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

(limited to 'docs')

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index b3c464941..c2c92a251 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -22,6 +22,7 @@ body {
 body > .navbar-fixed .brand {
   padding-right: 0;
   padding-left: 0;
+  margin-left: 20px;
   float: right;
   font-weight: bold;
   color: #000;
-- 
cgit v1.2.3


From b9adae14fc9fa64134aebb57655dd93e0a7e6ad6 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Tue, 27 Dec 2011 12:40:30 -0600
Subject: remove button from topbar for testing

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

(limited to 'docs')

diff --git a/docs/index.html b/docs/index.html
index 735fe7ae7..0d340fa1a 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -41,7 +41,6 @@
             <li><a href="./javascript.html">Javascript plugins</a></li>
             <li><a href="./less.html">Using LESS</a></li>
           </ul>
-          <a href="" class="btn pull-right">Button</a>
         </div>
       </div>
     </div>
-- 
cgit v1.2.3


From fec02f50455c87f0e01fe74b1fb2e3cd032ade09 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Tue, 27 Dec 2011 15:40:58 -0600
Subject: clean up some css for github issues: input prepend z-index, modals
 revamped for responsive

---
 docs/base-css.html   | 2 +-
 docs/components.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/docs/base-css.html b/docs/base-css.html
index dad42381d..99fb9bd1a 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -894,7 +894,7 @@ Form states
               <span class="add-on">@</span>
               <input class="input-small" id="prependedInput" name="prependedInput" size="16" type="text">
             </div>
-            <span class="help-block">Here's some help text</span>
+            <p class="help-block">Here's some help text</p>
           </div>
         </fieldset>
         <fieldset class="control-group">
diff --git a/docs/components.html b/docs/components.html
index c6a349ff4..fbfa9fb31 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -716,7 +716,7 @@
       <p><a class="btn js-btn" href="./javascript.html#modal">Get the javascript &raquo;</a></p>
     </div>
     <div class="span9">
-      <div class="well" style="background-color: #888; border: none; padding: 40px;">
+      <div class="well" style="background-color: #888; border: none; ">
         <!-- Modal -->
         <div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1">
           <div class="modal-header">
-- 
cgit v1.2.3


From e78d5f8ff33009e4c4ab57496913b43ff1e369dc Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Tue, 27 Dec 2011 16:25:22 -0600
Subject: fix tables for rowspan

---
 docs/base-css.html | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'docs')

diff --git a/docs/base-css.html b/docs/base-css.html
index 99fb9bd1a..13cbeedbc 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -646,25 +646,24 @@
       <tr>
         <td>1</td>
         <td colspan="2">Some One</td>
-        <td>English</td>
+        <td>HTML</td>
       </tr>
       <tr>
         <td>2</td>
         <td>Joe</td>
         <td>Sixpack</td>
-        <td>English</td>
+        <td rowspan="2">Javascript</td>
       </tr>
       </tr>
         <td>3</td>
         <td>Joe</td>
         <td>Sixpack</td>
-        <td>English</td>
       </tr>
       <tr>
         <td>3</td>
         <td>Stu</td>
         <td>Dent</td>
-        <td>Code</td>
+        <td>CSS</td>
       </tr>
     </tbody>
   </table>
-- 
cgit v1.2.3


From 53c6dbff0d6dd781df421f07acdd9e98719b41bf Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Tue, 27 Dec 2011 17:04:55 -0600
Subject: add appended input example to docs, fix help-text wrapping issue by
 clearing float

---
 docs/base-css.html | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'docs')

diff --git a/docs/base-css.html b/docs/base-css.html
index 13cbeedbc..2bc6f49fb 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -896,6 +896,16 @@ Form states
             <p class="help-block">Here's some help text</p>
           </div>
         </fieldset>
+        <fieldset class="control-group">
+          <label class="control-label" for="appendedInput">Appended text</label>
+          <div class="controls">
+            <div class="input-append">
+              <input class="input-small" id="appendedInput" name="appendedInput" size="16" type="text">
+              <span class="add-on">.00</span>
+            </div>
+            <p class="help-block">Here's more help text</p>
+          </div>
+        </fieldset>
         <fieldset class="control-group">
           <label class="control-label" for="select01">Select list</label>
           <div class="controls">
-- 
cgit v1.2.3