diff options
| author | Mark Otto <[email protected]> | 2012-01-27 13:56:50 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-27 13:56:50 -0800 |
| commit | 3807a88ee9ba33f27bc8762efd789f7ff710ed1a (patch) | |
| tree | 50c1b20368c0b94939a07be178da6bdd699d8487 /docs | |
| parent | 8da1c176ec9d1e48c6d9a9a26e37ae8a66103de2 (diff) | |
| download | bootstrap-3807a88ee9ba33f27bc8762efd789f7ff710ed1a.tar.xz bootstrap-3807a88ee9ba33f27bc8762efd789f7ff710ed1a.zip | |
update the docs for icons
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 28 | ||||
| -rw-r--r-- | docs/base-css.html | 9 | ||||
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 9 |
3 files changed, 28 insertions, 18 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index cf2f1b59f..10faa36c0 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Fri Jan 27 13:43:19 PST 2012 + * Date: Fri Jan 27 13:54:49 PST 2012 */ article, aside, @@ -1088,7 +1088,7 @@ table .span12 { background-image: url(../img/glyphicons-halflings-white.png); } .icon.glass { - background-position: 0 0; + background-position: 0 0; } .icon.music { background-position: -24px 0; @@ -1327,23 +1327,20 @@ table .span12 { .icon.chevron-right { background-position: -456px -72px; } -.icon.arrow-left { - background-position: -240px -96px; -} .icon.plus-sign { background-position: 0 -96px; } .icon.minus-sign { - background-position: -24px -96px; + background-position: -24px -96px; } .icon.remove-sign { - background-position: -48px -96px; + background-position: -48px -96px; } .icon.ok-sign { - background-position: -72px -96px; + background-position: -72px -96px; } .icon.question-sign { - background-position: -96px -96px; + background-position: -96px -96px; } .icon.info-sign { background-position: -120px -96px; @@ -1360,6 +1357,9 @@ table .span12 { .icon.ban-circle { background-position: -216px -96px; } +.icon.arrow-left { + background-position: -240px -96px; +} .icon.arrow-right { background-position: -264px -96px; } @@ -1391,16 +1391,16 @@ table .span12 { background-position: 0 -120px; } .icon.gift { - background-position: -24px -120px; + background-position: -24px -120px; } .icon.leaf { - background-position: -48px -120px; + background-position: -48px -120px; } .icon.fire { - background-position: -72px -120px; + background-position: -72px -120px; } .icon.eye-open { - background-position: -96px -120px; + background-position: -96px -120px; } .icon.eye-close { background-position: -120px -120px; @@ -1439,7 +1439,7 @@ table .span12 { background-position: -384px -120px; } .icon.folder-open { - background-position: -409px -120px; + background-position: -408px -120px; } .icon.resize-vertical { background-position: -432px -119px; diff --git a/docs/base-css.html b/docs/base-css.html index fa22216ef..698b68ea1 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1454,7 +1454,7 @@ </div> </div> <div class="alert alert-info"> - <strong>Heads up!</strong> On hover we show a light red background color to highlight the size of the icon. This won't appear in normal usage of icons. + <strong>Heads up!</strong> Icon classes are echoed via CSS <code>:after</code> and on hover in the docs we show a light red background color show the icon's size. </div> <br> @@ -1471,6 +1471,10 @@ <pre class="prettyprint linenums"> <i class="icon search"></i> </pre> + <p>There are also styles available for inverted (white) icons, made ready with one extra class:</p> +<pre class="prettyprint linenums"> +<i class="icon white search"></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> </div> <div class="span4"> @@ -1488,10 +1492,11 @@ <h3>Examples</h3> <div class="row"> - <div class="span4"> + <div class="span6"> <p>Use them in buttons, or in button groups for a toolbar style presentation.</p> <p> <a class="btn" href="#"><i class="icon refresh"></i> Refresh</a> + <a class="btn success" href="#"><i class="icon white shopping-cart"></i> Checkout</a> <a class="btn danger" href="#"><i class="icon white trash"></i> Delete</a> </p> <div class="btn-toolbar"> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 45d359784..f6504a249 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1389,7 +1389,7 @@ </div> </div> <div class="alert alert-info"> - {{_i}}<strong>Heads up!</strong> On hover we show a light red background color to highlight the size of the icon. This won't appear in normal usage of icons.{{/i}} + {{_i}}<strong>Heads up!</strong> Icon classes are echoed via CSS <code>:after</code> and on hover in the docs we show a light red background color show the icon's size.{{/i}} </div> <br> @@ -1406,6 +1406,10 @@ <pre class="prettyprint linenums"> <i class="icon search"></i> </pre> + <p>There are also styles available for inverted (white) icons, made ready with one extra class:</p> +<pre class="prettyprint linenums"> +<i class="icon white search"></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> </div> <div class="span4"> @@ -1423,10 +1427,11 @@ <h3>{{_i}}Examples{{/i}}</h3> <div class="row"> - <div class="span4"> + <div class="span6"> <p>{{_i}}Use them in buttons, or in button groups for a toolbar style presentation.{{/i}}</p> <p> <a class="btn" href="#"><i class="icon refresh"></i> {{_i}}Refresh{{/i}}</a> + <a class="btn success" href="#"><i class="icon white shopping-cart"></i> {{_i}}Checkout{{/i}}</a> <a class="btn danger" href="#"><i class="icon white trash"></i> {{_i}}Delete{{/i}}</a> </p> <div class="btn-toolbar"> |
