diff options
| author | Mark Otto <[email protected]> | 2012-02-26 23:30:15 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-26 23:30:15 -0800 |
| commit | dd94f8d50971e657cd0b2b388965ba82b436354f (patch) | |
| tree | 89d3015f253b75216f7ff5359de22e8d84096e0f | |
| parent | 1a781a707e0785a1abd079a9c29628b0d8d1867d (diff) | |
| download | bootstrap-dd94f8d50971e657cd0b2b388965ba82b436354f.tar.xz bootstrap-dd94f8d50971e657cd0b2b388965ba82b436354f.zip | |
remove warning from icons section about :after labels, add section to explain spacing
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 54570 -> 54570 bytes | |||
| -rw-r--r-- | docs/base-css.html | 6 | ||||
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 6 |
3 files changed, 4 insertions, 8 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 63f92b76f..d9a548f60 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/base-css.html b/docs/base-css.html index 2a4cc63d2..2fcce5a12 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1516,9 +1516,6 @@ For example, <code>section</code> should be wrapped as inline. </ul> </div> </div> - <div class="alert alert-info"> - <strong>Heads up!</strong> Icon classes are echoed via CSS <code>:after</code>. In the docs, we show a light red background color on hover to highlight the icon's size. - </div> <br> @@ -1531,7 +1528,7 @@ For example, <code>section</code> should be wrapped as inline. </div> <div class="span4"> <h3>How to use</h3> - <p>With v2.0.1, we have opted to use an <code><i></code> tag for all our icons, but they have no case class—only a shared prefix. To use, place the following code just about anywhere:</p> + <p>Bootstrap uses an <code><i></code> tag for all icons, but they have no case class—only a shared prefix. To use, place the following code just about anywhere:</p> <pre class="prettyprint linenums"> <i class="icon-search"></i> </pre> @@ -1540,6 +1537,7 @@ For example, <code>section</code> should be wrapped as inline. <i class="icon-search icon-white"></i> </pre> <p>There are 120 classes to choose from for your icons. Just add an <code><i></code> tag with the right classes and you're set. You can find the full list in <strong>sprites.less</strong> or right here in this document.</p> + <p>When using beside strings of text, as in buttons or nav links, be sure to leave a space after the <code><i></code> tag for proper spacing.</p> </div> <div class="span4"> <h3>Use cases</h3> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index aea86a40b..4479f816b 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1440,9 +1440,6 @@ </ul> </div> </div> - <div class="alert alert-info"> - {{_i}}<strong>Heads up!</strong> Icon classes are echoed via CSS <code>:after</code>. In the docs, we show a light red background color on hover to highlight the icon's size.{{/i}} - </div> <br> @@ -1455,7 +1452,7 @@ </div> <div class="span4"> <h3>{{_i}}How to use{{/i}}</h3> - <p>{{_i}}With v2.0.1, we have opted to use an <code><i></code> tag for all our icons, but they have no case class—only a shared prefix. To use, place the following code just about anywhere:{{/i}}</p> + <p>{{_i}}Bootstrap uses an <code><i></code> tag for all icons, but they have no case class—only a shared prefix. To use, place the following code just about anywhere:{{/i}}</p> <pre class="prettyprint linenums"> <i class="icon-search"></i> </pre> @@ -1464,6 +1461,7 @@ <i class="icon-search icon-white"></i> </pre> <p>{{_i}}There are 120 classes to choose from for your icons. Just add an <code><i></code> tag with the right classes and you're set. You can find the full list in <strong>sprites.less</strong> or right here in this document.{{/i}}</p> + <p>{{_i}}When using beside strings of text, as in buttons or nav links, be sure to leave a space after the <code><i></code> tag for proper spacing.{{/i}}</p> </div> <div class="span4"> <h3>{{_i}}Use cases{{/i}}</h3> |