From 4171e4dd64215c41e1cabc0f9c59b0050ca34c82 Mon Sep 17 00:00:00 2001 From: wolfika Date: Thu, 8 Oct 2015 20:51:13 +0200 Subject: [PATCH] replace hard-coded font path in roboto.less The path for fonts were hard-coded into the roboto.less file. I imported the required _variable and _colors files into roboto.less, so that the variable containing the fonts path could be reached. fixes #697 --- less/roboto.less | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/less/roboto.less b/less/roboto.less index ed115588..25f91c2c 100644 --- a/less/roboto.less +++ b/less/roboto.less @@ -1,3 +1,6 @@ +@import "_variables.less"; +@import "_colors.less"; + @font-face { font-family: 'RobotoDraft'; font-style: normal; @@ -6,8 +9,8 @@ src: local('RobotoDraft'), local('RobotoDraft-Regular'), local('Roboto-Regular'), - url(../fonts/RobotoDraftRegular.woff2) format('woff2'), - url(../fonts/RobotoDraftRegular.woff) format('woff'); + url('@{material-font-path}/RobotoDraftRegular.woff2') format('woff2'), + url('@{material-font-path}/RobotoDraftRegular.woff') format('woff'); } @font-face { @@ -18,8 +21,8 @@ src: local('RobotoDraft Medium'), local('RobotoDraft-Medium'), local('Roboto-Medium'), - url(../fonts/RobotoDraftMedium.woff2) format('woff2'), - url(../fonts/RobotoDraftMedium.woff) format('woff'); + url('@{material-font-path}/RobotoDraftMedium.woff2') format('woff2'), + url('@{material-font-path}/RobotoDraftMedium.woff') format('woff'); } @font-face { @@ -30,8 +33,8 @@ src: local('RobotoDraft Bold'), local('RobotoDraft-Bold'), local('Roboto-Bold'), - url(../fonts/RobotoDraftBold.woff2) format('woff2'), - url(../fonts/RobotoDraftBold.woff) format('woff'); + url('@{material-font-path}/RobotoDraftBold.woff2') format('woff2'), + url('@{material-font-path}/RobotoDraftBold.woff') format('woff'); } @font-face { @@ -42,6 +45,6 @@ src: local('RobotoDraft Italic'), local('RobotoDraft-Italic'), local('Roboto-Italic'), - url(../fonts/RobotoDraftItalic.woff2) format('woff2'), - url(../fonts/RobotoDraftItalic.woff) format('woff'); + url('@{material-font-path}/RobotoDraftItalic.woff2') format('woff2'), + url('@{material-font-path}/RobotoDraftItalic.woff') format('woff'); }