aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-08-25 22:31:10 -0700
committerMark Otto <[email protected]>2012-08-25 22:31:10 -0700
commitf744ad57fcd2d4686861192c453c9e1f2554e9e7 (patch)
tree30d6bc76c6b567761e4479452af0db9d5b6466e7 /docs
parentbb9d1af1ca80879b6a27c2471f33d1c3aa2579fc (diff)
downloadbootstrap-f744ad57fcd2d4686861192c453c9e1f2554e9e7.tar.xz
bootstrap-f744ad57fcd2d4686861192c453c9e1f2554e9e7.zip
fixes #4676 manually: example html updated
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/css/bootstrap.css4
-rw-r--r--docs/components.html2
-rw-r--r--docs/templates/pages/components.mustache2
3 files changed, 3 insertions, 5 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 51c214376..c01aa8c36 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 c93fc2fac..4eccbbc9e 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 596c006c6..ef02c464a 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>