update docs and all classes

diff --git a/docs/base-css.html b/docs/base-css.html
index 816b465c90ed7e44a327ccf98e0ea5ce23e67ee1..c8ed5fc652bc0b6f84fb6f97f38391f8da4e571e 100644 (file)
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1845,11 +1845,12 @@ For example, <code><section></code> should be wrapped as inlin
         ================================================== -->
         <section id="icons">
           <div class="page-header">
-            <h1>Icons <small>by <a href="http://glyphicons.com" target="_blank">Glyphicons</a></small></h1>
+            <h1>Icons font <small>by <a href="http://glyphicons.com" target="_blank">Glyphicons</a></small></h1>
           </div>
 
-          <h2>Icon glyphs</h2>
-          <p>140 icons in sprite form, available in dark gray (default) and white, provided by <a href="http://glyphicons.com" target="_blank">Glyphicons</a>.</p>
+          <h2>Included glyphs</h2>
+          <p>Bootstrap comes with all 160 of <a href="http://glyphicons.com" target="_blank">Glyphicons</a> Halflings set, all available in font formats for easy coloring, sizing, and placement.</p>
+
           <ul class="the-icons clearfix">
             <li><i class="icon-glass"></i> icon-glass</li>
             <li><i class="icon-music"></i> icon-music</li>
@@ -1995,27 +1996,46 @@ For example, &lt;code&gt;&lt;section&gt;&lt;/code&gt; should be wrapped as inlin
             <li><i class="icon-filter"></i> icon-filter</li>
             <li><i class="icon-briefcase"></i> icon-briefcase</li>
             <li><i class="icon-fullscreen"></i> icon-fullscreen</li>
+
+            <li><i class="icon-dashboard"></i> icon-dashboard</li>
+            <li><i class="icon-paperclip"></i> icon-paperclip</li>
+            <li><i class="icon-heart-empty"></i> icon-heart-empty</li>
+            <li><i class="icon-link"></i> icon-link</li>
+            <li><i class="icon-phone"></i> icon-phone</li>
+            <li><i class="icon-pushpin"></i> icon-pushpin</li>
+            <li><i class="icon-euro"></i> icon-euro</li>
+            <li><i class="icon-usd"></i> icon-usd</li>
+            <li><i class="icon-gbp"></i> icon-gbp</li>
+            <li><i class="icon-sort"></i> icon-sort</li>
+            <li><i class="icon-sort-by-alphabet"></i> icon-sort-by-alphabet</li>
+            <li><i class="icon-sort-by-alphabet-alt"></i> icon-sort-by-alphabet-alt</li>
+            <li><i class="icon-sort-by-order"></i> icon-sort-by-order</li>
+            <li><i class="icon-sort-by-order-alt"></i> icon-sort-by-order-alt</li>
+            <li><i class="icon-sort-by-attributes"></i> icon-sort-by-attributes</li>
+            <li><i class="icon-sort-by-attributes-alt"></i> icon-sort-by-attributes-alt</li>
+            <li><i class="icon-unchecked"></i> icon-unchecked</li>
+            <li><i class="icon-expand"></i> icon-expand</li>
+            <li><i class="icon-collapse"></i> icon-collapse</li>
+            <li><i class="icon-collapse-top"></i> icon-collapse-top</li>
+
           </ul>
 
           <h3>Glyphicons attribution</h3>
-          <p><a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creators have made this possible at no cost to you as developers. As a thank you, we ask you to include an optional link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever practical.</p>
+          <p><a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creator have made this possible at no cost to you as developers. As a thank you, we ask you to include an optional link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever practical.</p>
 
 
           <hr class="bs-docs-separator">
 
 
           <h2>How to use</h2>
-          <p>All icons require an <code>&lt;i&gt;</code> tag with a unique class, prefixed with <code>icon-</code>. To use, place the following code just about anywhere:</p>
+          <p>Add the appropriate class to any inline element. All icon classes are prefixed with <code>icon-</code> for easy styling. To use, place the following code just about anywhere:</p>
 <pre class="prettyprint linenums">
 &lt;i class="icon-search"&gt;&lt;/i&gt;
 </pre>
-          <p>There are also styles available for inverted (white) icons, made ready with one extra class. We will specifically enforce this class on hover and active states for nav and dropdown links.</p>
-<pre class="prettyprint linenums">
-&lt;i class="icon-search icon-white"&gt;&lt;/i&gt;
-</pre>
+          <p>Want to change the icon color? Just change the <code>color</code> of the parent element.</p>
           <p>
             <span class="label label-info">Heads up!</span>
-            When using beside strings of text, as in buttons or nav links, be sure to leave a space after the <code>&lt;i&gt;</code> tag for proper spacing.
+            When using beside strings of text, as in buttons or nav links, be sure to leave a space after the icon for proper spacing.
           </p>
 
 
@@ -2134,6 +2154,7 @@ For example, &lt;code&gt;&lt;section&gt;&lt;/code&gt; should be wrapped as inlin
 
 
 
+
       </div>
     </div>
 

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 494086702d65a15510e4cbb7795d5e6a2fc79d49..bf37fa5c54e1e4b6ba6928f16ea08367afa15ee4 100644 (file)
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1782,11 +1782,12 @@
         ================================================== -->
         <section id="icons">
           <div class="page-header">
-            <h1>{{_i}}Icons <small>by <a href="http://glyphicons.com" target="_blank">Glyphicons</a></small>{{/i}}</h1>
+            <h1>{{_i}}Icons font <small>by <a href="http://glyphicons.com" target="_blank">Glyphicons</a></small>{{/i}}</h1>
           </div>
 
-          <h2>{{_i}}Icon glyphs{{/i}}</h2>
-          <p>{{_i}}140 icons in sprite form, available in dark gray (default) and white, provided by <a href="http://glyphicons.com" target="_blank">Glyphicons</a>.{{/i}}</p>
+          <h2>{{_i}}Included glyphs{{/i}}</h2>
+          <p>{{_i}}Bootstrap comes with all 160 of <a href="http://glyphicons.com" target="_blank">Glyphicons</a> Halflings set, all available in font formats for easy coloring, sizing, and placement.{{/i}}</p>
+
           <ul class="the-icons clearfix">
             <li><i class="icon-glass"></i> icon-glass</li>
             <li><i class="icon-music"></i> icon-music</li>
@@ -1932,27 +1933,46 @@
             <li><i class="icon-filter"></i> icon-filter</li>
             <li><i class="icon-briefcase"></i> icon-briefcase</li>
             <li><i class="icon-fullscreen"></i> icon-fullscreen</li>
+
+            <li><i class="icon-dashboard"></i> icon-dashboard</li>
+            <li><i class="icon-paperclip"></i> icon-paperclip</li>
+            <li><i class="icon-heart-empty"></i> icon-heart-empty</li>
+            <li><i class="icon-link"></i> icon-link</li>
+            <li><i class="icon-phone"></i> icon-phone</li>
+            <li><i class="icon-pushpin"></i> icon-pushpin</li>
+            <li><i class="icon-euro"></i> icon-euro</li>
+            <li><i class="icon-usd"></i> icon-usd</li>
+            <li><i class="icon-gbp"></i> icon-gbp</li>
+            <li><i class="icon-sort"></i> icon-sort</li>
+            <li><i class="icon-sort-by-alphabet"></i> icon-sort-by-alphabet</li>
+            <li><i class="icon-sort-by-alphabet-alt"></i> icon-sort-by-alphabet-alt</li>
+            <li><i class="icon-sort-by-order"></i> icon-sort-by-order</li>
+            <li><i class="icon-sort-by-order-alt"></i> icon-sort-by-order-alt</li>
+            <li><i class="icon-sort-by-attributes"></i> icon-sort-by-attributes</li>
+            <li><i class="icon-sort-by-attributes-alt"></i> icon-sort-by-attributes-alt</li>
+            <li><i class="icon-unchecked"></i> icon-unchecked</li>
+            <li><i class="icon-expand"></i> icon-expand</li>
+            <li><i class="icon-collapse"></i> icon-collapse</li>
+            <li><i class="icon-collapse-top"></i> icon-collapse-top</li>
+
           </ul>
 
           <h3>Glyphicons attribution</h3>
-          <p>{{_i}}<a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creators have made this possible at no cost to you as developers. As a thank you, we ask you to include an optional link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever practical.{{/i}}</p>
+          <p>{{_i}}<a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creator have made this possible at no cost to you as developers. As a thank you, we ask you to include an optional link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever practical.{{/i}}</p>
 
 
           <hr class="bs-docs-separator">
 
 
           <h2>{{_i}}How to use{{/i}}</h2>
-          <p>{{_i}}All icons require an <code>&lt;i&gt;</code> tag with a unique class, prefixed with <code>icon-</code>. To use, place the following code just about anywhere:{{/i}}</p>
+          <p>{{_i}}Add the appropriate class to any inline element. All icon classes are prefixed with <code>icon-</code> for easy styling. To use, place the following code just about anywhere:{{/i}}</p>
 <pre class="prettyprint linenums">
 &lt;i class="icon-search"&gt;&lt;/i&gt;
 </pre>
-          <p>{{_i}}There are also styles available for inverted (white) icons, made ready with one extra class. We will specifically enforce this class on hover and active states for nav and dropdown links.{{/i}}</p>
-<pre class="prettyprint linenums">
-&lt;i class="icon-search icon-white"&gt;&lt;/i&gt;
-</pre>
+          <p>{{_i}}Want to change the icon color? Just change the <code>color</code> of the parent element.{{/i}}</p>
           <p>
             <span class="label label-info">{{_i}}Heads up!{{/i}}</span>
-            {{_i}}When using beside strings of text, as in buttons or nav links, be sure to leave a space after the <code>&lt;i&gt;</code> tag for proper spacing.{{/i}}
+            {{_i}}When using beside strings of text, as in buttons or nav links, be sure to leave a space after the icon for proper spacing.{{/i}}
           </p>
 
 
@@ -2071,6 +2091,7 @@
 
 
 
+
       </div>{{! /span9 }}
     </div>{{! row}}
 

diff --git a/less/sprites.less b/less/sprites.less
index e17e0a6fe5ed97fe5b1c336457bbe38234dad18d..785c841ab239f9f175b356ed04e1671a2dfbedef 100644 (file)
--- a/less/sprites.less
+++ b/less/sprites.less
@@ -7,9 +7,6 @@
 // and background-position. Your resulting HTML will look like
 // <i class="icon-inbox"></i>.
 
-// For the white version of the icons, just add the .icon-white class:
-// <i class="icon-inbox icon-white"></i>
-
 // Import the fonts
 @font-face {
   font-family: 'Glyphicons Halflings';