aboutsummaryrefslogtreecommitdiff
path: root/docs/_includes/components
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-12-14 16:28:53 -0800
committerMark Otto <[email protected]>2014-12-14 16:28:53 -0800
commitb7be72c86c9b8b0289438f5e97a2263ecdb1344c (patch)
tree2e9ab123c36c652175ca287a7f53b442224d7a20 /docs/_includes/components
parentc187f77e65d177c3a0e662b99d5bff63ee47b3db (diff)
parentc8855a7ad120b37fd9a25125f90093478656362f (diff)
downloadbootstrap-b7be72c86c9b8b0289438f5e97a2263ecdb1344c.tar.xz
bootstrap-b7be72c86c9b8b0289438f5e97a2263ecdb1344c.zip
Merge pull request #15348 from bastienmoulia/master
Correction in the documentation, add the brand-primary true color in comment and woff2 glyphicons
Diffstat (limited to 'docs/_includes/components')
-rw-r--r--docs/_includes/components/glyphicons.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/_includes/components/glyphicons.html b/docs/_includes/components/glyphicons.html
index c00ef94c9..ed454110b 100644
--- a/docs/_includes/components/glyphicons.html
+++ b/docs/_includes/components/glyphicons.html
@@ -2,7 +2,7 @@
<h1 id="glyphicons" class="page-header">Glyphicons</h1>
<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 include a link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever possible.</p>
+ <p>Includes 260 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 include a link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever possible.</p>
<div class="bs-glyphicons">
<ul class="bs-glyphicons-list">
{% for iconClassName in site.data.glyphicons %}