google
/
material-design-lite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #105 from sergejmueller/woff2 

Support for WOFF2
master
Addy Osmani 2014-06-20 10:41:32 +01:00
parent fc8368fd27 c4e3ead5f9
commit 9b88cc04aa
3 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/images/icons/icons.woff2 Normal file
View File

Binary file not shown.

1
app/styles/components/_components/_icons.scss
View File

@ -2,6 +2,7 @@
font-family:"icons";
src:url("../../images/icons/icons.eot");
src:url("../../images/icons/icons.eot?#iefix") format("embedded-opentype"),
url("../../images/icons/icons.woff2") format("woff2"),
url("../../images/icons/icons.woff") format("woff"),
url("../../images/icons/icons.ttf") format("truetype"),
url("../../images/icons/icons.svg?#icons") format("svg");

2
app/styles/components/components.css
View File

@ -545,7 +545,7 @@ pre {
@font-face {
font-family: "icons";
src: url("../../images/icons/icons.eot");
src: url("../../images/icons/icons.eot?#iefix") format("embedded-opentype"), url("../../images/icons/icons.woff") format("woff"), url("../../images/icons/icons.ttf") format("truetype"), url("../../images/icons/icons.svg?#icons") format("svg");
src: url("../../images/icons/icons.eot?#iefix") format("embedded-opentype"), url("../../images/icons/icons.woff2") format("woff2"), url("../../images/icons/icons.woff") format("woff"), url("../../images/icons/icons.ttf") format("truetype"), url("../../images/icons/icons.svg?#icons") format("svg");
font-weight: normal;
font-style: normal;
}