Merge branch 'master' into docs_derp

Conflicts:
	_layouts/default.html
	components.html

1 files changed, 10 insertions, 1 deletions

diff --git a/components.html b/components.html
index 660debeec..f93092c9c 100644
--- a/components.html
+++ b/components.html
@@ -17,7 +17,16 @@ base_url: "../"
     <h2 id="glyphicons-glyphs">Available glyphs</h2>
     <p>Includes 200 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>
 
-    {% include glyphicons.html %}
+    <div class="bs-glyphicons">
+      <ul class="bs-glyphicons-list">
+        {% for iconClassName in site.data.glyphicons %}
+          <li>
+            <span class="glyphicon {{ iconClassName }}"></span>
+            <span class="glyphicon-class">glyphicon {{ iconClassName }}</span>
+          </li>
+        {% endfor %}
+      </ul>
+    </div>
 
 
     <h2 id="glyphicons-how-to-use">How to use</h2>