Merge pull request #699 from wolfika/master

Replace hard-coded font path in roboto.less
This commit is contained in:
Fez Vrasta 2015-10-10 16:05:30 +02:00
commit 8cf7f0c522

View File

@ -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');
}