Merge pull request #45 from gtt-project/hotfix/cleanup_fonts_css

Trying to cleanup fonts.css

Author: sanak

assets/stylesheets/fonts.css

@@ -1,11 +1,8 @@
 /* Generated by Glyphter (http://www.glyphter.com) on  Thu Jan 19 2017*/
 @font-face {
     font-family: 'Redmine';
-    src: url('../fonts/Redmine.eot');
-    src: url('../fonts/Redmine.eot?#iefix') format('embedded-opentype'),
-         url('../fonts/Redmine.woff') format('woff'),
-         url('../fonts/Redmine.ttf') format('truetype'),
-         url('../fonts/Redmine.svg#Redmine') format('svg');
+    src: url('../fonts/Redmine.woff') format('woff'),
+         url('../fonts/Redmine.ttf') format('truetype');
     font-weight: normal;
     font-style: normal;
 }
@@ -41,11 +38,9 @@
 
 @font-face {
   font-family: "mcr-icons";
-  src: url("../fonts/mcr-icons.eot?b88144ffa3049f78bfa19b5159b89f09?#iefix") format("embedded-opentype"),
-url("../fonts/mcr-icons.woff2?b88144ffa3049f78bfa19b5159b89f09") format("woff2"),
-url("../fonts/mcr-icons.woff?b88144ffa3049f78bfa19b5159b89f09") format("woff"),
-url("../fonts/mcr-icons.ttf?b88144ffa3049f78bfa19b5159b89f09") format("truetype"),
-url("../fonts/mcr-icons.svg?b88144ffa3049f78bfa19b5159b89f09#mcr-icons") format("svg");
+  src: url("../fonts/mcr-icons.woff2") format("woff2"),
+       url("../fonts/mcr-icons.woff") format("woff"),
+       url("../fonts/mcr-icons.ttf") format("truetype");
 }
 
 [class^="mcr-icon-"]:before, i[class*=" mcr-icon-"]:before {
@@ -106,11 +101,8 @@ url("../fonts/mcr-icons.svg?b88144ffa3049f78bfa19b5159b89f09#mcr-icons") format(
 */
 @font-face {
   font-family: 'fontmaki';
-  src: url('../fonts/fontmaki.eot?66752613');
-  src: url('../fonts/fontmaki.eot?66752613#iefix') format('embedded-opentype'),
-       url('../fonts/fontmaki.woff?66752613') format('woff'),
-       url('../fonts/fontmaki.ttf?66752613') format('truetype'),
-       url('../fonts/fontmaki.svg?66752613#fontmaki') format('svg');
+  src: url('../fonts/fontmaki.woff') format('woff'),
+       url('../fonts/fontmaki.ttf') format('truetype');
   font-weight: normal;
   font-style: normal;
 }
@@ -129,7 +121,7 @@ url("../fonts/mcr-icons.svg?b88144ffa3049f78bfa19b5159b89f09#mcr-icons") format(
   font-family: "fontmaki";
   font-style: normal;
   font-weight: normal;
-  speak: none;
+  /* speak: none; */
 
   display: inline-block;
   text-decoration: inherit;

lib/redmine_gtt/hooks/view_layouts_base_html_head_hook.rb

@@ -6,24 +6,16 @@ class ViewLayoutsBaseHtmlHeadHook < Redmine::Hook::ViewListener
 
       def view_layouts_base_html_head(context={})
         tags = [];
-        tags << tag(:link, :rel => "preload", :as => "font", :type => "application/vnd.ms-fontobject",
-          :href => "/plugin_assets/redmine_gtt/fonts/mcr-icons.eot?75e7536f7f839b0f143e30ad8d0da92d?#iefi", :crossorigin => "anonymous" )
         tags << tag(:link, :rel => "preload", :as => "font", :type => "font/woff2",
-          :href => "/plugin_assets/redmine_gtt/fonts/mcr-icons.woff2?75e7536f7f839b0f143e30ad8d0da92d", :crossorigin => "anonymous" )
+          :href => "/plugin_assets/redmine_gtt/fonts/mcr-icons.woff2", :crossorigin => "anonymous" )
         tags << tag(:link, :rel => "preload", :as => "font", :type => "font/woff",
-          :href => "/plugin_assets/redmine_gtt/fonts/mcr-icons.woff?75e7536f7f839b0f143e30ad8d0da92d", :crossorigin => "anonymous" )
+          :href => "/plugin_assets/redmine_gtt/fonts/mcr-icons.woff", :crossorigin => "anonymous" )
         tags << tag(:link, :rel => "preload", :as => "font", :type => "font/ttf",
-          :href => "/plugin_assets/redmine_gtt/fonts/mcr-icons.ttf?75e7536f7f839b0f143e30ad8d0da92d", :crossorigin => "anonymous" )
-        tags << tag(:link, :rel => "preload", :as => "font", :type => "image/svg+xml",
-          :href => "/plugin_assets/redmine_gtt/fonts/mcr-icons.svg?75e7536f7f839b0f143e30ad8d0da92d#mcr-icons", :crossorigin => "anonymous" )
-        tags << tag(:link, :rel => "preload", :as => "font", :type => "application/vnd.ms-fontobject",
-          :href => "/plugin_assets/redmine_gtt/fonts/fontmaki.eot?66752613#iefix'", :crossorigin => "anonymous" )
+          :href => "/plugin_assets/redmine_gtt/fonts/mcr-icons.ttf", :crossorigin => "anonymous" )
         tags << tag(:link, :rel => "preload", :as => "font", :type => "font/woff",
-          :href => "/plugin_assets/redmine_gtt/fonts/fontmaki.woff?66752613", :crossorigin => "anonymous" )
+          :href => "/plugin_assets/redmine_gtt/fonts/fontmaki.woff", :crossorigin => "anonymous" )
         tags << tag(:link, :rel => "preload", :as => "font", :type => "font/ttf",
-          :href => "/plugin_assets/redmine_gtt/fonts/fontmaki.ttf?66752613", :crossorigin => "anonymous" )
-        tags << tag(:link, :rel => "preload", :as => "font", :type => "image/svg+xml",
-          :href => "/plugin_assets/redmine_gtt/fonts/fontmaki.svg?66752613#fontmaki", :crossorigin => "anonymous" )
+          :href => "/plugin_assets/redmine_gtt/fonts/fontmaki.ttf", :crossorigin => "anonymous" )
 
         tags << stylesheet_link_tag("https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css")
         tags << stylesheet_link_tag("fonts.css", :plugin => "redmine_gtt", :media => "all")