diff options
| author | Mark Otto <[email protected]> | 2014-12-14 16:28:53 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-12-14 16:28:53 -0800 |
| commit | b7be72c86c9b8b0289438f5e97a2263ecdb1344c (patch) | |
| tree | 2e9ab123c36c652175ca287a7f53b442224d7a20 /docs | |
| parent | c187f77e65d177c3a0e662b99d5bff63ee47b3db (diff) | |
| parent | c8855a7ad120b37fd9a25125f90093478656362f (diff) | |
| download | bootstrap-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')
| -rw-r--r-- | docs/_includes/components/glyphicons.html | 2 | ||||
| -rw-r--r-- | docs/_includes/css/less.html | 2 | ||||
| -rw-r--r-- | docs/_includes/getting-started/whats-included.html | 3 |
3 files changed, 4 insertions, 3 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 %} diff --git a/docs/_includes/css/less.html b/docs/_includes/css/less.html index 71cae072c..a75028651 100644 --- a/docs/_includes/css/less.html +++ b/docs/_includes/css/less.html @@ -42,7 +42,7 @@ </div> </div> {% highlight scss %} -@brand-primary: #428bca; +@brand-primary: darken(#428bca, 6.5%); // #337ab7 @brand-success: #5cb85c; @brand-info: #5bc0de; @brand-warning: #f0ad4e; diff --git a/docs/_includes/getting-started/whats-included.html b/docs/_includes/getting-started/whats-included.html index 42e2ea482..8aa8cf2a9 100644 --- a/docs/_includes/getting-started/whats-included.html +++ b/docs/_includes/getting-started/whats-included.html @@ -28,7 +28,8 @@ bootstrap/ ├── glyphicons-halflings-regular.eot ├── glyphicons-halflings-regular.svg ├── glyphicons-halflings-regular.ttf - └── glyphicons-halflings-regular.woff + ├── glyphicons-halflings-regular.woff + └── glyphicons-halflings-regular.woff2 {% endhighlight %} <!-- NOTE: This info is intentionally duplicated in the README. Copy any changes made here over to the README too. --> |