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 /less | |
| 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 'less')
| -rw-r--r-- | less/glyphicons.less | 1 | ||||
| -rw-r--r-- | less/variables.less | 2 |
2 files changed, 2 insertions, 1 deletions
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; |