All Glyphicons now require a base class, e.g. .glyphicon.glyphicon-star

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index ce365b8bc48a81fc0190762203342c9f7fe17fe3..3ac4cf8e69215f13506516d5f00dd9816ddec4f2 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1968,7 +1968,7 @@ fieldset[disabled] .btn-link:focus {
   src: url('../fonts/glyphiconshalflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphiconshalflings-regular.woff') format('woff'), url('../fonts/glyphiconshalflings-regular.ttf') format('truetype'), url('../fonts/glyphiconshalflings-regular.svg#glyphicons_halflingsregular') format('svg');
 }
 
-[class^="glyphicon-"]:before {
+.glyphicon:before {
   font-family: 'Glyphicons Halflings';
   font-style: normal;
   line-height: 1;

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 2c99da3fc737f7ca7ab9bfc0df0c2075663dff1f..e2cc921b871f29e692a425762d6018fe6a5f740a 100644 (file)
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -331,7 +331,7 @@ section > ul li {
   -webkit-box-sizing: border-box;
   margin: 0 -1px -1px 0;
 }
-.the-icons [class^="glyphicon-"] {
+.the-icons .glyphicon {
   display: block;
   margin: 5px auto;
   vertical-align: middle;

diff --git a/docs/components.html b/docs/components.html
index 0aea4113ecc3a8e16491c28ec9c062f08c0b1b92..bc5d7a2b370bc4ab1f5ff69a1327bc79662d3f75 100644 (file)
--- a/docs/components.html
+++ b/docs/components.html
@@ -21,20 +21,20 @@ title: Components
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav">
-          <li><a href="#dropdowns"><i class="glyphicon-chevron-right"></i> Dropdowns</a></li>
-          <li><a href="#buttonGroups"><i class="glyphicon-chevron-right"></i> Button groups</a></li>
-          <li><a href="#buttonDropdowns"><i class="glyphicon-chevron-right"></i> Button dropdowns</a></li>
-          <li><a href="#navs"><i class="glyphicon-chevron-right"></i> Navs</a></li>
-          <li><a href="#navbar"><i class="glyphicon-chevron-right"></i> Navbar</a></li>
-          <li><a href="#breadcrumbs"><i class="glyphicon-chevron-right"></i> Breadcrumbs</a></li>
-          <li><a href="#pagination"><i class="glyphicon-chevron-right"></i> Pagination</a></li>
-          <li><a href="#counters"><i class="glyphicon-chevron-right"></i> Counters</a></li>
-          <li><a href="#typography"><i class="glyphicon-chevron-right"></i> Typography</a></li>
-          <li><a href="#thumbnails"><i class="glyphicon-chevron-right"></i> Thumbnails</a></li>
-          <li><a href="#alerts"><i class="glyphicon-chevron-right"></i> Alerts</a></li>
-          <li><a href="#progress"><i class="glyphicon-chevron-right"></i> Progress bars</a></li>
-          <li><a href="#media"><i class="glyphicon-chevron-right"></i> Media object</a></li>
-          <li><a href="#misc"><i class="glyphicon-chevron-right"></i> Misc</a></li>
+          <li><a href="#dropdowns"><i class="glyphicon glyphicon-chevron-right"></i> Dropdowns</a></li>
+          <li><a href="#buttonGroups"><i class="glyphicon glyphicon-chevron-right"></i> Button groups</a></li>
+          <li><a href="#buttonDropdowns"><i class="glyphicon glyphicon-chevron-right"></i> Button dropdowns</a></li>
+          <li><a href="#navs"><i class="glyphicon glyphicon-chevron-right"></i> Navs</a></li>
+          <li><a href="#navbar"><i class="glyphicon glyphicon-chevron-right"></i> Navbar</a></li>
+          <li><a href="#breadcrumbs"><i class="glyphicon glyphicon-chevron-right"></i> Breadcrumbs</a></li>
+          <li><a href="#pagination"><i class="glyphicon glyphicon-chevron-right"></i> Pagination</a></li>
+          <li><a href="#counters"><i class="glyphicon glyphicon-chevron-right"></i> Counters</a></li>
+          <li><a href="#typography"><i class="glyphicon glyphicon-chevron-right"></i> Typography</a></li>
+          <li><a href="#thumbnails"><i class="glyphicon glyphicon-chevron-right"></i> Thumbnails</a></li>
+          <li><a href="#alerts"><i class="glyphicon glyphicon-chevron-right"></i> Alerts</a></li>
+          <li><a href="#progress"><i class="glyphicon glyphicon-chevron-right"></i> Progress bars</a></li>
+          <li><a href="#media"><i class="glyphicon glyphicon-chevron-right"></i> Media object</a></li>
+          <li><a href="#misc"><i class="glyphicon glyphicon-chevron-right"></i> Misc</a></li>
         </ul>
       </div>
       <div class="span9">
@@ -163,10 +163,10 @@ title: Components
           <p>Make a set of buttons appear vertically stacked rather than horizontally.</p>
           <div class="bs-docs-example">
             <div class="btn-group btn-group-vertical">
-              <button type="button" class="btn"><i class="glyphicon-align-left"></i></button>
-              <button type="button" class="btn"><i class="glyphicon-align-center"></i></button>
-              <button type="button" class="btn"><i class="glyphicon-align-right"></i></button>
-              <button type="button" class="btn"><i class="glyphicon-align-justify"></i></button>
+              <button type="button" class="btn"><i class="glyphicon glyphicon-align-left"></i></button>
+              <button type="button" class="btn"><i class="glyphicon glyphicon-align-center"></i></button>
+              <button type="button" class="btn"><i class="glyphicon glyphicon-align-right"></i></button>
+              <button type="button" class="btn"><i class="glyphicon glyphicon-align-justify"></i></button>
             </div>
           </div>
 {% highlight html linenos %}

diff --git a/docs/css.html b/docs/css.html
index b05cfbc1b4741a4ee298d5c624389dd29edeb323..297b4ea336eac58332c57f3d6e647e4b288b01cb 100644 (file)
--- a/docs/css.html
+++ b/docs/css.html
@@ -20,16 +20,16 @@ title: CSS
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav">
-          <li><a href="#global"><i class="glyphicon-chevron-right"></i> Global settings</a></li>
-          <li><a href="#typography"><i class="glyphicon-chevron-right"></i> Typography</a></li>
-          <li><a href="#code"><i class="glyphicon-chevron-right"></i> Code</a></li>
-          <li><a href="#gridSystem"><i class="glyphicon-chevron-right"></i> Grid system</a></li>
-          <li><a href="#tables"><i class="glyphicon-chevron-right"></i> Tables</a></li>
-          <li><a href="#forms"><i class="glyphicon-chevron-right"></i> Forms</a></li>
-          <li><a href="#buttons"><i class="glyphicon-chevron-right"></i> Buttons</a></li>
-          <li><a href="#images"><i class="glyphicon-chevron-right"></i> Images</a></li>
-          <li><a href="#icons"><i class="glyphicon-chevron-right"></i> Glyphicons</a></li>
-          <li><a href="#responsive-utilities"><i class="glyphicon-chevron-right"></i> Responsive utilities</a></li>
+          <li><a href="#global"><i class="glyphicon glyphicon-chevron-right"></i> Global settings</a></li>
+          <li><a href="#typography"><i class="glyphicon glyphicon-chevron-right"></i> Typography</a></li>
+          <li><a href="#code"><i class="glyphicon glyphicon-chevron-right"></i> Code</a></li>
+          <li><a href="#gridSystem"><i class="glyphicon glyphicon-chevron-right"></i> Grid system</a></li>
+          <li><a href="#tables"><i class="glyphicon glyphicon-chevron-right"></i> Tables</a></li>
+          <li><a href="#forms"><i class="glyphicon glyphicon-chevron-right"></i> Forms</a></li>
+          <li><a href="#buttons"><i class="glyphicon glyphicon-chevron-right"></i> Buttons</a></li>
+          <li><a href="#images"><i class="glyphicon glyphicon-chevron-right"></i> Images</a></li>
+          <li><a href="#icons"><i class="glyphicon glyphicon-chevron-right"></i> Glyphicons</a></li>
+          <li><a href="#responsive-utilities"><i class="glyphicon glyphicon-chevron-right"></i> Responsive utilities</a></li>
         </ul>
       </div>
       <div class="span9">
@@ -1908,171 +1908,171 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
           <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="glyphicon-glass"></i> glyphicon-glass</li>
-            <li><i class="glyphicon-music"></i> glyphicon-music</li>
-            <li><i class="glyphicon-search"></i> glyphicon-search</li>
-            <li><i class="glyphicon-envelope"></i> glyphicon-envelope</li>
-            <li><i class="glyphicon-heart"></i> glyphicon-heart</li>
-            <li><i class="glyphicon-star"></i> glyphicon-star</li>
-            <li><i class="glyphicon-star-empty"></i> glyphicon-star-empty</li>
-            <li><i class="glyphicon-user"></i> glyphicon-user</li>
-            <li><i class="glyphicon-film"></i> glyphicon-film</li>
-            <li><i class="glyphicon-th-large"></i> glyphicon-th-large</li>
-            <li><i class="glyphicon-th"></i> glyphicon-th</li>
-            <li><i class="glyphicon-th-list"></i> glyphicon-th-list</li>
-            <li><i class="glyphicon-ok"></i> glyphicon-ok</li>
-            <li><i class="glyphicon-remove"></i> glyphicon-remove</li>
-            <li><i class="glyphicon-zoom-in"></i> glyphicon-zoom-in</li>
-            <li><i class="glyphicon-zoom-out"></i> glyphicon-zoom-out</li>
-            <li><i class="glyphicon-off"></i> glyphicon-off</li>
-            <li><i class="glyphicon-signal"></i> glyphicon-signal</li>
-            <li><i class="glyphicon-cog"></i> glyphicon-cog</li>
-            <li><i class="glyphicon-trash"></i> glyphicon-trash</li>
-            <li><i class="glyphicon-home"></i> glyphicon-home</li>
-            <li><i class="glyphicon-file"></i> glyphicon-file</li>
-            <li><i class="glyphicon-time"></i> glyphicon-time</li>
-            <li><i class="glyphicon-road"></i> glyphicon-road</li>
-            <li><i class="glyphicon-download-alt"></i> glyphicon-download-alt</li>
-            <li><i class="glyphicon-download"></i> glyphicon-download</li>
-            <li><i class="glyphicon-upload"></i> glyphicon-upload</li>
-            <li><i class="glyphicon-inbox"></i> glyphicon-inbox</li>
-
-            <li><i class="glyphicon-play-circle"></i> glyphicon-play-circle</li>
-            <li><i class="glyphicon-repeat"></i> glyphicon-repeat</li>
-            <li><i class="glyphicon-refresh"></i> glyphicon-refresh</li>
-            <li><i class="glyphicon-list-alt"></i> glyphicon-list-alt</li>
-            <li><i class="glyphicon-lock"></i> glyphicon-lock</li>
-            <li><i class="glyphicon-flag"></i> glyphicon-flag</li>
-            <li><i class="glyphicon-headphones"></i> glyphicon-headphones</li>
-            <li><i class="glyphicon-volume-off"></i> glyphicon-volume-off</li>
-            <li><i class="glyphicon-volume-down"></i> glyphicon-volume-down</li>
-            <li><i class="glyphicon-volume-up"></i> glyphicon-volume-up</li>
-            <li><i class="glyphicon-qrcode"></i> glyphicon-qrcode</li>
-            <li><i class="glyphicon-barcode"></i> glyphicon-barcode</li>
-            <li><i class="glyphicon-tag"></i> glyphicon-tag</li>
-            <li><i class="glyphicon-tags"></i> glyphicon-tags</li>
-            <li><i class="glyphicon-book"></i> glyphicon-book</li>
-            <li><i class="glyphicon-bookmark"></i> glyphicon-bookmark</li>
-            <li><i class="glyphicon-print"></i> glyphicon-print</li>
-            <li><i class="glyphicon-camera"></i> glyphicon-camera</li>
-            <li><i class="glyphicon-font"></i> glyphicon-font</li>
-            <li><i class="glyphicon-bold"></i> glyphicon-bold</li>
-            <li><i class="glyphicon-italic"></i> glyphicon-italic</li>
-            <li><i class="glyphicon-text-height"></i> glyphicon-text-height</li>
-            <li><i class="glyphicon-text-width"></i> glyphicon-text-width</li>
-            <li><i class="glyphicon-align-left"></i> glyphicon-align-left</li>
-            <li><i class="glyphicon-align-center"></i> glyphicon-align-center</li>
-            <li><i class="glyphicon-align-right"></i> glyphicon-align-right</li>
-            <li><i class="glyphicon-align-justify"></i> glyphicon-align-justify</li>
-            <li><i class="glyphicon-list"></i> glyphicon-list</li>
-
-            <li><i class="glyphicon-indent-left"></i> glyphicon-indent-left</li>
-            <li><i class="glyphicon-indent-right"></i> glyphicon-indent-right</li>
-            <li><i class="glyphicon-facetime-video"></i> glyphicon-facetime-video</li>
-            <li><i class="glyphicon-picture"></i> glyphicon-picture</li>
-            <li><i class="glyphicon-pencil"></i> glyphicon-pencil</li>
-            <li><i class="glyphicon-map-marker"></i> glyphicon-map-marker</li>
-            <li><i class="glyphicon-adjust"></i> glyphicon-adjust</li>
-            <li><i class="glyphicon-tint"></i> glyphicon-tint</li>
-            <li><i class="glyphicon-edit"></i> glyphicon-edit</li>
-            <li><i class="glyphicon-share"></i> glyphicon-share</li>
-            <li><i class="glyphicon-check"></i> glyphicon-check</li>
-            <li><i class="glyphicon-move"></i> glyphicon-move</li>
-            <li><i class="glyphicon-step-backward"></i> glyphicon-step-backward</li>
-            <li><i class="glyphicon-fast-backward"></i> glyphicon-fast-backward</li>
-            <li><i class="glyphicon-backward"></i> glyphicon-backward</li>
-            <li><i class="glyphicon-play"></i> glyphicon-play</li>
-            <li><i class="glyphicon-pause"></i> glyphicon-pause</li>
-            <li><i class="glyphicon-stop"></i> glyphicon-stop</li>
-            <li><i class="glyphicon-forward"></i> glyphicon-forward</li>
-            <li><i class="glyphicon-fast-forward"></i> glyphicon-fast-forward</li>
-            <li><i class="glyphicon-step-forward"></i> glyphicon-step-forward</li>
-            <li><i class="glyphicon-eject"></i> glyphicon-eject</li>
-            <li><i class="glyphicon-chevron-left"></i> glyphicon-chevron-left</li>
-            <li><i class="glyphicon-chevron-right"></i> glyphicon-chevron-right</li>
-            <li><i class="glyphicon-plus-sign"></i> glyphicon-plus-sign</li>
-            <li><i class="glyphicon-minus-sign"></i> glyphicon-minus-sign</li>
-            <li><i class="glyphicon-remove-sign"></i> glyphicon-remove-sign</li>
-            <li><i class="glyphicon-ok-sign"></i> glyphicon-ok-sign</li>
-
-            <li><i class="glyphicon-question-sign"></i> glyphicon-question-sign</li>
-            <li><i class="glyphicon-info-sign"></i> glyphicon-info-sign</li>
-            <li><i class="glyphicon-screenshot"></i> glyphicon-screenshot</li>
-            <li><i class="glyphicon-remove-circle"></i> glyphicon-remove-circle</li>
-            <li><i class="glyphicon-ok-circle"></i> glyphicon-ok-circle</li>
-            <li><i class="glyphicon-ban-circle"></i> glyphicon-ban-circle</li>
-            <li><i class="glyphicon-arrow-left"></i> glyphicon-arrow-left</li>
-            <li><i class="glyphicon-arrow-right"></i> glyphicon-arrow-right</li>
-            <li><i class="glyphicon-arrow-up"></i> glyphicon-arrow-up</li>
-            <li><i class="glyphicon-arrow-down"></i> glyphicon-arrow-down</li>
-            <li><i class="glyphicon-share-alt"></i> glyphicon-share-alt</li>
-            <li><i class="glyphicon-resize-full"></i> glyphicon-resize-full</li>
-            <li><i class="glyphicon-resize-small"></i> glyphicon-resize-small</li>
-            <li><i class="glyphicon-plus"></i> glyphicon-plus</li>
-            <li><i class="glyphicon-minus"></i> glyphicon-minus</li>
-            <li><i class="glyphicon-asterisk"></i> glyphicon-asterisk</li>
-            <li><i class="glyphicon-exclamation-sign"></i> glyphicon-exclamation-sign</li>
-            <li><i class="glyphicon-gift"></i> glyphicon-gift</li>
-            <li><i class="glyphicon-leaf"></i> glyphicon-leaf</li>
-            <li><i class="glyphicon-fire"></i> glyphicon-fire</li>
-            <li><i class="glyphicon-eye-open"></i> glyphicon-eye-open</li>
-            <li><i class="glyphicon-eye-close"></i> glyphicon-eye-close</li>
-            <li><i class="glyphicon-warning-sign"></i> glyphicon-warning-sign</li>
-            <li><i class="glyphicon-plane"></i> glyphicon-plane</li>
-            <li><i class="glyphicon-calendar"></i> glyphicon-calendar</li>
-            <li><i class="glyphicon-random"></i> glyphicon-random</li>
-            <li><i class="glyphicon-comment"></i> glyphicon-comment</li>
-            <li><i class="glyphicon-magnet"></i> glyphicon-magnet</li>
-
-            <li><i class="glyphicon-chevron-up"></i> glyphicon-chevron-up</li>
-            <li><i class="glyphicon-chevron-down"></i> glyphicon-chevron-down</li>
-            <li><i class="glyphicon-retweet"></i> glyphicon-retweet</li>
-            <li><i class="glyphicon-shopping-cart"></i> glyphicon-shopping-cart</li>
-            <li><i class="glyphicon-folder-close"></i> glyphicon-folder-close</li>
-            <li><i class="glyphicon-folder-open"></i> glyphicon-folder-open</li>
-            <li><i class="glyphicon-resize-vertical"></i> glyphicon-resize-vertical</li>
-            <li><i class="glyphicon-resize-horizontal"></i> glyphicon-resize-horizontal</li>
-            <li><i class="glyphicon-hdd"></i> glyphicon-hdd</li>
-            <li><i class="glyphicon-bullhorn"></i> glyphicon-bullhorn</li>
-            <li><i class="glyphicon-bell"></i> glyphicon-bell</li>
-            <li><i class="glyphicon-certificate"></i> glyphicon-certificate</li>
-            <li><i class="glyphicon-thumbs-up"></i> glyphicon-thumbs-up</li>
-            <li><i class="glyphicon-thumbs-down"></i> glyphicon-thumbs-down</li>
-            <li><i class="glyphicon-hand-right"></i> glyphicon-hand-right</li>
-            <li><i class="glyphicon-hand-left"></i> glyphicon-hand-left</li>
-            <li><i class="glyphicon-hand-up"></i> glyphicon-hand-up</li>
-            <li><i class="glyphicon-hand-down"></i> glyphicon-hand-down</li>
-            <li><i class="glyphicon-circle-arrow-right"></i> glyphicon-circle-arrow-right</li>
-            <li><i class="glyphicon-circle-arrow-left"></i> glyphicon-circle-arrow-left</li>
-            <li><i class="glyphicon-circle-arrow-up"></i> glyphicon-circle-arrow-up</li>
-            <li><i class="glyphicon-circle-arrow-down"></i> glyphicon-circle-arrow-down</li>
-            <li><i class="glyphicon-globe"></i> glyphicon-globe</li>
-            <li><i class="glyphicon-wrench"></i> glyphicon-wrench</li>
-            <li><i class="glyphicon-tasks"></i> glyphicon-tasks</li>
-            <li><i class="glyphicon-filter"></i> glyphicon-filter</li>
-            <li><i class="glyphicon-briefcase"></i> glyphicon-briefcase</li>
-            <li><i class="glyphicon-fullscreen"></i> glyphicon-fullscreen</li>
-
-            <li><i class="glyphicon-dashboard"></i> glyphicon-dashboard</li>
-            <li><i class="glyphicon-paperclip"></i> glyphicon-paperclip</li>
-            <li><i class="glyphicon-heart-empty"></i> glyphicon-heart-empty</li>
-            <li><i class="glyphicon-link"></i> glyphicon-link</li>
-            <li><i class="glyphicon-phone"></i> glyphicon-phone</li>
-            <li><i class="glyphicon-pushpin"></i> glyphicon-pushpin</li>
-            <li><i class="glyphicon-euro"></i> glyphicon-euro</li>
-            <li><i class="glyphicon-usd"></i> glyphicon-usd</li>
-            <li><i class="glyphicon-gbp"></i> glyphicon-gbp</li>
-            <li><i class="glyphicon-sort"></i> glyphicon-sort</li>
-            <li><i class="glyphicon-sort-by-alphabet"></i> glyphicon-sort-by-alphabet</li>
-            <li><i class="glyphicon-sort-by-alphabet-alt"></i> glyphicon-sort-by-alphabet-alt</li>
-            <li><i class="glyphicon-sort-by-order"></i> glyphicon-sort-by-order</li>
-            <li><i class="glyphicon-sort-by-order-alt"></i> glyphicon-sort-by-order-alt</li>
-            <li><i class="glyphicon-sort-by-attributes"></i> glyphicon-sort-by-attributes</li>
-            <li><i class="glyphicon-sort-by-attributes-alt"></i> glyphicon-sort-by-attributes-alt</li>
-            <li><i class="glyphicon-unchecked"></i> glyphicon-unchecked</li>
-            <li><i class="glyphicon-expand"></i> glyphicon-expand</li>
-            <li><i class="glyphicon-collapse"></i> glyphicon-collapse</li>
-            <li><i class="glyphicon-collapse-top"></i> glyphicon-collapse-top</li>
+            <li><i class="glyphicon glyphicon-glass"></i> glyphicon-glass</li>
+            <li><i class="glyphicon glyphicon-music"></i> glyphicon-music</li>
+            <li><i class="glyphicon glyphicon-search"></i> glyphicon-search</li>
+            <li><i class="glyphicon glyphicon-envelope"></i> glyphicon-envelope</li>
+            <li><i class="glyphicon glyphicon-heart"></i> glyphicon-heart</li>
+            <li><i class="glyphicon glyphicon-star"></i> glyphicon-star</li>
+            <li><i class="glyphicon glyphicon-star-empty"></i> glyphicon-star-empty</li>
+            <li><i class="glyphicon glyphicon-user"></i> glyphicon-user</li>
+            <li><i class="glyphicon glyphicon-film"></i> glyphicon-film</li>
+            <li><i class="glyphicon glyphicon-th-large"></i> glyphicon-th-large</li>
+            <li><i class="glyphicon glyphicon-th"></i> glyphicon-th</li>
+            <li><i class="glyphicon glyphicon-th-list"></i> glyphicon-th-list</li>
+            <li><i class="glyphicon glyphicon-ok"></i> glyphicon-ok</li>
+            <li><i class="glyphicon glyphicon-remove"></i> glyphicon-remove</li>
+            <li><i class="glyphicon glyphicon-zoom-in"></i> glyphicon-zoom-in</li>
+            <li><i class="glyphicon glyphicon-zoom-out"></i> glyphicon-zoom-out</li>
+            <li><i class="glyphicon glyphicon-off"></i> glyphicon-off</li>
+            <li><i class="glyphicon glyphicon-signal"></i> glyphicon-signal</li>
+            <li><i class="glyphicon glyphicon-cog"></i> glyphicon-cog</li>
+            <li><i class="glyphicon glyphicon-trash"></i> glyphicon-trash</li>
+            <li><i class="glyphicon glyphicon-home"></i> glyphicon-home</li>
+            <li><i class="glyphicon glyphicon-file"></i> glyphicon-file</li>
+            <li><i class="glyphicon glyphicon-time"></i> glyphicon-time</li>
+            <li><i class="glyphicon glyphicon-road"></i> glyphicon-road</li>
+            <li><i class="glyphicon glyphicon-download-alt"></i> glyphicon-download-alt</li>
+            <li><i class="glyphicon glyphicon-download"></i> glyphicon-download</li>
+            <li><i class="glyphicon glyphicon-upload"></i> glyphicon-upload</li>
+            <li><i class="glyphicon glyphicon-inbox"></i> glyphicon-inbox</li>
+
+            <li><i class="glyphicon glyphicon-play-circle"></i> glyphicon-play-circle</li>
+            <li><i class="glyphicon glyphicon-repeat"></i> glyphicon-repeat</li>
+            <li><i class="glyphicon glyphicon-refresh"></i> glyphicon-refresh</li>
+            <li><i class="glyphicon glyphicon-list-alt"></i> glyphicon-list-alt</li>
+            <li><i class="glyphicon glyphicon-lock"></i> glyphicon-lock</li>
+            <li><i class="glyphicon glyphicon-flag"></i> glyphicon-flag</li>
+            <li><i class="glyphicon glyphicon-headphones"></i> glyphicon-headphones</li>
+            <li><i class="glyphicon glyphicon-volume-off"></i> glyphicon-volume-off</li>
+            <li><i class="glyphicon glyphicon-volume-down"></i> glyphicon-volume-down</li>
+            <li><i class="glyphicon glyphicon-volume-up"></i> glyphicon-volume-up</li>
+            <li><i class="glyphicon glyphicon-qrcode"></i> glyphicon-qrcode</li>
+            <li><i class="glyphicon glyphicon-barcode"></i> glyphicon-barcode</li>
+            <li><i class="glyphicon glyphicon-tag"></i> glyphicon-tag</li>
+            <li><i class="glyphicon glyphicon-tags"></i> glyphicon-tags</li>
+            <li><i class="glyphicon glyphicon-book"></i> glyphicon-book</li>
+            <li><i class="glyphicon glyphicon-bookmark"></i> glyphicon-bookmark</li>
+            <li><i class="glyphicon glyphicon-print"></i> glyphicon-print</li>
+            <li><i class="glyphicon glyphicon-camera"></i> glyphicon-camera</li>
+            <li><i class="glyphicon glyphicon-font"></i> glyphicon-font</li>
+            <li><i class="glyphicon glyphicon-bold"></i> glyphicon-bold</li>
+            <li><i class="glyphicon glyphicon-italic"></i> glyphicon-italic</li>
+            <li><i class="glyphicon glyphicon-text-height"></i> glyphicon-text-height</li>
+            <li><i class="glyphicon glyphicon-text-width"></i> glyphicon-text-width</li>
+            <li><i class="glyphicon glyphicon-align-left"></i> glyphicon-align-left</li>
+            <li><i class="glyphicon glyphicon-align-center"></i> glyphicon-align-center</li>
+            <li><i class="glyphicon glyphicon-align-right"></i> glyphicon-align-right</li>
+            <li><i class="glyphicon glyphicon-align-justify"></i> glyphicon-align-justify</li>
+            <li><i class="glyphicon glyphicon-list"></i> glyphicon-list</li>
+
+            <li><i class="glyphicon glyphicon-indent-left"></i> glyphicon-indent-left</li>
+            <li><i class="glyphicon glyphicon-indent-right"></i> glyphicon-indent-right</li>
+            <li><i class="glyphicon glyphicon-facetime-video"></i> glyphicon-facetime-video</li>
+            <li><i class="glyphicon glyphicon-picture"></i> glyphicon-picture</li>
+            <li><i class="glyphicon glyphicon-pencil"></i> glyphicon-pencil</li>
+            <li><i class="glyphicon glyphicon-map-marker"></i> glyphicon-map-marker</li>
+            <li><i class="glyphicon glyphicon-adjust"></i> glyphicon-adjust</li>
+            <li><i class="glyphicon glyphicon-tint"></i> glyphicon-tint</li>
+            <li><i class="glyphicon glyphicon-edit"></i> glyphicon-edit</li>
+            <li><i class="glyphicon glyphicon-share"></i> glyphicon-share</li>
+            <li><i class="glyphicon glyphicon-check"></i> glyphicon-check</li>
+            <li><i class="glyphicon glyphicon-move"></i> glyphicon-move</li>
+            <li><i class="glyphicon glyphicon-step-backward"></i> glyphicon-step-backward</li>
+            <li><i class="glyphicon glyphicon-fast-backward"></i> glyphicon-fast-backward</li>
+            <li><i class="glyphicon glyphicon-backward"></i> glyphicon-backward</li>
+            <li><i class="glyphicon glyphicon-play"></i> glyphicon-play</li>
+            <li><i class="glyphicon glyphicon-pause"></i> glyphicon-pause</li>
+            <li><i class="glyphicon glyphicon-stop"></i> glyphicon-stop</li>
+            <li><i class="glyphicon glyphicon-forward"></i> glyphicon-forward</li>
+            <li><i class="glyphicon glyphicon-fast-forward"></i> glyphicon-fast-forward</li>
+            <li><i class="glyphicon glyphicon-step-forward"></i> glyphicon-step-forward</li>
+            <li><i class="glyphicon glyphicon-eject"></i> glyphicon-eject</li>
+            <li><i class="glyphicon glyphicon-chevron-left"></i> glyphicon-chevron-left</li>
+            <li><i class="glyphicon glyphicon-chevron-right"></i> glyphicon-chevron-right</li>
+            <li><i class="glyphicon glyphicon-plus-sign"></i> glyphicon-plus-sign</li>
+            <li><i class="glyphicon glyphicon-minus-sign"></i> glyphicon-minus-sign</li>
+            <li><i class="glyphicon glyphicon-remove-sign"></i> glyphicon-remove-sign</li>
+            <li><i class="glyphicon glyphicon-ok-sign"></i> glyphicon-ok-sign</li>
+
+            <li><i class="glyphicon glyphicon-question-sign"></i> glyphicon-question-sign</li>
+            <li><i class="glyphicon glyphicon-info-sign"></i> glyphicon-info-sign</li>
+            <li><i class="glyphicon glyphicon-screenshot"></i> glyphicon-screenshot</li>
+            <li><i class="glyphicon glyphicon-remove-circle"></i> glyphicon-remove-circle</li>
+            <li><i class="glyphicon glyphicon-ok-circle"></i> glyphicon-ok-circle</li>
+            <li><i class="glyphicon glyphicon-ban-circle"></i> glyphicon-ban-circle</li>
+            <li><i class="glyphicon glyphicon-arrow-left"></i> glyphicon-arrow-left</li>
+            <li><i class="glyphicon glyphicon-arrow-right"></i> glyphicon-arrow-right</li>
+            <li><i class="glyphicon glyphicon-arrow-up"></i> glyphicon-arrow-up</li>
+            <li><i class="glyphicon glyphicon-arrow-down"></i> glyphicon-arrow-down</li>
+            <li><i class="glyphicon glyphicon-share-alt"></i> glyphicon-share-alt</li>
+            <li><i class="glyphicon glyphicon-resize-full"></i> glyphicon-resize-full</li>
+            <li><i class="glyphicon glyphicon-resize-small"></i> glyphicon-resize-small</li>
+            <li><i class="glyphicon glyphicon-plus"></i> glyphicon-plus</li>
+            <li><i class="glyphicon glyphicon-minus"></i> glyphicon-minus</li>
+            <li><i class="glyphicon glyphicon-asterisk"></i> glyphicon-asterisk</li>
+            <li><i class="glyphicon glyphicon-exclamation-sign"></i> glyphicon-exclamation-sign</li>
+            <li><i class="glyphicon glyphicon-gift"></i> glyphicon-gift</li>
+            <li><i class="glyphicon glyphicon-leaf"></i> glyphicon-leaf</li>
+            <li><i class="glyphicon glyphicon-fire"></i> glyphicon-fire</li>
+            <li><i class="glyphicon glyphicon-eye-open"></i> glyphicon-eye-open</li>
+            <li><i class="glyphicon glyphicon-eye-close"></i> glyphicon-eye-close</li>
+            <li><i class="glyphicon glyphicon-warning-sign"></i> glyphicon-warning-sign</li>
+            <li><i class="glyphicon glyphicon-plane"></i> glyphicon-plane</li>
+            <li><i class="glyphicon glyphicon-calendar"></i> glyphicon-calendar</li>
+            <li><i class="glyphicon glyphicon-random"></i> glyphicon-random</li>
+            <li><i class="glyphicon glyphicon-comment"></i> glyphicon-comment</li>
+            <li><i class="glyphicon glyphicon-magnet"></i> glyphicon-magnet</li>
+
+            <li><i class="glyphicon glyphicon-chevron-up"></i> glyphicon-chevron-up</li>
+            <li><i class="glyphicon glyphicon-chevron-down"></i> glyphicon-chevron-down</li>
+            <li><i class="glyphicon glyphicon-retweet"></i> glyphicon-retweet</li>
+            <li><i class="glyphicon glyphicon-shopping-cart"></i> glyphicon-shopping-cart</li>
+            <li><i class="glyphicon glyphicon-folder-close"></i> glyphicon-folder-close</li>
+            <li><i class="glyphicon glyphicon-folder-open"></i> glyphicon-folder-open</li>
+            <li><i class="glyphicon glyphicon-resize-vertical"></i> glyphicon-resize-vertical</li>
+            <li><i class="glyphicon glyphicon-resize-horizontal"></i> glyphicon-resize-horizontal</li>
+            <li><i class="glyphicon glyphicon-hdd"></i> glyphicon-hdd</li>
+            <li><i class="glyphicon glyphicon-bullhorn"></i> glyphicon-bullhorn</li>
+            <li><i class="glyphicon glyphicon-bell"></i> glyphicon-bell</li>
+            <li><i class="glyphicon glyphicon-certificate"></i> glyphicon-certificate</li>
+            <li><i class="glyphicon glyphicon-thumbs-up"></i> glyphicon-thumbs-up</li>
+            <li><i class="glyphicon glyphicon-thumbs-down"></i> glyphicon-thumbs-down</li>
+            <li><i class="glyphicon glyphicon-hand-right"></i> glyphicon-hand-right</li>
+            <li><i class="glyphicon glyphicon-hand-left"></i> glyphicon-hand-left</li>
+            <li><i class="glyphicon glyphicon-hand-up"></i> glyphicon-hand-up</li>
+            <li><i class="glyphicon glyphicon-hand-down"></i> glyphicon-hand-down</li>
+            <li><i class="glyphicon glyphicon-circle-arrow-right"></i> glyphicon-circle-arrow-right</li>
+            <li><i class="glyphicon glyphicon-circle-arrow-left"></i> glyphicon-circle-arrow-left</li>
+            <li><i class="glyphicon glyphicon-circle-arrow-up"></i> glyphicon-circle-arrow-up</li>
+            <li><i class="glyphicon glyphicon-circle-arrow-down"></i> glyphicon-circle-arrow-down</li>
+            <li><i class="glyphicon glyphicon-globe"></i> glyphicon-globe</li>
+            <li><i class="glyphicon glyphicon-wrench"></i> glyphicon-wrench</li>
+            <li><i class="glyphicon glyphicon-tasks"></i> glyphicon-tasks</li>
+            <li><i class="glyphicon glyphicon-filter"></i> glyphicon-filter</li>
+            <li><i class="glyphicon glyphicon-briefcase"></i> glyphicon-briefcase</li>
+            <li><i class="glyphicon glyphicon-fullscreen"></i> glyphicon-fullscreen</li>
+
+            <li><i class="glyphicon glyphicon-dashboard"></i> glyphicon-dashboard</li>
+            <li><i class="glyphicon glyphicon-paperclip"></i> glyphicon-paperclip</li>
+            <li><i class="glyphicon glyphicon-heart-empty"></i> glyphicon-heart-empty</li>
+            <li><i class="glyphicon glyphicon-link"></i> glyphicon-link</li>
+            <li><i class="glyphicon glyphicon-phone"></i> glyphicon-phone</li>
+            <li><i class="glyphicon glyphicon-pushpin"></i> glyphicon-pushpin</li>
+            <li><i class="glyphicon glyphicon-euro"></i> glyphicon-euro</li>
+            <li><i class="glyphicon glyphicon-usd"></i> glyphicon-usd</li>
+            <li><i class="glyphicon glyphicon-gbp"></i> glyphicon-gbp</li>
+            <li><i class="glyphicon glyphicon-sort"></i> glyphicon-sort</li>
+            <li><i class="glyphicon glyphicon-sort-by-alphabet"></i> glyphicon-sort-by-alphabet</li>
+            <li><i class="glyphicon glyphicon-sort-by-alphabet-alt"></i> glyphicon-sort-by-alphabet-alt</li>
+            <li><i class="glyphicon glyphicon-sort-by-order"></i> glyphicon-sort-by-order</li>
+            <li><i class="glyphicon glyphicon-sort-by-order-alt"></i> glyphicon-sort-by-order-alt</li>
+            <li><i class="glyphicon glyphicon-sort-by-attributes"></i> glyphicon-sort-by-attributes</li>
+            <li><i class="glyphicon glyphicon-sort-by-attributes-alt"></i> glyphicon-sort-by-attributes-alt</li>
+            <li><i class="glyphicon glyphicon-unchecked"></i> glyphicon-unchecked</li>
+            <li><i class="glyphicon glyphicon-expand"></i> glyphicon-expand</li>
+            <li><i class="glyphicon glyphicon-collapse"></i> glyphicon-collapse</li>
+            <li><i class="glyphicon glyphicon-collapse-top"></i> glyphicon-collapse-top</li>
 
           </ul>
 
@@ -2083,7 +2083,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
           <h2>How to use</h2>
           <p>Add the appropriate class to any inline element. All icon classes are prefixed with <code>glyphicon-</code> for easy styling. To use, place the following code just about anywhere:</p>
 {% highlight html linenos %}
-<span class="glyphicon-search"></span>
+<span class="glyphicon glyphicon-search"></span>
 {% endhighlight %}
           <p>Want to change the icon color? Just change the <code>color</code> of the parent element.</p>
           <p>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>
@@ -2098,20 +2098,20 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
           <div class="bs-docs-example">
             <div class="btn-toolbar">
               <div class="btn-group">
-                <a class="btn" href="#"><span class="glyphicon-align-left"></span></a>
-                <a class="btn" href="#"><span class="glyphicon-align-center"></span></a>
-                <a class="btn" href="#"><span class="glyphicon-align-right"></span></a>
-                <a class="btn" href="#"><span class="glyphicon-align-justify"></span></a>
+                <a class="btn" href="#"><span class="glyphicon glyphicon-align-left"></span></a>
+                <a class="btn" href="#"><span class="glyphicon glyphicon-align-center"></span></a>
+                <a class="btn" href="#"><span class="glyphicon glyphicon-align-right"></span></a>
+                <a class="btn" href="#"><span class="glyphicon glyphicon-align-justify"></span></a>
               </div>
             </div>
           </div><!-- /bs-docs-example -->
 {% highlight html linenos %}
 <div class="btn-toolbar">
   <div class="btn-group">
-    <a class="btn" href="#"><span class="glyphicon-align-left"></span></a>
-    <a class="btn" href="#"><span class="glyphicon-align-center"></span></a>
-    <a class="btn" href="#"><span class="glyphicon-align-right"></span></a>
-    <a class="btn" href="#"><span class="glyphicon-align-justify"></span></a>
+    <a class="btn" href="#"><span class="glyphicon glyphicon-align-left"></span></a>
+    <a class="btn" href="#"><span class="glyphicon glyphicon-align-center"></span></a>
+    <a class="btn" href="#"><span class="glyphicon glyphicon-align-right"></span></a>
+    <a class="btn" href="#"><span class="glyphicon glyphicon-align-justify"></span></a>
   </div>
 </div>
 {% endhighlight %}
@@ -2119,63 +2119,63 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
           <h5>Dropdown in a button group</h5>
           <div class="bs-docs-example">
             <div class="btn-group">
-              <a class="btn btn-primary" href="#"><i class="glyphicon-user"></i> User</a>
+              <a class="btn btn-primary" href="#"><i class="glyphicon glyphicon-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="glyphicon-pencil"></i> Edit</a></li>
-                <li><a href="#"><i class="glyphicon-trash"></i> Delete</a></li>
-                <li><a href="#"><i class="glyphicon-ban-circle"></i> Ban</a></li>
+                <li><a href="#"><i class="glyphicon glyphicon-pencil"></i> Edit</a></li>
+                <li><a href="#"><i class="glyphicon glyphicon-trash"></i> Delete</a></li>
+                <li><a href="#"><i class="glyphicon glyphicon-ban-circle"></i> Ban</a></li>
                 <li class="divider"></li>
-                <li><a href="#"><i class="glyphicon-"></i> Make admin</a></li>
+                <li><a href="#"><i class="glyphicon glyphicon-"></i> Make admin</a></li>
               </ul>
             </div>
           </div><!-- /bs-docs-example -->
 {% highlight html linenos %}
 <div class="btn-group">
-  <a class="btn btn-primary" href="#"><span class="glyphicon-user"></span> User</a>
+  <a class="btn btn-primary" href="#"><span class="glyphicon glyphicon-user"></span> 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="#"><span class="glyphicon-pencil"></span> Edit</a></li>
-    <li><a href="#"><span class="glyphicon-trash"></span> Delete</a></li>
-    <li><a href="#"><span class="glyphicon-ban-circle"></span> Ban</a></li>
+    <li><a href="#"><span class="glyphicon glyphicon-pencil"></span> Edit</a></li>
+    <li><a href="#"><span class="glyphicon glyphicon-trash"></span> Delete</a></li>
+    <li><a href="#"><span class="glyphicon glyphicon-ban-circle"></span> Ban</a></li>
     <li class="divider"></li>
-    <li><a href="#"><span class="glyphicon-"></span> Make admin</a></li>
+    <li><a href="#"><span class="glyphicon glyphicon-"></span> Make admin</a></li>
   </ul>
 </div>
 {% endhighlight %}
 
           <h5>Large button</h5>
           <div class="bs-docs-example">
-            <a class="btn btn-large" href="#"><span class="glyphicon-star"></span> Star</a>
+            <a class="btn btn-large" href="#"><span class="glyphicon glyphicon-star"></span> Star</a>
           </div><!-- /bs-docs-example -->
 {% highlight html linenos %}
-<a class="btn btn-large" href="#"><span class="glyphicon-star"></span> Star</a>
+<a class="btn btn-large" href="#"><span class="glyphicon glyphicon-star"></span> Star</a>
 {% endhighlight %}
 
           <h5>Small button</h5>
           <div class="bs-docs-example">
-            <a class="btn btn-small" href="#"><span class="glyphicon-star"></span></a>
+            <a class="btn btn-small" href="#"><span class="glyphicon glyphicon-star"></span></a>
           </div><!-- /bs-docs-example -->
 {% highlight html linenos %}
-<a class="btn btn-small" href="#"><span class="glyphicon-star"></span></a>
+<a class="btn btn-small" href="#"><span class="glyphicon glyphicon-star"></span></a>
 {% endhighlight %}
 
 
           <h4>Navigation</h4>
           <div class="bs-docs-example">
             <ul class="nav nav-list">
-              <li class="active"><a href="#"><span class="glyphicon-home"></span> Home</a></li>
-              <li><a href="#"><span class="glyphicon-book"></span> Library</a></li>
-              <li><a href="#"><span class="glyphicon-pencil"></span> Applications</a></li>
-              <li><a href="#"><span class="glyphicon-"></span> Misc</a></li>
+              <li class="active"><a href="#"><span class="glyphicon glyphicon-home"></span> Home</a></li>
+              <li><a href="#"><span class="glyphicon glyphicon-book"></span> Library</a></li>
+              <li><a href="#"><span class="glyphicon glyphicon-pencil"></span> Applications</a></li>
+              <li><a href="#"><span class="glyphicon glyphicon-"></span> Misc</a></li>
             </ul>
           </div><!-- /bs-docs-example -->
 {% highlight html linenos %}
 <ul class="nav nav-list">
-  <li class="active"><a href="#"><span class="glyphicon-home"></span> Home</a></li>
-  <li><a href="#"><span class="glyphicon-book"></span> Library</a></li>
-  <li><a href="#"><span class="glyphicon-pencil"></span> Applications</a></li>
-  <li><a href="#"><span class="glyphicon-"></span> Misc</a></li>
+  <li class="active"><a href="#"><span class="glyphicon glyphicon-home"></span> Home</a></li>
+  <li><a href="#"><span class="glyphicon glyphicon-book"></span> Library</a></li>
+  <li><a href="#"><span class="glyphicon glyphicon-pencil"></span> Applications</a></li>
+  <li><a href="#"><span class="glyphicon glyphicon-"></span> Misc</a></li>
 </ul>
 {% endhighlight %}
 
@@ -2185,7 +2185,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
               <label class="control-label" for="inputIcon">Email address</label>
               <div class="controls">
                 <div class="input-group">
-                  <span class="input-group-addon"><span class="glyphicon-envelope"></span></span>
+                  <span class="input-group-addon"><span class="glyphicon glyphicon-envelope"></span></span>
                   <input class="span2" id="inputIcon" type="text">
                 </div>
               </div>
@@ -2196,7 +2196,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
   <label class="control-label" for="inputIcon">Email address</label>
   <div class="controls">
     <div class="input-group">
-      <span class="input-group-addon"><span class="glyphicon-envelope"></span></span>
+      <span class="input-group-addon"><span class="glyphicon glyphicon-envelope"></span></span>
       <input class="span2" id="inputIcon" type="text">
     </div>
   </div>

diff --git a/docs/customize.html b/docs/customize.html
index 4f3e7fe2db05f52014608ad1f3ce9a6919430a32..9a503ff8f40651997493999ead63bd6532263033 100644 (file)
--- a/docs/customize.html
+++ b/docs/customize.html
@@ -21,10 +21,10 @@ title: Customize and download
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav">
-          <li><a href="#components"><i class="glyphicon-chevron-right"></i> 1. Choose components</a></li>
-          <li><a href="#plugins"><i class="glyphicon-chevron-right"></i> 2. Select jQuery plugins</a></li>
-          <li><a href="#variables"><i class="glyphicon-chevron-right"></i> 3. Customize variables</a></li>
-          <li><a href="#download"><i class="glyphicon-chevron-right"></i> 4. Download</a></li>
+          <li><a href="#components"><i class="glyphicon glyphicon-chevron-right"></i> 1. Choose components</a></li>
+          <li><a href="#plugins"><i class="glyphicon glyphicon-chevron-right"></i> 2. Select jQuery plugins</a></li>
+          <li><a href="#variables"><i class="glyphicon glyphicon-chevron-right"></i> 3. Customize variables</a></li>
+          <li><a href="#download"><i class="glyphicon glyphicon-chevron-right"></i> 4. Download</a></li>
         </ul>
       </div>
       <div class="span9">

diff --git a/docs/getting-started.html b/docs/getting-started.html
index 9f63c5b4c644f85655a000f1990fa7a1f69dc802..08a51ee103ce3d438cad78e3f1508aadc46b15cc 100644 (file)
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -21,12 +21,12 @@ description: Overview of the project, its contents, and how to get started with
   <div class="row">
     <div class="span3 bs-docs-sidebar">
       <ul class="nav nav-list bs-docs-sidenav">
-        <li><a href="#download-bootstrap"><i class="glyphicon-chevron-right"></i> Download</a></li>
-        <li><a href="#file-structure"><i class="glyphicon-chevron-right"></i> File structure</a></li>
-        <li><a href="#contents"><i class="glyphicon-chevron-right"></i> What's included</a></li>
-        <li><a href="#html-template"><i class="glyphicon-chevron-right"></i> HTML template</a></li>
-        <li><a href="#examples"><i class="glyphicon-chevron-right"></i> Examples</a></li>
-        <li><a href="#what-next"><i class="glyphicon-chevron-right"></i> What next?</a></li>
+        <li><a href="#download-bootstrap"><i class="glyphicon glyphicon-chevron-right"></i> Download</a></li>
+        <li><a href="#file-structure"><i class="glyphicon glyphicon-chevron-right"></i> File structure</a></li>
+        <li><a href="#contents"><i class="glyphicon glyphicon-chevron-right"></i> What's included</a></li>
+        <li><a href="#html-template"><i class="glyphicon glyphicon-chevron-right"></i> HTML template</a></li>
+        <li><a href="#examples"><i class="glyphicon glyphicon-chevron-right"></i> Examples</a></li>
+        <li><a href="#what-next"><i class="glyphicon glyphicon-chevron-right"></i> What next?</a></li>
       </ul>
     </div>
     <div class="span9">

diff --git a/docs/javascript.html b/docs/javascript.html
index 3306392671c83472ce8f08e3256eabf28f9c86c9..0b3fc3e423ac27091d2101a58cbc5331579bd50e 100644 (file)
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -19,20 +19,20 @@ title: JavaScript plugins
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav">
-          <li><a href="#overview"><i class="glyphicon-chevron-right"></i> Overview</a></li>
-          <li><a href="#transitions"><i class="glyphicon-chevron-right"></i> Transitions</a></li>
-          <li><a href="#modals"><i class="glyphicon-chevron-right"></i> Modal</a></li>
-          <li><a href="#dropdowns"><i class="glyphicon-chevron-right"></i> Dropdown</a></li>
-          <li><a href="#scrollspy"><i class="glyphicon-chevron-right"></i> Scrollspy</a></li>
-          <li><a href="#tabs"><i class="glyphicon-chevron-right"></i> Tab</a></li>
-          <li><a href="#tooltips"><i class="glyphicon-chevron-right"></i> Tooltip</a></li>
-          <li><a href="#popovers"><i class="glyphicon-chevron-right"></i> Popover</a></li>
-          <li><a href="#alerts"><i class="glyphicon-chevron-right"></i> Alert</a></li>
-          <li><a href="#buttons"><i class="glyphicon-chevron-right"></i> Button</a></li>
-          <li><a href="#collapse"><i class="glyphicon-chevron-right"></i> Collapse</a></li>
-          <li><a href="#carousel"><i class="glyphicon-chevron-right"></i> Carousel</a></li>
-          <li><a href="#typeahead"><i class="glyphicon-chevron-right"></i> Typeahead</a></li>
-          <li><a href="#affix"><i class="glyphicon-chevron-right"></i> Affix</a></li>
+          <li><a href="#overview"><i class="glyphicon glyphicon-chevron-right"></i> Overview</a></li>
+          <li><a href="#transitions"><i class="glyphicon glyphicon-chevron-right"></i> Transitions</a></li>
+          <li><a href="#modals"><i class="glyphicon glyphicon-chevron-right"></i> Modal</a></li>
+          <li><a href="#dropdowns"><i class="glyphicon glyphicon-chevron-right"></i> Dropdown</a></li>
+          <li><a href="#scrollspy"><i class="glyphicon glyphicon-chevron-right"></i> Scrollspy</a></li>
+          <li><a href="#tabs"><i class="glyphicon glyphicon-chevron-right"></i> Tab</a></li>
+          <li><a href="#tooltips"><i class="glyphicon glyphicon-chevron-right"></i> Tooltip</a></li>
+          <li><a href="#popovers"><i class="glyphicon glyphicon-chevron-right"></i> Popover</a></li>
+          <li><a href="#alerts"><i class="glyphicon glyphicon-chevron-right"></i> Alert</a></li>
+          <li><a href="#buttons"><i class="glyphicon glyphicon-chevron-right"></i> Button</a></li>
+          <li><a href="#collapse"><i class="glyphicon glyphicon-chevron-right"></i> Collapse</a></li>
+          <li><a href="#carousel"><i class="glyphicon glyphicon-chevron-right"></i> Carousel</a></li>
+          <li><a href="#typeahead"><i class="glyphicon glyphicon-chevron-right"></i> Typeahead</a></li>
+          <li><a href="#affix"><i class="glyphicon glyphicon-chevron-right"></i> Affix</a></li>
         </ul>
       </div>
       <div class="span9">
@@ -1491,10 +1491,10 @@ $('#myCollapsible').on('hidden', function () {
                   </div>
                 </div>
                 <a class="left carousel-control" href="#myCarousel" data-slide="prev">
-                  <span class="glyphicon-chevron-left"></span>
+                  <span class="glyphicon glyphicon-chevron-left"></span>
                 </a>
                 <a class="right carousel-control" href="#myCarousel" data-slide="next">
-                  <span class="glyphicon-chevron-right"></span>
+                  <span class="glyphicon glyphicon-chevron-right"></span>
                 </a>
               </div>
             </div><!-- /example -->

diff --git a/less/glyphicons.less b/less/glyphicons.less
index bfe481734c9945107c6cfbc2dfb43b15b38f8c96..6bdae2047202387e80f5d1ee9008f38bf6df9de1 100644 (file)
--- a/less/glyphicons.less
+++ b/less/glyphicons.less
@@ -11,9 +11,9 @@
 // Basic usage
 //
 // Since icons are fonts, they can be placed anywhere text is placed. To use,
-// create an inline element with the appropriate class, like so:
+// create an inline element with the appropriate classes, like so:
 //
-// <a href="#"><span class="glyphicon-star"></span> Star</a>
+// <a href="#"><span class="glyphicon glyphicon-star"></span> Star</a>
 //
 // Use them in links, buttons, headings, and more.
 
@@ -31,7 +31,7 @@
 }
 
 // Catchall baseclass
-[class^="glyphicon-"]:before {
+.glyphicon:before {
   font-family: 'Glyphicons Halflings';
   font-style: normal;
   line-height: 1;

diff --git a/less/tests/buttons.html b/less/tests/buttons.html
index 5025655f8b8d77a45cd2dc6c69f2721e21680720..f73877b058f178f652ad279608c9a626408d5c64 100644 (file)
--- a/less/tests/buttons.html
+++ b/less/tests/buttons.html
@@ -40,13 +40,13 @@
           Profile
         </button>
         <button class="btn btn-large" type="button">
-          <span class="glyphicon-user"></span> Profile
+          <span class="glyphicon glyphicon-user"></span> Profile
         </button>
         <button class="btn btn-large" type="button">
-          <span class="glyphicon-home"></span> Home
+          <span class="glyphicon glyphicon-home"></span> Home
         </button>
         <button class="btn btn-large" type="button">
-          <span class="glyphicon-link"></span> Link
+          <span class="glyphicon glyphicon-link"></span> Link
         </button>
       </p>
       <p>
@@ -54,13 +54,13 @@
           Profile
         </button>
         <button class="btn" type="button">
-          <span class="glyphicon-user"></span> Profile
+          <span class="glyphicon glyphicon-user"></span> Profile
         </button>
         <button class="btn" type="button">
-          <span class="glyphicon-home"></span> Home
+          <span class="glyphicon glyphicon-home"></span> Home
         </button>
         <button class="btn" type="button">
-          <span class="glyphicon-link"></span> Link
+          <span class="glyphicon glyphicon-link"></span> Link
         </button>
       </p>
       <p>
@@ -68,13 +68,13 @@
           Profile
         </button>
         <button class="btn btn-small" type="button">
-          <span class="glyphicon-user"></span> Profile
+          <span class="glyphicon glyphicon-user"></span> Profile
         </button>
         <button class="btn btn-small" type="button">
-          <span class="glyphicon-home"></span> Home
+          <span class="glyphicon glyphicon-home"></span> Home
         </button>
         <button class="btn btn-small" type="button">
-          <span class="glyphicon-link"></span> Link
+          <span class="glyphicon glyphicon-link"></span> Link
         </button>
       </p>
       <p>
@@ -82,22 +82,22 @@
           Profile
         </button>
         <button class="btn btn-mini" type="button">
-          <span class="glyphicon-user"></span> Profile
+          <span class="glyphicon glyphicon-user"></span> Profile
         </button>
         <button class="btn btn-mini" type="button">
-          <span class="glyphicon-home"></span> Home
+          <span class="glyphicon glyphicon-home"></span> Home
         </button>
         <button class="btn btn-mini" type="button">
-          <span class="glyphicon-link"></span> Link
+          <span class="glyphicon glyphicon-link"></span> Link
         </button>
       </p>
 
       <div class="btn-toolbar">
         <div class="btn-group">
-          <a class="btn" href="#"><i class="glyphicon-align-left"></i></a>
-          <a class="btn" href="#"><i class="glyphicon-align-center"></i></a>
-          <a class="btn" href="#"><i class="glyphicon-align-right"></i></a>
-          <a class="btn" href="#"><i class="glyphicon-align-justify"></i></a>
+          <a class="btn" href="#"><i class="glyphicon glyphicon-align-left"></i></a>
+          <a class="btn" href="#"><i class="glyphicon glyphicon-align-center"></i></a>
+          <a class="btn" href="#"><i class="glyphicon glyphicon-align-right"></i></a>
+          <a class="btn" href="#"><i class="glyphicon glyphicon-align-justify"></i></a>
         </div>
       </div>