aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-01-16 10:24:13 -0800
committerMark Otto <[email protected]>2013-01-16 10:24:13 -0800
commit38c5c13d38ee95944b273b36ac77288d220f7cf1 (patch)
tree50c35a30fc406cf16c6d558c9efa5b32f84b769d /docs
parenta67c86e40f0b79e8abf5c6c266166db80d8edb72 (diff)
parent1da1994ba4fa40ed868ab289e910ec9a0d177458 (diff)
downloadbootstrap-38c5c13d38ee95944b273b36ac77288d220f7cf1.tar.xz
bootstrap-38c5c13d38ee95944b273b36ac77288d220f7cf1.zip
Merge pull request #6591 from Quy/2.3.0-wip
Add text alignment classes info to docs
Diffstat (limited to 'docs')
-rw-r--r--docs/base-css.html13
-rw-r--r--docs/templates/pages/base-css.mustache13
2 files changed, 26 insertions, 0 deletions
diff --git a/docs/base-css.html b/docs/base-css.html
index f283f962e..3294336b6 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -170,6 +170,19 @@
<p><span class="label label-info">Heads up!</span> 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.</p>
+ <h3>Alignment classes</h3>
+ <p>Easily realign text to components with text alignment classes.</p>
+ <div class="bs-docs-example">
+ <p class="text-left">Left aligned text.</p>
+ <p class="text-center">Center aligned text.</p>
+ <p class="text-right">Right aligned text.</p>
+ </div>
+<pre class="prettyprint linenums">
+&lt;p class="text-left"&gt;Left aligned text.&lt;/p&gt;
+&lt;p class="text-center"&gt;Center aligned text.&lt;/p&gt;
+&lt;p class="text-right"&gt;Right aligned text.&lt;/p&gt;
+</pre>
+
<h3>Emphasis classes</h3>
<p>Convey meaning through color with a handful of emphasis utility classes.</p>
<div class="bs-docs-example">
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 71d8d464d..4ec1eee29 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -104,6 +104,19 @@
<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>
+ <h3>{{_i}}Alignment classes{{/i}}</h3>
+ <p>{{_i}}Easily realign text to components with text alignment classes.{{/i}}</p>
+ <div class="bs-docs-example">
+ <p class="text-left">Left aligned text.</p>
+ <p class="text-center">Center aligned text.</p>
+ <p class="text-right">Right aligned text.</p>
+ </div>
+<pre class="prettyprint linenums">
+&lt;p class="text-left"&gt;Left aligned text.&lt;/p&gt;
+&lt;p class="text-center"&gt;Center aligned text.&lt;/p&gt;
+&lt;p class="text-right"&gt;Right aligned text.&lt;/p&gt;
+</pre>
+
<h3>{{_i}}Emphasis classes{{/i}}</h3>
<p>{{_i}}Convey meaning through color with a handful of emphasis utility classes.{{/i}}</p>
<div class="bs-docs-example">