diff options
| author | Mark Otto <[email protected]> | 2012-01-30 22:57:00 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-30 22:57:00 -0800 |
| commit | 47a68ae3aa8cad828eebe529403b46210c9d9d16 (patch) | |
| tree | ee3f69dcf75ec9349b8237054cc9b7afcf20a93b /docs/base-css.html | |
| parent | 31911659a200d39d8494f35f8fd71863ac1226d0 (diff) | |
| download | bootstrap-47a68ae3aa8cad828eebe529403b46210c9d9d16.tar.xz bootstrap-47a68ae3aa8cad828eebe529403b46210c9d9d16.zip | |
update icons everywhere to be scoped per other components, fix broken elements on js docs page
Diffstat (limited to 'docs/base-css.html')
| -rw-r--r-- | docs/base-css.html | 297 |
1 files changed, 149 insertions, 148 deletions
diff --git a/docs/base-css.html b/docs/base-css.html index 0f97a036a..c71874b3a 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1303,142 +1303,142 @@ For example, <code>section</code> should be wrapped as inline. <div class="row"> <div class="span3"> <div class="the-icons"> - <i class="icon glass"></i> - <i class="icon music"></i> - <i class="icon search"></i> - <i class="icon envelope"></i> - <i class="icon heart"></i> - <i class="icon star"></i> - <i class="icon star-empty"></i> - <i class="icon user"></i> - <i class="icon film"></i> - <i class="icon th-large"></i> - <i class="icon th"></i> - <i class="icon th-list"></i> - <i class="icon ok"></i> - <i class="icon remove"></i> - <i class="icon zoom-in"></i> - <i class="icon zoom-out"></i> - <i class="icon off"></i> - <i class="icon signal"></i> - <i class="icon cog"></i> - <i class="icon trash"></i> - - <i class="icon home"></i> - <i class="icon file"></i> - <i class="icon time"></i> - <i class="icon road"></i> - <i class="icon download-alt"></i> - <i class="icon download"></i> - <i class="icon upload"></i> - <i class="icon inbox"></i> - <i class="icon play-circle"></i> - <i class="icon repeat"></i> + <i class="i i-glass"></i> + <i class="i i-music"></i> + <i class="i i-search"></i> + <i class="i i-envelope"></i> + <i class="i i-heart"></i> + <i class="i i-star"></i> + <i class="i i-star-empty"></i> + <i class="i i-user"></i> + <i class="i i-film"></i> + <i class="i i-th-large"></i> + <i class="i i-th"></i> + <i class="i i-th-list"></i> + <i class="i i-ok"></i> + <i class="i i-remove"></i> + <i class="i i-zoom-in"></i> + <i class="i i-zoom-out"></i> + <i class="i i-off"></i> + <i class="i i-signal"></i> + <i class="i i-cog"></i> + <i class="i i-trash"></i> + + <i class="i i-home"></i> + <i class="i i-file"></i> + <i class="i i-time"></i> + <i class="i i-road"></i> + <i class="i i-download-alt"></i> + <i class="i i-download"></i> + <i class="i i-upload"></i> + <i class="i i-inbox"></i> + <i class="i i-play-circle"></i> + <i class="i i-repeat"></i> </div> </div> <div class="span3"> <div class="the-icons"> - <i class="icon refresh"></i> - <i class="icon list-alt"></i> - <i class="icon lock"></i> - <i class="icon flag"></i> - <i class="icon headphones"></i> - <i class="icon volume-off"></i> - <i class="icon volume-down"></i> - <i class="icon volume-up"></i> - <i class="icon qrcode"></i> - <i class="icon barcode"></i> - - <i class="icon tag"></i> - <i class="icon tags"></i> - <i class="icon book"></i> - <i class="icon bookmark"></i> - <i class="icon print"></i> - <i class="icon camera"></i> - <i class="icon font"></i> - <i class="icon bold"></i> - <i class="icon italic"></i> - <i class="icon text-height"></i> - <i class="icon text-width"></i> - <i class="icon align-left"></i> - <i class="icon align-center"></i> - <i class="icon align-right"></i> - <i class="icon align-justify"></i> - <i class="icon list"></i> - <i class="icon indent-left"></i> - <i class="icon indent-right"></i> - <i class="icon facetime-video"></i> - <i class="icon picture"></i> + <i class="i i-refresh"></i> + <i class="i i-list-alt"></i> + <i class="i i-lock"></i> + <i class="i i-flag"></i> + <i class="i i-headphones"></i> + <i class="i i-volume-off"></i> + <i class="i i-volume-down"></i> + <i class="i i-volume-up"></i> + <i class="i i-qrcode"></i> + <i class="i i-barcode"></i> + + <i class="i i-tag"></i> + <i class="i i-tags"></i> + <i class="i i-book"></i> + <i class="i i-bookmark"></i> + <i class="i i-print"></i> + <i class="i i-camera"></i> + <i class="i i-font"></i> + <i class="i i-bold"></i> + <i class="i i-italic"></i> + <i class="i i-text-height"></i> + <i class="i i-text-width"></i> + <i class="i i-align-left"></i> + <i class="i i-align-center"></i> + <i class="i i-align-right"></i> + <i class="i i-align-justify"></i> + <i class="i i-list"></i> + <i class="i i-indent-left"></i> + <i class="i i-indent-right"></i> + <i class="i i-facetime-video"></i> + <i class="i i-picture"></i> </div> </div> <div class="span3"> <div class="the-icons"> - <i class="icon pencil"></i> - <i class="icon map-marker"></i> - <i class="icon adjust"></i> - <i class="icon tint"></i> - <i class="icon edit"></i> - <i class="icon share"></i> - <i class="icon check"></i> - <i class="icon move"></i> - <i class="icon step-backward"></i> - <i class="icon fast-backward"></i> - <i class="icon backward"></i> - <i class="icon play"></i> - <i class="icon pause"></i> - <i class="icon stop"></i> - <i class="icon forward"></i> - <i class="icon fast-forward"></i> - <i class="icon step-forward"></i> - <i class="icon eject"></i> - <i class="icon chevron-left"></i> - <i class="icon chevron-right"></i> - - <i class="icon plus-sign"></i> - <i class="icon minus-sign"></i> - <i class="icon remove-sign"></i> - <i class="icon ok-sign"></i> - <i class="icon question-sign"></i> - <i class="icon info-sign"></i> - <i class="icon screenshot"></i> - <i class="icon remove-circle"></i> - <i class="icon ok-circle"></i> - <i class="icon ban-circle"></i> + <i class="i i-pencil"></i> + <i class="i i-map-marker"></i> + <i class="i i-adjust"></i> + <i class="i i-tint"></i> + <i class="i i-edit"></i> + <i class="i i-share"></i> + <i class="i i-check"></i> + <i class="i i-move"></i> + <i class="i i-step-backward"></i> + <i class="i i-fast-backward"></i> + <i class="i i-backward"></i> + <i class="i i-play"></i> + <i class="i i-pause"></i> + <i class="i i-stop"></i> + <i class="i i-forward"></i> + <i class="i i-fast-forward"></i> + <i class="i i-step-forward"></i> + <i class="i i-eject"></i> + <i class="i i-chevron-left"></i> + <i class="i i-chevron-right"></i> + + <i class="i i-plus-sign"></i> + <i class="i i-minus-sign"></i> + <i class="i i-remove-sign"></i> + <i class="i i-ok-sign"></i> + <i class="i i-question-sign"></i> + <i class="i i-info-sign"></i> + <i class="i i-screenshot"></i> + <i class="i i-remove-circle"></i> + <i class="i i-ok-circle"></i> + <i class="i i-ban-circle"></i> </div> </div> <div class="span3"> <div class="the-icons"> - <i class="icon arrow-left"></i> - <i class="icon arrow-right"></i> - <i class="icon arrow-up"></i> - <i class="icon arrow-down"></i> - <i class="icon share-alt"></i> - <i class="icon resize-full"></i> - <i class="icon resize-small"></i> - <i class="icon plus"></i> - <i class="icon minus"></i> - <i class="icon asterisk"></i> - - <i class="icon exclamation-sign"></i> - <i class="icon gift"></i> - <i class="icon leaf"></i> - <i class="icon fire"></i> - <i class="icon eye-open"></i> - <i class="icon eye-close"></i> - <i class="icon warning-sign"></i> - <i class="icon plane"></i> - <i class="icon calendar"></i> - <i class="icon random"></i> - <i class="icon comment"></i> - <i class="icon magnet"></i> - <i class="icon chevron-up"></i> - <i class="icon chevron-down"></i> - <i class="icon retweet"></i> - <i class="icon shopping-cart"></i> - <i class="icon folder-close"></i> - <i class="icon folder-open"></i> - <i class="icon resize-vertical"></i> - <i class="icon resize-horizontal"></i> + <i class="i i-arrow-left"></i> + <i class="i i-arrow-right"></i> + <i class="i i-arrow-up"></i> + <i class="i i-arrow-down"></i> + <i class="i i-share-alt"></i> + <i class="i i-resize-full"></i> + <i class="i i-resize-small"></i> + <i class="i i-plus"></i> + <i class="i i-minus"></i> + <i class="i i-asterisk"></i> + + <i class="i i-exclamation-sign"></i> + <i class="i i-gift"></i> + <i class="i i-leaf"></i> + <i class="i i-fire"></i> + <i class="i i-eye-open"></i> + <i class="i i-eye-close"></i> + <i class="i i-warning-sign"></i> + <i class="i i-plane"></i> + <i class="i i-calendar"></i> + <i class="i i-random"></i> + <i class="i i-comment"></i> + <i class="i i-magnet"></i> + <i class="i i-chevron-up"></i> + <i class="i i-chevron-down"></i> + <i class="i i-retweet"></i> + <i class="i i-shopping-cart"></i> + <i class="i i-folder-close"></i> + <i class="i i-folder-open"></i> + <i class="i i-resize-vertical"></i> + <i class="i i-resize-horizontal"></i> </div> </div> </div> @@ -1452,17 +1452,18 @@ For example, <code>section</code> should be wrapped as inline. <div class="span4"> <h3>Built as a sprite</h3> <p>Instead of making every icon an extra request, we've compiled them into a sprite—a bunch of images in one file that uses CSS to position the images with <code>background-position</code>. This is the same method we use on Twitter.com and it has worked well for us.</p> - <p><a href="http://glyphicons.com" target="_blank">Glyphicons</a> has granted us use of the Halflings set in our open-source toolkit so long as we provide a link and credit. Please consider doing the same in your projects.</p> + <p>All icons classes are prefixed with <code>.i-</code> for proper namespacing and scoping, much like our other components. This will help avoid conflicts with other tools.</p> + <p><a href="http://glyphicons.com" target="_blank">Glyphicons</a> has granted us use of the Halflings set in our open-source toolkit so long as we provide a link and credit here in the docs. Please consider doing the same in your projects.</p> </div> <div class="span4"> <h3>How to use</h3> - <p>With v2.0.0, we have opted to use an <code><i></code> tag for all our icons with a base class of <code>.icon</code>. To use, place the following code just about anywhere:</p> + <p>With v2.0.0, we have opted to use an <code><i></code> tag for all our icons with a base class of <code>.i</code>. To use, place the following code just about anywhere:</p> <pre class="prettyprint linenums"> -<i class="icon search"></i> +<i class="i i-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> +<i class="i i-search i-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> </div> @@ -1485,41 +1486,41 @@ For example, <code>section</code> should be wrapped as inline. <div class="span4"> <div class="btn-toolbar" style="margin-bottom: 9px"> <div class="btn-group"> - <a class="btn" href="#"><i class="icon align-left"></i></a> - <a class="btn" href="#"><i class="icon align-center"></i></a> - <a class="btn" href="#"><i class="icon align-right"></i></a> - <a class="btn" href="#"><i class="icon align-justify"></i></a> + <a class="btn" href="#"><i class="i i-align-left"></i></a> + <a class="btn" href="#"><i class="i i-align-center"></i></a> + <a class="btn" href="#"><i class="i i-align-right"></i></a> + <a class="btn" href="#"><i class="i i-align-justify"></i></a> </div> <div class="btn-group"> <a class="btn btn-primary" href="#"><i class="icon white user"></i> User</a> <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a> <ul class="dropdown-menu"> - <li><a href="#"><i class="icon pencil"></i> Edit</a></li> - <li><a href="#"><i class="icon trash"></i> Delete</a></li> - <li><a href="#"><i class="icon ban-circle"></i> Ban</a></li> + <li><a href="#"><i class="i i-pencil"></i> Edit</a></li> + <li><a href="#"><i class="i i-trash"></i> Delete</a></li> + <li><a href="#"><i class="i i-ban-circle"></i> Ban</a></li> <li class="divider"></li> - <li><a href="#"><i class="icon"></i> Make admin</a></li> + <li><a href="#"><i class="i"></i> Make admin</a></li> </ul> </div> </div> <p> - <a class="btn" href="#"><i class="icon refresh"></i> Refresh</a> - <a class="btn btn-success" href="#"><i class="icon white shopping-cart"></i> Checkout</a> - <a class="btn btn-danger" href="#"><i class="icon white trash"></i> Delete</a> + <a class="btn" href="#"><i class="i i-refresh"></i> Refresh</a> + <a class="btn btn-success" href="#"><i class="i i-shopping-cart i-white"></i> Checkout</a> + <a class="btn btn-danger" href="#"><i class="i i-trash i-white"></i> Delete</a> </p> <p> - <a class="btn btn-large" href="#"><i class="icon comment"></i> Comment</a> - <a class="btn btn-small" href="#"><i class="icon cog"></i> Settings</a> - <a class="btn btn-small btn-info" href="#"><i class="icon white info-sign"></i> More Info</a> + <a class="btn btn-large" href="#"><i class="i i-comment"></i> Comment</a> + <a class="btn btn-small" href="#"><i class="i i-cog"></i> Settings</a> + <a class="btn btn-small btn-info" href="#"><i class="i i-info-sign i-white"></i> More Info</a> </p> </div> <div class="span4"> <div class="well" style="padding: 8px 0;"> - <ul class="nav list"> - <li class="active"><a href="#"><i class="icon white home"></i> Home</a></li> - <li><a href="#"><i class="icon book"></i> Library</a></li> - <li><a href="#"><i class="icon pencil"></i> Applications</a></li> - <li><a href="#"><i class="icon"></i> Misc</a></li> + <ul class="nav nav-list"> + <li class="active"><a href="#"><i class="i i-home i-white"></i> Home</a></li> + <li><a href="#"><i class="i i-book"></i> Library</a></li> + <li><a href="#"><i class="i i-pencil"></i> Applications</a></li> + <li><a href="#"><i class="i"></i> Misc</a></li> </ul> </div> <!-- /well --> </div> @@ -1529,7 +1530,7 @@ For example, <code>section</code> should be wrapped as inline. <label class="control-label" for="prependedInput">Email address</label> <div class="controls"> <div class="input-prepend"> - <span class="add-on"><i class="icon envelope"></i></span> + <span class="add-on"><i class="i i-envelope"></i></span> <input class="span2" id="iconInput" type="text"> </div> </div> |
