diff --git a/lib/fontcustom/templates/_fontcustom-bootstrap.scss b/lib/fontcustom/templates/_fontcustom-bootstrap.scss index f3c33b55..510724ee 100644 --- a/lib/fontcustom/templates/_fontcustom-bootstrap.scss +++ b/lib/fontcustom/templates/_fontcustom-bootstrap.scss @@ -7,9 +7,9 @@ font-family: "<%= @opts.font_name %>"; src: url("<%= @font_path_alt %>.eot"); src: url("<%= @font_path_alt %>.eot?#iefix") format("embedded-opentype"), + url("<%= @font_path_alt %>.svg#<%= @opts.font_name %>") format("svg"), url("<%= @font_path_alt %>.woff") format("woff"), - url("<%= @font_path_alt %>.ttf") format("truetype"), - url("<%= @font_path_alt %>.svg#<%= @opts.font_name %>") format("svg"); + url("<%= @font_path_alt %>.ttf") format("truetype"); font-weight: normal; font-style: normal; } diff --git a/lib/fontcustom/templates/_fontcustom-rails.scss b/lib/fontcustom/templates/_fontcustom-rails.scss index b2238060..551b8660 100644 --- a/lib/fontcustom/templates/_fontcustom-rails.scss +++ b/lib/fontcustom/templates/_fontcustom-rails.scss @@ -6,9 +6,9 @@ font-family: "<%= @opts.font_name %>"; src: font-url("<%= @font_path_alt %>.eot"); src: font-url("<%= @font_path_alt %>.eot?#iefix") format("embedded-opentype"), + font-url("<%= @font_path_alt %>.svg#<%= @opts.font_name %>") format("svg"), font-url("<%= @font_path_alt %>.woff") format("woff"), - font-url("<%= @font_path_alt %>.ttf") format("truetype"), - font-url("<%= @font_path_alt %>.svg#<%= @opts.font_name %>") format("svg"); + font-url("<%= @font_path_alt %>.ttf") format("truetype"); font-weight: normal; font-style: normal; } diff --git a/lib/fontcustom/templates/_fontcustom.scss b/lib/fontcustom/templates/_fontcustom.scss index 74285ed3..33e8fb27 100644 --- a/lib/fontcustom/templates/_fontcustom.scss +++ b/lib/fontcustom/templates/_fontcustom.scss @@ -6,9 +6,9 @@ font-family: "<%= @opts.font_name %>"; src: url("<%= @font_path_alt %>.eot"); src: url("<%= @font_path_alt %>.eot?#iefix") format("embedded-opentype"), + url("<%= @font_path_alt %>.svg#<%= @opts.font_name %>") format("svg"), url("<%= @font_path_alt %>.woff") format("woff"), - url("<%= @font_path_alt %>.ttf") format("truetype"), - url("<%= @font_path_alt %>.svg#<%= @opts.font_name %>") format("svg"); + url("<%= @font_path_alt %>.ttf") format("truetype"); font-weight: normal; font-style: normal; } diff --git a/lib/fontcustom/templates/fontcustom-bootstrap.css b/lib/fontcustom/templates/fontcustom-bootstrap.css index d0d7c629..4cc4c000 100644 --- a/lib/fontcustom/templates/fontcustom-bootstrap.css +++ b/lib/fontcustom/templates/fontcustom-bootstrap.css @@ -7,9 +7,9 @@ font-family: "<%= @opts.font_name %>"; src: url("<%= @font_path %>.eot"); src: url("<%= @font_path %>.eot?#iefix") format("embedded-opentype"), + url("<%= @font_path %>.svg#<%= @opts.font_name %>") format("svg"), url("<%= @font_path %>.woff") format("woff"), - url("<%= @font_path %>.ttf") format("truetype"), - url("<%= @font_path %>.svg#<%= @opts.font_name %>") format("svg"); + url("<%= @font_path %>.ttf") format("truetype"); font-weight: normal; font-style: normal; } diff --git a/lib/fontcustom/templates/fontcustom-preview.html b/lib/fontcustom/templates/fontcustom-preview.html index 14011f16..372b0919 100644 --- a/lib/fontcustom/templates/fontcustom-preview.html +++ b/lib/fontcustom/templates/fontcustom-preview.html @@ -125,9 +125,9 @@ font-family: "<%= @opts.font_name %>"; src: url("<%= @font_path_preview %>.eot"); src: url("<%= @font_path_preview %>.eot?#iefix") format("embedded-opentype"), + url("<%= @font_path_preview %>.svg#<%= @opts.font_name %>") format("svg"), url("<%= @font_path_preview %>.woff") format("woff"), - url("<%= @font_path_preview %>.ttf") format("truetype"), - url("<%= @font_path_preview %>.svg#<%= @opts.font_name %>") format("svg"); + url("<%= @font_path_preview %>.ttf") format("truetype"); font-weight: normal; font-style: normal; } diff --git a/lib/fontcustom/templates/fontcustom.css b/lib/fontcustom/templates/fontcustom.css index 7b1228c6..ad328ad0 100644 --- a/lib/fontcustom/templates/fontcustom.css +++ b/lib/fontcustom/templates/fontcustom.css @@ -6,9 +6,9 @@ font-family: "<%= @opts.font_name %>"; src: url("<%= @font_path %>.eot"); src: url("<%= @font_path %>.eot?#iefix") format("embedded-opentype"), + url("<%= @font_path %>.svg#<%= @opts.font_name %>") format("svg"), url("<%= @font_path %>.woff") format("woff"), - url("<%= @font_path %>.ttf") format("truetype"), - url("<%= @font_path %>.svg#<%= @opts.font_name %>") format("svg"); + url("<%= @font_path %>.ttf") format("truetype"); font-weight: normal; font-style: normal; }