diff --git a/public/OFN-v2.eot b/app/assets/fonts/OFN-v2.eot similarity index 100% rename from public/OFN-v2.eot rename to app/assets/fonts/OFN-v2.eot diff --git a/public/OFN-v2.svg b/app/assets/fonts/OFN-v2.svg similarity index 100% rename from public/OFN-v2.svg rename to app/assets/fonts/OFN-v2.svg diff --git a/public/OFN-v2.ttf b/app/assets/fonts/OFN-v2.ttf similarity index 100% rename from public/OFN-v2.ttf rename to app/assets/fonts/OFN-v2.ttf diff --git a/public/OFN-v2.woff b/app/assets/fonts/OFN-v2.woff similarity index 100% rename from public/OFN-v2.woff rename to app/assets/fonts/OFN-v2.woff diff --git a/app/assets/stylesheets/darkswarm/style.scss b/app/assets/stylesheets/darkswarm/style.scss index e9f018445b..9228b0bbe9 100644 --- a/app/assets/stylesheets/darkswarm/style.scss +++ b/app/assets/stylesheets/darkswarm/style.scss @@ -1,10 +1,10 @@ @font-face { font-family: 'OFN'; - src:url('/OFN-v2.eot?eslsji'); - src:url('/OFN-v2.eot?#iefixeslsji') format('embedded-opentype'), - url('/OFN-v2.woff?eslsji') format('woff'), - url('/OFN-v2.ttf?eslsji') format('truetype'), - url('/OFN-v2.svg?eslsji#OFN') format('svg'); + src: font-url('OFN-v2.eot'); + src: font-url('OFN-v2.eot') format('embedded-opentype'), + font-url('OFN-v2.woff') format('woff'), + font-url('OFN-v2.ttf') format('truetype'), + font-url('OFN-v2.svg') format('svg'); font-weight: normal; font-style: normal; } diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml index f45b157a51..7fd21a35d3 100644 --- a/app/views/layouts/darkswarm.html.haml +++ b/app/views/layouts/darkswarm.html.haml @@ -13,7 +13,7 @@ - else = favicon_link_tag "/favicon-staging.ico" %link{href: "https://fonts.googleapis.com/css?family=Roboto:400,300italic,400italic,300,700,700italic|Oswald:300,400,700", rel: "stylesheet", type: "text/css"} - %link{href: "/OFN-v2.woff?eslsji", rel: "preload", as: "font", crossorigin: "anonymous"} + %link{href: font_path("OFN-v2.woff"), rel: "preload", as: "font", crossorigin: "anonymous"} = stylesheet_link_tag "darkswarm/all" = csrf_meta_tags