Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: force font-awesome update

This commit is contained in:
Régis Hanol 2015-02-05 14:25:27 +01:00
parent 0774bd28b8
commit 4ac82f45bf
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/stylesheets/vendor/font_awesome/_path.scss vendored
View File

@ -5,11 +5,10 @@
font-family: 'FontAwesome';
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
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');
font-weight: normal;
font-style: normal;
}

2
app/assets/stylesheets/vendor/font_awesome/font-awesome.scss vendored
View File

@ -5,7 +5,7 @@
@import "variables";
@import "mixins";
@import "path";
// @import "path";
@import "core";
@import "larger";
@import "fixed-width";

23
app/views/common/_special_font_face.html.erb
View File

@ -14,21 +14,22 @@
<style>
@font-face {
font-family: 'FontAwesome';
src: url('<%=asset_path "fontawesome-webfont.eot" %>?<%= font_domain %>&v=4.0.4');
src: url('<%=asset_path "fontawesome-webfont.eot" %>?<%= font_domain %>&v=4.0.4#iefix') format('embedded-opentype'),
url('<%=asset_path "fontawesome-webfont.woff" %>?<%= font_domain %>&v=4.0.4') format('woff'),
url('<%=asset_path "fontawesome-webfont.ttf" %>?<%= font_domain %>&v=4.0.4') format('truetype');
src: url('<%=asset_path "fontawesome-webfont.eot" %>?<%= font_domain %>&v=4.3.0');
src: url('<%=asset_path "fontawesome-webfont.eot" %>?<%= font_domain %>&v=4.3.0#iefix') format('embedded-opentype'),
url('<%=asset_path "fontawesome-webfont.woff2" %>?<%= font_domain %>&v=4.3.0') format('woff2'),
url('<%=asset_path "fontawesome-webfont.woff" %>?<%= font_domain %>&v=4.3.0') format('woff'),
url('<%=asset_path "fontawesome-webfont.ttf" %>?<%= font_domain %>&v=4.3.0') format('truetype'),
url('<%=asset_path "fontawesome-webfont.svg" %>?<%= font_domain %>&v=4.3.0') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'zocial';
src: url('<%=asset_path "zocial-regular-webfont.woff" %>?<%= font_domain %>') format('woff'),
url('<%=asset_path "zocial-regular-webfont.ttf" %>?<%= font_domain %>') format('truetype'),
url('<%=asset_path "zocial-regular-webfont.svg" %>?<%= font_domain %>#zocialregular') format('svg');
font-weight: normal;
font-style: normal;
font-family: 'zocial';
src: url('<%=asset_path "zocial-regular-webfont.woff" %>?<%= font_domain %>') format('woff'),
url('<%=asset_path "zocial-regular-webfont.ttf" %>?<%= font_domain %>') format('truetype'),
url('<%=asset_path "zocial-regular-webfont.svg" %>?<%= font_domain %>#zocialregular') format('svg');
font-weight: normal;
font-style: normal;
}
</style>