aboutsummaryrefslogtreecommitdiff
path: root/docs/templates
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-06-07 10:20:52 -0700
committerMark Otto <[email protected]>2012-06-07 10:20:52 -0700
commita1aa2b188a0267290cb17c2a0b5d4ad8b7c693c2 (patch)
tree1b461bd273d0fcf3104016bc7a07953340c4f171 /docs/templates
parent2ecbd36cbf0cb8b2e894b2e36400e59a1c88eb1c (diff)
downloadbootstrap-a1aa2b188a0267290cb17c2a0b5d4ad8b7c693c2.tar.xz
bootstrap-a1aa2b188a0267290cb17c2a0b5d4ad8b7c693c2.zip
more content changes to docs
Diffstat (limited to 'docs/templates')
-rw-r--r--docs/templates/layout.mustache2
-rw-r--r--docs/templates/pages/base-css.mustache36
-rw-r--r--docs/templates/pages/index.mustache4
-rw-r--r--docs/templates/pages/less.mustache2
4 files changed, 13 insertions, 31 deletions
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 1d23c8370..3c0d2b4ca 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -127,7 +127,7 @@
<!-- Footer
================================================== -->
<footer class="footer">
- <p clas="right"><a href="#">{{_i}}Back to top{{/i}}</a></p>
+ <p class="pull-right"><a href="#">{{_i}}Back to top{{/i}}</a></p>
<p>{{_i}}Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.{{/i}}</p>
<p>{{_i}}Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.{{/i}}</p>
<p>{{_i}}Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.{{/i}}</p>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index a6cea5750..1f0546657 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -47,7 +47,7 @@
<p>{{_i}}The typographic scale is based on two LESS variables in <strong>variables.less</strong>: <code>@baseFontSize</code> and <code>@baseLineHeight</code>. The first is the base font-size used throughout and the second is the base line-height. We use those variables and some simple math to create the margins, paddings, and line-heights of all our type and more. Customize them and Bootstrap adapts.{{/i}}</p>
- <hr class="soften">
+ <hr class="bs-docs-separator">
{{! Emphasis }}
@@ -75,7 +75,7 @@
<p><span class="label label-info">{{_i}}Heads up!{{/i}}</span> {{_i}}Feel free to use <code>&lt;b&gt;</code> and <code>&lt;i&gt;</code> in HTML5. <code>&lt;b&gt;</code> is meant to highlight words or phrases without conveying additional importance while <code>&lt;i&gt;</code> is mostly for voice, technical terms, etc.{{/i}}</p>
- <hr class="soften">
+ <hr class="bs-docs-separator">
{{! Abbreviations }}
@@ -101,7 +101,7 @@
</pre>
- <hr class="soften">
+ <hr class="bs-docs-separator">
{{! Addresses }}
@@ -137,7 +137,7 @@
</pre>
- <hr class="soften">
+ <hr class="bs-docs-separator">
{{! Blockquotes }}
@@ -191,7 +191,7 @@
</pre>
- <hr class="soften">
+ <hr class="bs-docs-separator">
<!-- Lists -->
@@ -731,27 +731,10 @@
<h1>{{_i}}Forms{{/i}}</h1>
</div>
- <h2>{{_i}}Flexible HTML and CSS{{/i}}</h2>
- <p>{{_i}}The best part about forms in Bootstrap is that all your inputs and controls look great no matter how you build them in your markup. No superfluous HTML is required, but we provide the patterns for those who require it.{{/i}}</p>
- <p>{{_i}}More complicated layouts come with succinct and scalable classes for easy styling and event binding, so you're covered at every step.{{/i}}</p>
-
- <h2>{{_i}}Four layouts included{{/i}}</h2>
- <p>{{_i}}Bootstrap comes with support for four types of form layouts:{{/i}}</p>
- <ul>
- <li>{{_i}}Vertical (default){{/i}}</li>
- <li>{{_i}}Search{{/i}}</li>
- <li>{{_i}}Inline{{/i}}</li>
- <li>{{_i}}Horizontal{{/i}}</li>
- </ul>
- <p>{{_i}}Different types of form layouts require some changes to markup, but the controls themselves remain and behave the same.{{/i}}</p>
-
- <h2>{{_i}}Control states and more{{/i}}</h2>
- <p>{{_i}}Bootstrap's forms include styles for all the base form controls like input, textarea, and select you'd expect. But it also comes with a number of custom components like appended and prepended inputs and support for lists of checkboxes.{{/i}}</p>
- <p>{{_i}}States like error, warning, and success are included for each type of form control. Also included are styles for disabled controls.{{/i}}</p>
-
-
- <h2>{{_i}}Four types of forms{{/i}}</h2>
- <p>{{_i}}Bootstrap provides simple markup and styles for four styles of common web forms.{{/i}}</p>
+ <h2>{{_i}}Controls and layouts{{/i}}</h2>
+ <p>{{_i}}Forms include styles for all the base form controls like <code>input</code>, <code>textarea</code>, and <code>select</code> you'd expect. There are also a number of custom components like appended and prepended inputs and support for lists of checkboxes.{{/i}}</p>
+ <p>{{_i}}Bootstrap provides simple markup and styles for four styles of common web forms. Each layout requires small changes to surrounding markup, but the controls themselves remain and behave the same.{{/i}}</p>
+ <p>{{_i}}Error, warning, and success states are included for form controls, as wel as disabled.{{/i}}</p>
<table class="table table-bordered table-striped">
<thead>
<tr>
@@ -784,7 +767,6 @@
</tbody>
</table>
-
<h2>{{_i}}Example forms <small>using just form controls, no extra markup</small>{{/i}}</h2>
<h3>{{_i}}Basic form{{/i}}</h3>
<p>{{_i}}Smart and lightweight defaults without extra markup.{{/i}}</p>
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index a755ced78..e7f19fa77 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -35,7 +35,7 @@
</div>
</header>
-<hr class="soften">
+<hr class="bs-docs-separator">
<div class="marketing">
<h1>{{_i}}Designed for everyone, everywhere.{{/i}}</h1>
@@ -77,7 +77,7 @@
</div>
</div><!--/row-->
- <hr class="soften">
+ <hr class="bs-docs-separator">
<h1>{{_i}}Built with Bootstrap.{{/i}}</h1>
<p class="marketing-byline">{{_i}}For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a> or <a href="./examples.html">browse the examples</a>.{{/i}}</p>
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index 72b7f3bb3..fe33cd247 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -177,7 +177,7 @@
</tr>
<tr>
<td><code>@tableBorder</code></td>
- <td><code>ddd</code></td>
+ <td><code>#ddd</code></td>
</tr>
</tbody>
</table>