diff options
| -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 | ||||
| -rw-r--r-- | fonts/glyphicons-halflings-regular.woff2 | bin | 0 -> 18028 bytes | |||
| -rw-r--r-- | less/glyphicons.less | 1 | ||||
| -rw-r--r-- | less/variables.less | 2 |
6 files changed, 6 insertions, 4 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. --> diff --git a/fonts/glyphicons-halflings-regular.woff2 b/fonts/glyphicons-halflings-regular.woff2 Binary files differnew file mode 100644 index 000000000..64539b54c --- /dev/null +++ b/fonts/glyphicons-halflings-regular.woff2 diff --git a/less/glyphicons.less b/less/glyphicons.less index eaf9aa229..cb02f9945 100644 --- a/less/glyphicons.less +++ b/less/glyphicons.less @@ -12,6 +12,7 @@ font-family: 'Glyphicons Halflings'; src: url('@{icon-font-path}@{icon-font-name}.eot'); src: url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype'), + url('@{icon-font-path}@{icon-font-name}.woff2') format('woff2'), url('@{icon-font-path}@{icon-font-name}.woff') format('woff'), url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype'), url('@{icon-font-path}@{icon-font-name}.svg#@{icon-font-svg-id}') format('svg'); diff --git a/less/variables.less b/less/variables.less index b13be9d44..59747d536 100644 --- a/less/variables.less +++ b/less/variables.less @@ -14,7 +14,7 @@ @gray-light: lighten(@gray-base, 46.7%); // #777 @gray-lighter: lighten(@gray-base, 93.5%); // #eee -@brand-primary: darken(#428bca, 6.5%); +@brand-primary: darken(#428bca, 6.5%); // #337ab7 @brand-success: #5cb85c; @brand-info: #5bc0de; @brand-warning: #f0ad4e; |