aboutsummaryrefslogtreecommitdiff
path: root/docs/templates
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-01-17 15:36:36 -0800
committerMark Otto <[email protected]>2013-01-17 15:36:36 -0800
commit97975c5fcf3f671c26d1688f54c8d65bba41c87c (patch)
tree83becdd75a63fadfec3d096f0449e1cde4f6458f /docs/templates
parent32bcbe5671faf83b9c0161dcae8a1ab0f1d61c59 (diff)
downloadbootstrap-97975c5fcf3f671c26d1688f54c8d65bba41c87c.tar.xz
bootstrap-97975c5fcf3f671c26d1688f54c8d65bba41c87c.zip
Readd focused example of inputs to docs; clean up alerts section
Diffstat (limited to 'docs/templates')
-rw-r--r--docs/templates/pages/components.mustache32
-rw-r--r--docs/templates/pages/css.mustache4
2 files changed, 5 insertions, 31 deletions
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 03110beac..0172ada8a 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1509,9 +1509,6 @@
<p>Use the <a href="./javascript.html#alerts">alerts jQuery plugin</a> for quick and easy dismissal of alerts.</p>
- <hr class="bs-docs-separator">
-
-
<h2>Options</h2>
<p>For longer messages, increase the padding on the top and bottom of the alert wrapper by adding <code>.alert-block</code>.</p>
<div class="bs-docs-example">
@@ -1530,51 +1527,28 @@
</pre>
- <hr class="bs-docs-separator">
-
-
<h2>Contextual alternatives</h2>
<p>Add optional classes to change an alert's connotation.</p>
- <h3>Error or danger</h3>
<div class="bs-docs-example">
<div class="alert alert-error">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>Oh snap!</strong> Change a few things up and try submitting again.
</div>
- </div>
-<pre class="prettyprint linenums">
-&lt;div class="alert alert-error"&gt;
- ...
-&lt;/div&gt;
-</pre>
-
- <h3>Success</h3>
- <div class="bs-docs-example">
<div class="alert alert-success">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>Well done!</strong> You successfully read this important alert message.
</div>
- </div>
-<pre class="prettyprint linenums">
-&lt;div class="alert alert-success"&gt;
- ...
-&lt;/div&gt;
-</pre>
-
- <h3>Information</h3>
- <div class="bs-docs-example">
<div class="alert alert-info">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>Heads up!</strong> This alert needs your attention, but it's not super important.
</div>
</div>
<pre class="prettyprint linenums">
-&lt;div class="alert alert-info"&gt;
- ...
-&lt;/div&gt;
+&lt;div class="alert alert-error"&gt;... &lt;/div&gt;
+&lt;div class="alert alert-success"&gt;...&lt;/div&gt;
+&lt;div class="alert alert-info"&gt;...&lt;/div&gt;
</pre>
-
</section>
diff --git a/docs/templates/pages/css.mustache b/docs/templates/pages/css.mustache
index 2190d781d..682bda94b 100644
--- a/docs/templates/pages/css.mustache
+++ b/docs/templates/pages/css.mustache
@@ -1529,10 +1529,10 @@ For example, &lt;code&gt;&amp;lt;section&amp;gt;&lt;/code&gt; should be wrapped
<h3 id="forms-input-focus">Input focus</h3>
<p>We remove the default <code>outline</code> styles on some form controls and apply a <code>box-shadow</code> in its place for <code>:focus</code>.</p>
<form class="bs-docs-example form-inline">
- <input class="input-xlarge focused" id="focusedInput" type="text" value="This is focused...">
+ <input class="focused" id="focusedInput" type="text" value="This is focused...">
</form>
<pre class="prettyprint linenums">
-&lt;input class="input-xlarge" id="focusedInput" type="text" value="This is focused..."&gt;
+&lt;input id="focusedInput" type="text" value="This is focused..."&gt;
</pre>
<h3 id="forms-invalid-inputs">Invalid inputs</h3>