From ec1a00a5945c82e66bf3e1be457b0f925f24f4bf Mon Sep 17 00:00:00 2001 From: Marc Lipovsky Date: Thu, 13 Nov 2014 19:09:18 -0800 Subject: [PATCH 1/2] Properly interpolate sass variable in string for icons font-face. --- sass/_icons-material-design.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sass/_icons-material-design.scss b/sass/_icons-material-design.scss index 000149cd..73232d9f 100644 --- a/sass/_icons-material-design.scss +++ b/sass/_icons-material-design.scss @@ -1,10 +1,10 @@ @font-face { font-family: "Material-Design-Icons"; - src:url("$material-font-path/Material-Design-Icons.eot?-g7cqhn"); - src:url("$material-font-path/Material-Design-Icons.eot?#iefix-g7cqhn") format("embedded-opentype"), - url("$material-font-path/Material-Design-Icons.woff?-g7cqhn") format("woff"), - url("$material-font-path/Material-Design-Icons.ttf?-g7cqhn") format("truetype"), - url("$material-font-path/Material-Design-Icons.svg?-g7cqhn#Material-Design-Icons") format("svg"); + src:url("#{$material-font-path}/Material-Design-Icons.eot?-g7cqhn"); + src:url("#{$material-font-path}/Material-Design-Icons.eot?#iefix-g7cqhn") format("embedded-opentype"), + url("#{$material-font-path}/Material-Design-Icons.woff?-g7cqhn") format("woff"), + url("#{$material-font-path}/Material-Design-Icons.ttf?-g7cqhn") format("truetype"), + url("#{$material-font-path}/Material-Design-Icons.svg?-g7cqhn#Material-Design-Icons") format("svg"); font-weight: normal; font-style: normal; } From 4e43decbe0faa9065423d03fcf5cc6d68d1e40fb Mon Sep 17 00:00:00 2001 From: Marc Lipovsky Date: Thu, 13 Nov 2014 19:09:46 -0800 Subject: [PATCH 2/2] Allow -font-path to be overridden. --- sass/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sass/_variables.scss b/sass/_variables.scss index da92ea75..c2f05abe 100644 --- a/sass/_variables.scss +++ b/sass/_variables.scss @@ -1,5 +1,5 @@ // material icons path -$material-font-path: "../fonts"; +$material-font-path: "../fonts" !default; // Material colors palette $red: #F44336 !default;