diff options
author | redmatrix <git@macgirvin.com> | 2016-04-30 15:02:45 -0700 |
---|---|---|
committer | redmatrix <git@macgirvin.com> | 2016-04-30 15:02:45 -0700 |
commit | 84d93cca6e2ac0b552a6f5c570fbcfce766200a1 (patch) | |
tree | a8a9c46ee6f70dd4b8824499a49b1e39e2980dc6 /library/font_awesome/less/path.less | |
parent | 45512e6aba602604143e946cca49c363ae88aa1e (diff) | |
parent | 9446d0cbb463af6a256efebf97e10618469f1193 (diff) | |
download | volse-hubzilla-84d93cca6e2ac0b552a6f5c570fbcfce766200a1.tar.gz volse-hubzilla-84d93cca6e2ac0b552a6f5c570fbcfce766200a1.tar.bz2 volse-hubzilla-84d93cca6e2ac0b552a6f5c570fbcfce766200a1.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'library/font_awesome/less/path.less')
-rw-r--r-- | library/font_awesome/less/path.less | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/library/font_awesome/less/path.less b/library/font_awesome/less/path.less index 8ccef8cf0..835be41f8 100644 --- a/library/font_awesome/less/path.less +++ b/library/font_awesome/less/path.less @@ -3,12 +3,13 @@ @font-face { font-family: 'FontAwesome'; - src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=@{FontAwesomeVersion}'); - src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'), - url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'), - url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype'), - url('@{FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=@{FontAwesomeVersion}') format('svg'); -// src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts + src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}'); + src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'), + url('@{fa-font-path}/fontawesome-webfont.woff2?v=@{fa-version}') format('woff2'), + url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'), + url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'), + url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg'); + // src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts font-weight: normal; font-style: normal; } |