From: Mark Otto <markotto@twitter.com>
Date: Sun, 26 Aug 2012 05:31:10 +0000 (-0700)
Subject: fixes #4676 manually: example html updated
X-Git-Tag: v2.1.1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f744ad57fcd2d4686861192c453c9e1f2554e9e7;p=thirdparty%2Fbootstrap.git

fixes #4676 manually: example html updated
---

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 51c2143766..c01aa8c36a 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4152,7 +4152,7 @@ input[type="submit"].btn.btn-mini {
 }
 
 .navbar .btn-group .btn {
-  margin: 0;
+  margin-top: 0;
 }
 
 .navbar-form {
@@ -4197,8 +4197,6 @@ input[type="submit"].btn.btn-mini {
   white-space: nowrap;
 }
 
-.navbar-form .input-append .btn,
-.navbar-form .input-prepend .btn,
 .navbar-form .input-append input,
 .navbar-form .input-prepend input {
   margin-top: 0;
diff --git a/docs/components.html b/docs/components.html
index c93fc2fac9..4eccbbc9ec 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1769,7 +1769,7 @@
           </div>
 <pre class="prettyprint linenums">
 &lt;div class="page-header"&gt;
-  &lt;h1&gt;Example page header&lt;/h1&gt;
+  &lt;h1&gt;Example page header &lt;small&gt;Subtext for header&lt;/small&gt;&lt;/h1&gt;
 &lt;/div&gt;
 </pre>
 
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 596c006c6e..ef02c464a6 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1698,7 +1698,7 @@
           </div>
 <pre class="prettyprint linenums">
 &lt;div class="page-header"&gt;
-  &lt;h1&gt;{{_i}}Example page header{{/i}}&lt;/h1&gt;
+  &lt;h1&gt;{{_i}}Example page header{{/i}} &lt;small&gt;{{_i}}Subtext for header{{/i}}&lt;/small&gt;&lt;/h1&gt;
 &lt;/div&gt;
 </pre>