Merge branch '3.0.0-wip' into bs3_homepage

Conflicts:
	customize.html
	examples/justified-nav/justified-nav.css

1 files changed, 410 insertions, 13 deletions

diff --git a/components.html b/components.html
index 147f05984..7475fa108 100644
--- a/components.html
+++ b/components.html
@@ -7,6 +7,292 @@ base_url: "../"
 ---
 
 
+<style>
+/* Icons
+-------------------------------------------------- */
+
+.bs-glyphicons {
+  padding-left: 0;
+  padding-bottom: 1px;
+  margin-bottom: 20px;
+  list-style: none;
+  overflow: hidden;
+}
+.bs-glyphicons li {
+  float: left;
+  width: 25%;
+  height: 115px;
+  padding: 10px;
+  margin: 0 -1px -1px 0;
+  font-size: 12px;
+  line-height: 1.4;
+  text-align: center;
+  border: 1px solid #ddd;
+}
+.bs-glyphicons .glyphicon {
+  display: block;
+  margin: 5px auto 10px;
+  font-size: 24px;
+}
+.bs-glyphicons li:hover {
+  background-color: rgba(86,61,124,.1);
+}
+
+@media (min-width: 768px) {
+  .bs-glyphicons li {
+    width: 12.5%;
+  }
+}
+</style>
+
+
+  <!-- Glyphicons
+  ================================================== -->
+  <div class="bs-docs-section">
+    <div class="page-header">
+      <h1 id="glyphicons">Glyphicons</h1>
+    </div>
+
+    <h2 id="glyphicons-glyphs">Available glyphs</h2>
+    <p>Includes 180 glyphs in font format from the Glyphicon Halflings set. <a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask that you to include a link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever possible.</p>
+    <ul class="bs-glyphicons">
+      <li><span class="glyphicon glyphicon-adjust"></span> .glyphicon .glyphicon-adjust</li>
+      <li><span class="glyphicon glyphicon-align-center"></span> .glyphicon .glyphicon-align-center</li>
+      <li><span class="glyphicon glyphicon-align-justify"></span> .glyphicon .glyphicon-align-justify</li>
+      <li><span class="glyphicon glyphicon-align-left"></span> .glyphicon .glyphicon-align-left</li>
+      <li><span class="glyphicon glyphicon-align-right"></span> .glyphicon .glyphicon-align-right</li>
+      <li><span class="glyphicon glyphicon-arrow-down"></span> .glyphicon .glyphicon-arrow-down</li>
+      <li><span class="glyphicon glyphicon-arrow-left"></span> .glyphicon .glyphicon-arrow-left</li>
+      <li><span class="glyphicon glyphicon-arrow-right"></span> .glyphicon .glyphicon-arrow-right</li>
+      <li><span class="glyphicon glyphicon-arrow-up"></span> .glyphicon .glyphicon-arrow-up</li>
+      <li><span class="glyphicon glyphicon-asterisk"></span> .glyphicon .glyphicon-asterisk</li>
+      <li><span class="glyphicon glyphicon-backward"></span> .glyphicon .glyphicon-backward</li>
+      <li><span class="glyphicon glyphicon-ban-circle"></span> .glyphicon .glyphicon-ban-circle</li>
+      <li><span class="glyphicon glyphicon-barcode"></span> .glyphicon .glyphicon-barcode</li>
+      <li><span class="glyphicon glyphicon-bell"></span> .glyphicon .glyphicon-bell</li>
+      <li><span class="glyphicon glyphicon-bold"></span> .glyphicon .glyphicon-bold</li>
+      <li><span class="glyphicon glyphicon-book"></span> .glyphicon .glyphicon-book</li>
+      <li><span class="glyphicon glyphicon-bookmark"></span> .glyphicon .glyphicon-bookmark</li>
+      <li><span class="glyphicon glyphicon-briefcase"></span> .glyphicon .glyphicon-briefcase</li>
+      <li><span class="glyphicon glyphicon-bullhorn"></span> .glyphicon .glyphicon-bullhorn</li>
+      <li><span class="glyphicon glyphicon-calendar"></span> .glyphicon .glyphicon-calendar</li>
+      <li><span class="glyphicon glyphicon-camera"></span> .glyphicon .glyphicon-camera</li>
+      <li><span class="glyphicon glyphicon-certificate"></span> .glyphicon .glyphicon-certificate</li>
+      <li><span class="glyphicon glyphicon-check"></span> .glyphicon .glyphicon-check</li>
+      <li><span class="glyphicon glyphicon-chevron-down"></span> .glyphicon .glyphicon-chevron-down</li>
+      <li><span class="glyphicon glyphicon-chevron-left"></span> .glyphicon .glyphicon-chevron-left</li>
+      <li><span class="glyphicon glyphicon-chevron-right"></span> .glyphicon .glyphicon-chevron-right</li>
+      <li><span class="glyphicon glyphicon-chevron-up"></span> .glyphicon .glyphicon-chevron-up</li>
+      <li><span class="glyphicon glyphicon-circle-arrow-down"></span> .glyphicon .glyphicon-circle-arrow-down</li>
+      <li><span class="glyphicon glyphicon-circle-arrow-left"></span> .glyphicon .glyphicon-circle-arrow-left</li>
+      <li><span class="glyphicon glyphicon-circle-arrow-right"></span> .glyphicon .glyphicon-circle-arrow-right</li>
+      <li><span class="glyphicon glyphicon-circle-arrow-up"></span> .glyphicon .glyphicon-circle-arrow-up</li>
+      <li><span class="glyphicon glyphicon-cloud"></span> .glyphicon .glyphicon-cloud</li>
+      <li><span class="glyphicon glyphicon-cloud-download"></span> .glyphicon .glyphicon-cloud-download</li>
+      <li><span class="glyphicon glyphicon-cloud-upload"></span> .glyphicon .glyphicon-cloud-upload</li>
+      <li><span class="glyphicon glyphicon-cog"></span> .glyphicon .glyphicon-cog</li>
+      <li><span class="glyphicon glyphicon-collapse-down"></span> .glyphicon .glyphicon-collapse-down</li>
+      <li><span class="glyphicon glyphicon-collapse-up"></span> .glyphicon .glyphicon-collapse-up</li>
+      <li><span class="glyphicon glyphicon-comment"></span> .glyphicon .glyphicon-comment</li>
+      <li><span class="glyphicon glyphicon-compressed"></span> .glyphicon .glyphicon-compressed</li>
+      <li><span class="glyphicon glyphicon-copyright-mark"></span> .glyphicon .glyphicon-copyright-mark</li>
+      <li><span class="glyphicon glyphicon-credit-card"></span> .glyphicon .glyphicon-credit-card</li>
+      <li><span class="glyphicon glyphicon-cutlery"></span> .glyphicon .glyphicon-cutlery</li>
+      <li><span class="glyphicon glyphicon-dashboard"></span> .glyphicon .glyphicon-dashboard</li>
+      <li><span class="glyphicon glyphicon-download"></span> .glyphicon .glyphicon-download</li>
+      <li><span class="glyphicon glyphicon-download-alt"></span> .glyphicon .glyphicon-download-alt</li>
+      <li><span class="glyphicon glyphicon-earphone"></span> .glyphicon .glyphicon-earphone</li>
+      <li><span class="glyphicon glyphicon-edit"></span> .glyphicon .glyphicon-edit</li>
+      <li><span class="glyphicon glyphicon-eject"></span> .glyphicon .glyphicon-eject</li>
+      <li><span class="glyphicon glyphicon-envelope"></span> .glyphicon .glyphicon-envelope</li>
+      <li><span class="glyphicon glyphicon-euro"></span> .glyphicon .glyphicon-euro</li>
+      <li><span class="glyphicon glyphicon-exclamation-sign"></span> .glyphicon .glyphicon-exclamation-sign</li>
+      <li><span class="glyphicon glyphicon-expand"></span> .glyphicon .glyphicon-expand</li>
+      <li><span class="glyphicon glyphicon-export"></span> .glyphicon .glyphicon-export</li>
+      <li><span class="glyphicon glyphicon-eye-close"></span> .glyphicon .glyphicon-eye-close</li>
+      <li><span class="glyphicon glyphicon-eye-open"></span> .glyphicon .glyphicon-eye-open</li>
+      <li><span class="glyphicon glyphicon-facetime-video"></span> .glyphicon .glyphicon-facetime-video</li>
+      <li><span class="glyphicon glyphicon-fast-backward"></span> .glyphicon .glyphicon-fast-backward</li>
+      <li><span class="glyphicon glyphicon-fast-forward"></span> .glyphicon .glyphicon-fast-forward</li>
+      <li><span class="glyphicon glyphicon-file"></span> .glyphicon .glyphicon-file</li>
+      <li><span class="glyphicon glyphicon-film"></span> .glyphicon .glyphicon-film</li>
+      <li><span class="glyphicon glyphicon-filter"></span> .glyphicon .glyphicon-filter</li>
+      <li><span class="glyphicon glyphicon-fire"></span> .glyphicon .glyphicon-fire</li>
+      <li><span class="glyphicon glyphicon-flag"></span> .glyphicon .glyphicon-flag</li>
+      <li><span class="glyphicon glyphicon-flash"></span> .glyphicon .glyphicon-flash</li>
+      <li><span class="glyphicon glyphicon-floppy-disk"></span> .glyphicon .glyphicon-floppy-disk</li>
+      <li><span class="glyphicon glyphicon-floppy-open"></span> .glyphicon .glyphicon-floppy-open</li>
+      <li><span class="glyphicon glyphicon-floppy-remove"></span> .glyphicon .glyphicon-floppy-remove</li>
+      <li><span class="glyphicon glyphicon-floppy-save"></span> .glyphicon .glyphicon-floppy-save</li>
+      <li><span class="glyphicon glyphicon-floppy-saved"></span> .glyphicon .glyphicon-floppy-saved</li>
+      <li><span class="glyphicon glyphicon-folder-close"></span> .glyphicon .glyphicon-folder-close</li>
+      <li><span class="glyphicon glyphicon-folder-open"></span> .glyphicon .glyphicon-folder-open</li>
+      <li><span class="glyphicon glyphicon-font"></span> .glyphicon .glyphicon-font</li>
+      <li><span class="glyphicon glyphicon-forward"></span> .glyphicon .glyphicon-forward</li>
+      <li><span class="glyphicon glyphicon-fullscreen"></span> .glyphicon .glyphicon-fullscreen</li>
+      <li><span class="glyphicon glyphicon-gbp"></span> .glyphicon .glyphicon-gbp</li>
+      <li><span class="glyphicon glyphicon-gift"></span> .glyphicon .glyphicon-gift</li>
+      <li><span class="glyphicon glyphicon-glass"></span> .glyphicon .glyphicon-glass</li>
+      <li><span class="glyphicon glyphicon-globe"></span> .glyphicon .glyphicon-globe</li>
+      <li><span class="glyphicon glyphicon-hand-down"></span> .glyphicon .glyphicon-hand-down</li>
+      <li><span class="glyphicon glyphicon-hand-left"></span> .glyphicon .glyphicon-hand-left</li>
+      <li><span class="glyphicon glyphicon-hand-right"></span> .glyphicon .glyphicon-hand-right</li>
+      <li><span class="glyphicon glyphicon-hand-up"></span> .glyphicon .glyphicon-hand-up</li>
+      <li><span class="glyphicon glyphicon-hd-video"></span> .glyphicon .glyphicon-hd-video</li>
+      <li><span class="glyphicon glyphicon-hdd"></span> .glyphicon .glyphicon-hdd</li>
+      <li><span class="glyphicon glyphicon-header"></span> .glyphicon .glyphicon-header</li>
+      <li><span class="glyphicon glyphicon-headphones"></span> .glyphicon .glyphicon-headphones</li>
+      <li><span class="glyphicon glyphicon-heart"></span> .glyphicon .glyphicon-heart</li>
+      <li><span class="glyphicon glyphicon-heart-empty"></span> .glyphicon .glyphicon-heart-empty</li>
+      <li><span class="glyphicon glyphicon-home"></span> .glyphicon .glyphicon-home</li>
+      <li><span class="glyphicon glyphicon-import"></span> .glyphicon .glyphicon-import</li>
+      <li><span class="glyphicon glyphicon-inbox"></span> .glyphicon .glyphicon-inbox</li>
+      <li><span class="glyphicon glyphicon-indent-left"></span> .glyphicon .glyphicon-indent-left</li>
+      <li><span class="glyphicon glyphicon-indent-right"></span> .glyphicon .glyphicon-indent-right</li>
+      <li><span class="glyphicon glyphicon-info-sign"></span> .glyphicon .glyphicon-info-sign</li>
+      <li><span class="glyphicon glyphicon-italic"></span> .glyphicon .glyphicon-italic</li>
+      <li><span class="glyphicon glyphicon-leaf"></span> .glyphicon .glyphicon-leaf</li>
+      <li><span class="glyphicon glyphicon-link"></span> .glyphicon .glyphicon-link</li>
+      <li><span class="glyphicon glyphicon-list"></span> .glyphicon .glyphicon-list</li>
+      <li><span class="glyphicon glyphicon-list-alt"></span> .glyphicon .glyphicon-list-alt</li>
+      <li><span class="glyphicon glyphicon-lock"></span> .glyphicon .glyphicon-lock</li>
+      <li><span class="glyphicon glyphicon-log-in"></span> .glyphicon .glyphicon-log-in</li>
+      <li><span class="glyphicon glyphicon-log-out"></span> .glyphicon .glyphicon-log-out</li>
+      <li><span class="glyphicon glyphicon-magnet"></span> .glyphicon .glyphicon-magnet</li>
+      <li><span class="glyphicon glyphicon-map-marker"></span> .glyphicon .glyphicon-map-marker</li>
+      <li><span class="glyphicon glyphicon-minus"></span> .glyphicon .glyphicon-minus</li>
+      <li><span class="glyphicon glyphicon-minus-sign"></span> .glyphicon .glyphicon-minus-sign</li>
+      <li><span class="glyphicon glyphicon-move"></span> .glyphicon .glyphicon-move</li>
+      <li><span class="glyphicon glyphicon-music"></span> .glyphicon .glyphicon-music</li>
+      <li><span class="glyphicon glyphicon-new-window"></span> .glyphicon .glyphicon-new-window</li>
+      <li><span class="glyphicon glyphicon-off"></span> .glyphicon .glyphicon-off</li>
+      <li><span class="glyphicon glyphicon-ok"></span> .glyphicon .glyphicon-ok</li>
+      <li><span class="glyphicon glyphicon-ok-circle"></span> .glyphicon .glyphicon-ok-circle</li>
+      <li><span class="glyphicon glyphicon-ok-sign"></span> .glyphicon .glyphicon-ok-sign</li>
+      <li><span class="glyphicon glyphicon-open"></span> .glyphicon .glyphicon-open</li>
+      <li><span class="glyphicon glyphicon-paperclip"></span> .glyphicon .glyphicon-paperclip</li>
+      <li><span class="glyphicon glyphicon-pause"></span> .glyphicon .glyphicon-pause</li>
+      <li><span class="glyphicon glyphicon-pencil"></span> .glyphicon .glyphicon-pencil</li>
+      <li><span class="glyphicon glyphicon-phone"></span> .glyphicon .glyphicon-phone</li>
+      <li><span class="glyphicon glyphicon-phone-alt"></span> .glyphicon .glyphicon-phone-alt</li>
+      <li><span class="glyphicon glyphicon-picture"></span> .glyphicon .glyphicon-picture</li>
+      <li><span class="glyphicon glyphicon-plane"></span> .glyphicon .glyphicon-plane</li>
+      <li><span class="glyphicon glyphicon-play"></span> .glyphicon .glyphicon-play</li>
+      <li><span class="glyphicon glyphicon-play-circle"></span> .glyphicon .glyphicon-play-circle</li>
+      <li><span class="glyphicon glyphicon-plus"></span> .glyphicon .glyphicon-plus</li>
+      <li><span class="glyphicon glyphicon-plus-sign"></span> .glyphicon .glyphicon-plus-sign</li>
+      <li><span class="glyphicon glyphicon-print"></span> .glyphicon .glyphicon-print</li>
+      <li><span class="glyphicon glyphicon-pushpin"></span> .glyphicon .glyphicon-pushpin</li>
+      <li><span class="glyphicon glyphicon-qrcode"></span> .glyphicon .glyphicon-qrcode</li>
+      <li><span class="glyphicon glyphicon-question-sign"></span> .glyphicon .glyphicon-question-sign</li>
+      <li><span class="glyphicon glyphicon-random"></span> .glyphicon .glyphicon-random</li>
+      <li><span class="glyphicon glyphicon-record"></span> .glyphicon .glyphicon-record</li>
+      <li><span class="glyphicon glyphicon-refresh"></span> .glyphicon .glyphicon-refresh</li>
+      <li><span class="glyphicon glyphicon-registration-mark"></span> .glyphicon .glyphicon-registration-mark</li>
+      <li><span class="glyphicon glyphicon-remove"></span> .glyphicon .glyphicon-remove</li>
+      <li><span class="glyphicon glyphicon-remove-circle"></span> .glyphicon .glyphicon-remove-circle</li>
+      <li><span class="glyphicon glyphicon-remove-sign"></span> .glyphicon .glyphicon-remove-sign</li>
+      <li><span class="glyphicon glyphicon-repeat"></span> .glyphicon .glyphicon-repeat</li>
+      <li><span class="glyphicon glyphicon-resize-full"></span> .glyphicon .glyphicon-resize-full</li>
+      <li><span class="glyphicon glyphicon-resize-horizontal"></span> .glyphicon .glyphicon-resize-horizontal</li>
+      <li><span class="glyphicon glyphicon-resize-small"></span> .glyphicon .glyphicon-resize-small</li>
+      <li><span class="glyphicon glyphicon-resize-vertical"></span> .glyphicon .glyphicon-resize-vertical</li>
+      <li><span class="glyphicon glyphicon-retweet"></span> .glyphicon .glyphicon-retweet</li>
+      <li><span class="glyphicon glyphicon-road"></span> .glyphicon .glyphicon-road</li>
+      <li><span class="glyphicon glyphicon-save"></span> .glyphicon .glyphicon-save</li>
+      <li><span class="glyphicon glyphicon-saved"></span> .glyphicon .glyphicon-saved</li>
+      <li><span class="glyphicon glyphicon-screenshot"></span> .glyphicon .glyphicon-screenshot</li>
+      <li><span class="glyphicon glyphicon-sd-video"></span> .glyphicon .glyphicon-sd-video</li>
+      <li><span class="glyphicon glyphicon-search"></span> .glyphicon .glyphicon-search</li>
+      <li><span class="glyphicon glyphicon-send"></span> .glyphicon .glyphicon-send</li>
+      <li><span class="glyphicon glyphicon-share"></span> .glyphicon .glyphicon-share</li>
+      <li><span class="glyphicon glyphicon-share-alt"></span> .glyphicon .glyphicon-share-alt</li>
+      <li><span class="glyphicon glyphicon-shopping-cart"></span> .glyphicon .glyphicon-shopping-cart</li>
+      <li><span class="glyphicon glyphicon-signal"></span> .glyphicon .glyphicon-signal</li>
+      <li><span class="glyphicon glyphicon-sort"></span> .glyphicon .glyphicon-sort</li>
+      <li><span class="glyphicon glyphicon-sort-by-alphabet"></span> .glyphicon .glyphicon-sort-by-alphabet</li>
+      <li><span class="glyphicon glyphicon-sort-by-alphabet-alt"></span> .glyphicon .glyphicon-sort-by-alphabet-alt</li>
+      <li><span class="glyphicon glyphicon-sort-by-attributes"></span> .glyphicon .glyphicon-sort-by-attributes</li>
+      <li><span class="glyphicon glyphicon-sort-by-attributes-alt"></span> .glyphicon .glyphicon-sort-by-attributes-alt</li>
+      <li><span class="glyphicon glyphicon-sort-by-order"></span> .glyphicon .glyphicon-sort-by-order</li>
+      <li><span class="glyphicon glyphicon-sort-by-order-alt"></span> .glyphicon .glyphicon-sort-by-order-alt</li>
+      <li><span class="glyphicon glyphicon-sound-5-1"></span> .glyphicon .glyphicon-sound-5-1</li>
+      <li><span class="glyphicon glyphicon-sound-6-1"></span> .glyphicon .glyphicon-sound-6-1</li>
+      <li><span class="glyphicon glyphicon-sound-7-1"></span> .glyphicon .glyphicon-sound-7-1</li>
+      <li><span class="glyphicon glyphicon-sound-dolby"></span> .glyphicon .glyphicon-sound-dolby</li>
+      <li><span class="glyphicon glyphicon-sound-stereo"></span> .glyphicon .glyphicon-sound-stereo</li>
+      <li><span class="glyphicon glyphicon-star"></span> .glyphicon .glyphicon-star</li>
+      <li><span class="glyphicon glyphicon-star-empty"></span> .glyphicon .glyphicon-star-empty</li>
+      <li><span class="glyphicon glyphicon-stats"></span> .glyphicon .glyphicon-stats</li>
+      <li><span class="glyphicon glyphicon-step-backward"></span> .glyphicon .glyphicon-step-backward</li>
+      <li><span class="glyphicon glyphicon-step-forward"></span> .glyphicon .glyphicon-step-forward</li>
+      <li><span class="glyphicon glyphicon-stop"></span> .glyphicon .glyphicon-stop</li>
+      <li><span class="glyphicon glyphicon-subtitles"></span> .glyphicon .glyphicon-subtitles</li>
+      <li><span class="glyphicon glyphicon-tag"></span> .glyphicon .glyphicon-tag</li>
+      <li><span class="glyphicon glyphicon-tags"></span> .glyphicon .glyphicon-tags</li>
+      <li><span class="glyphicon glyphicon-tasks"></span> .glyphicon .glyphicon-tasks</li>
+      <li><span class="glyphicon glyphicon-text-height"></span> .glyphicon .glyphicon-text-height</li>
+      <li><span class="glyphicon glyphicon-text-width"></span> .glyphicon .glyphicon-text-width</li>
+      <li><span class="glyphicon glyphicon-th"></span> .glyphicon .glyphicon-th</li>
+      <li><span class="glyphicon glyphicon-th-large"></span> .glyphicon .glyphicon-th-large</li>
+      <li><span class="glyphicon glyphicon-th-list"></span> .glyphicon .glyphicon-th-list</li>
+      <li><span class="glyphicon glyphicon-thumbs-down"></span> .glyphicon .glyphicon-thumbs-down</li>
+      <li><span class="glyphicon glyphicon-thumbs-up"></span> .glyphicon .glyphicon-thumbs-up</li>
+      <li><span class="glyphicon glyphicon-time"></span> .glyphicon .glyphicon-time</li>
+      <li><span class="glyphicon glyphicon-tint"></span> .glyphicon .glyphicon-tint</li>
+      <li><span class="glyphicon glyphicon-tower"></span> .glyphicon .glyphicon-tower</li>
+      <li><span class="glyphicon glyphicon-transfer"></span> .glyphicon .glyphicon-transfer</li>
+      <li><span class="glyphicon glyphicon-trash"></span> .glyphicon .glyphicon-trash</li>
+      <li><span class="glyphicon glyphicon-tree-conifer"></span> .glyphicon .glyphicon-tree-conifer</li>
+      <li><span class="glyphicon glyphicon-tree-deciduous"></span> .glyphicon .glyphicon-tree-deciduous</li>
+      <li><span class="glyphicon glyphicon-unchecked"></span> .glyphicon .glyphicon-unchecked</li>
+      <li><span class="glyphicon glyphicon-upload"></span> .glyphicon .glyphicon-upload</li>
+      <li><span class="glyphicon glyphicon-usd"></span> .glyphicon .glyphicon-usd</li>
+      <li><span class="glyphicon glyphicon-user"></span> .glyphicon .glyphicon-user</li>
+      <li><span class="glyphicon glyphicon-volume-down"></span> .glyphicon .glyphicon-volume-down</li>
+      <li><span class="glyphicon glyphicon-volume-off"></span> .glyphicon .glyphicon-volume-off</li>
+      <li><span class="glyphicon glyphicon-volume-up"></span> .glyphicon .glyphicon-volume-up</li>
+      <li><span class="glyphicon glyphicon-warning-sign"></span> .glyphicon .glyphicon-warning-sign</li>
+      <li><span class="glyphicon glyphicon-wrench"></span> .glyphicon .glyphicon-wrench</li>
+      <li><span class="glyphicon glyphicon-zoom-in"></span> .glyphicon .glyphicon-zoom-in</li>
+      <li><span class="glyphicon glyphicon-zoom-out"></span> .glyphicon .glyphicon-zoom-out</li>
+    </ul>
+
+
+    <h2 id="glyphicons-how-to-use">How to use</h2>
+    <p>For performance reasons, all icons require a base class and individual icon class. To use, place the following code just about anywhere. Be sure to leave a space between the icon and text for proper padding.</p>
+{% highlight html %}
+<span class="glyphicon glyphicon-search"></span>
+{% endhighlight %}
+
+
+    <h2 id="glyphicons-examples">Examples</h2>
+    <p>Use them in buttons, button groups for a toolbar, navigation, or prepended form inputs.</p>
+    <div class="bs-example">
+      <div class="btn-toolbar">
+        <div class="btn-group">
+          <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-left"></span></button>
+          <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-center"></span></button>
+          <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-right"></span></button>
+          <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-justify"></span></button>
+        </div>
+      </div>
+      <div class="btn-toolbar">
+        <button type="button" class="btn btn-default btn-lg"><span class="glyphicon glyphicon-star"></span> Star</button>
+        <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-star"></span> Star</button>
+        <button type="button" class="btn btn-default btn-sm"><span class="glyphicon glyphicon-star"></span> Star</button>
+        <button type="button" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-star"></span> Star</button>
+      </div>
+    </div>
+{% highlight html %}
+<button type="button" class="btn btn-default btn-lg">
+  <span class="glyphicon glyphicon-star"></span> Star
+</a>
+{% endhighlight %}
+
+  </div>
+
+
   <!-- Dropdowns
   ================================================== -->
   <div class="bs-docs-section">
@@ -1041,7 +1327,7 @@ base_url: "../"
 
     <h3>Tabs with dropdowns</h3>
     <div class="bs-example">
-      <nav class="navbar" role="navigation">
+      <nav class="navbar navbar-default" role="navigation">
         <ul class="nav nav-tabs">
           <li class="active"><a href="#">Home</a></li>
           <li><a href="#">Help</a></li>
@@ -1129,7 +1415,7 @@ base_url: "../"
     </div>
 
     <div class="bs-example">
-      <nav class="navbar" role="navigation">
+      <nav class="navbar navbar-default" role="navigation">
         <!-- Brand and toggle get grouped for better mobile display -->
         <div class="navbar-header">
           <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
@@ -1179,7 +1465,7 @@ base_url: "../"
       </nav>
     </div>
 {% highlight html %}
-<nav class="navbar" role="navigation">
+<nav class="navbar navbar-default" role="navigation">
   <!-- Brand and toggle get grouped for better mobile display -->
   <div class="navbar-header">
     <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
@@ -1243,7 +1529,7 @@ base_url: "../"
     <h2 id="navbar-buttons">Buttons</h2>
     <p>For buttons not residing in a <code>&lt;form&gt;</code>, add this class to vertically center buttons within a navbar.</p>
     <div class="bs-example">
-      <nav class="navbar" role="navigation">
+      <nav class="navbar navbar-default" role="navigation">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex2-collapse">
             <span class="sr-only">Toggle navigation</span>
@@ -1266,7 +1552,7 @@ base_url: "../"
     <h2 id="navbar-text">Text</h2>
     <p>Wrap strings of text in an element with <code>.navbar-text</code>, usually on a <code>&lt;p&gt;</code> tag for proper leading and color.</p>
     <div class="bs-example">
-      <nav class="navbar" role="navigation">
+      <nav class="navbar navbar-default" role="navigation">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex3-collapse">
             <span class="sr-only">Toggle navigation</span>
@@ -1289,7 +1575,7 @@ base_url: "../"
     <h2 id="navbar-links">Non-nav links</h2>
     <p>For folks using standard links that are not within the regular navbar navigation component, use the <code>.navbar-link</code> class to add the proper colors for the default and inverse navbar options.</p>
     <div class="bs-example">
-      <nav class="navbar" role="navigation">
+      <nav class="navbar navbar-default" role="navigation">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex4-collapse">
             <span class="sr-only">Toggle navigation</span>
@@ -1317,7 +1603,7 @@ base_url: "../"
     <h2 id="navbar-fixed-top">Fixed to top</h2>
     <p>Add <code>.navbar-fixed-top</code>.</p>
     <div class="bs-example bs-navbar-top-example">
-      <nav class="navbar navbar-fixed-top" role="navigation">
+      <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
         <!-- Brand and toggle get grouped for better mobile display -->
         <div class="navbar-header">
           <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex5-collapse">
@@ -1340,7 +1626,7 @@ base_url: "../"
       </nav>
     </div><!-- /example -->
 {% highlight html %}
-<nav class="navbar navbar-fixed-top" role="navigation">
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
   ...
 </nav>
 {% endhighlight %}
@@ -1358,7 +1644,7 @@ body { padding-top: 70px; }
     <h2 id="navbar-fixed-bottom">Fixed to bottom</h2>
     <p>Add <code>.navbar-fixed-bottom</code> instead.</p>
     <div class="bs-example bs-navbar-bottom-example">
-      <nav class="navbar navbar-fixed-bottom" role="navigation">
+      <nav class="navbar navbar-default navbar-fixed-bottom" role="navigation">
         <!-- Brand and toggle get grouped for better mobile display -->
         <div class="navbar-header">
           <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex6-collapse">
@@ -1381,7 +1667,7 @@ body { padding-top: 70px; }
       </nav>
     </div><!-- /example -->
 {% highlight html %}
-<nav class="navbar navbar-fixed-bottom" role="navigation">
+<nav class="navbar navbar-default navbar-fixed-bottom" role="navigation">
   ...
 </nav>
 {% endhighlight %}
@@ -1399,7 +1685,7 @@ body { padding-bottom: 70px; }
     <h2 id="navbar-static-top">Static top</h2>
     <p>Create a full-width navbar that scrolls away with the page by adding <code>.navbar-static-top</code>. Unlike the <code>.navbar-fixed-*</code> classes, you do not need to change any padding on the <code>body</code>.</p>
     <div class="bs-example bs-navbar-top-example">
-      <nav class="navbar navbar-static-top" role="navigation">
+      <nav class="navbar navbar-default navbar-static-top" role="navigation">
         <!-- Brand and toggle get grouped for better mobile display -->
         <div class="navbar-header">
           <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex7-collapse">
@@ -1422,7 +1708,7 @@ body { padding-bottom: 70px; }
       </nav>
     </div><!-- /example -->
 {% highlight html %}
-<nav class="navbar navbar-static-top" role="navigation">
+<nav class="navbar navbar-default navbar-static-top" role="navigation">
   ...
 </nav>
 {% endhighlight %}
@@ -2016,7 +2302,7 @@ body { padding-bottom: 70px; }
     </div>
 
     <h3 id="progress-basic">Basic example</h3>
-    <p>Default progress bar with a vertical gradient.</p>
+    <p>Default progress bar.</p>
     <div class="bs-example">
       <div class="progress">
         <div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%;"><span class="sr-only">60% Complete</span></div>
@@ -2508,6 +2794,117 @@ body { padding-bottom: 70px; }
 <div class="panel panel-danger">...</div>
 {% endhighlight %}
 
+    <h3 id="panels-tables">With tables</h3>
+    <p>Add any non-bordered <code>.table</code> within a panel for a seamless design. If there is a <code>.panel-body</code>, we add an extra border to the top of the table for separation.</p>
+    <div class="bs-example">
+      <div class="panel">
+        <!-- Default panel contents -->
+        <div class="panel-heading">Panel heading</div>
+        <div class="panel-body">
+          <p>Some default panel content here. Nulla vitae elit libero, a pharetra augue. Aenean lacinia bibendum nulla sed consectetur. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
+        </div>
+
+        <!-- Table -->
+        <table class="table">
+          <thead>
+            <tr>
+              <th>#</th>
+              <th>First Name</th>
+              <th>Last Name</th>
+              <th>Username</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td>1</td>
+              <td>Mark</td>
+              <td>Otto</td>
+              <td>@mdo</td>
+            </tr>
+            <tr>
+              <td>2</td>
+              <td>Jacob</td>
+              <td>Thornton</td>
+              <td>@fat</td>
+            </tr>
+            <tr>
+              <td>3</td>
+              <td>Larry</td>
+              <td>the Bird</td>
+              <td>@twitter</td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+{% highlight html %}
+<div class="panel">
+  <!-- Default panel contents -->
+  <div class="panel-heading">Panel heading</div>
+  <div class="panel-body">
+    <p>...</p>
+  </div>
+
+  <!-- Table -->
+  <table class="table">
+    ...
+  </table>
+</div>
+{% endhighlight %}
+
+    <p>If there is no panel body, the component moves from panel header to table without interruption.</p>
+    <div class="bs-example">
+      <div class="panel">
+        <!-- Default panel contents -->
+        <div class="panel-heading">Panel heading</div>
+
+        <!-- Table -->
+        <table class="table">
+          <thead>
+            <tr>
+              <th>#</th>
+              <th>First Name</th>
+              <th>Last Name</th>
+              <th>Username</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td>1</td>
+              <td>Mark</td>
+              <td>Otto</td>
+              <td>@mdo</td>
+            </tr>
+            <tr>
+              <td>2</td>
+              <td>Jacob</td>
+              <td>Thornton</td>
+              <td>@fat</td>
+            </tr>
+            <tr>
+              <td>3</td>
+              <td>Larry</td>
+              <td>the Bird</td>
+              <td>@twitter</td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+{% highlight html %}
+<div class="panel">
+  <!-- Default panel contents -->
+  <div class="panel-heading">Panel heading</div>
+
+  <!-- Table -->
+  <table class="table">
+    ...
+  </table>
+</div>
+{% endhighlight %}
+
+
+
     <h3 id="panels-list-group">With list groups</h3>
     <p>Easily include full-width <a href="#list-group">list groups</a> within any panel.</p>
     <div class="bs-example">