From d796c19d33627f59c8763e9352ca4315456de8ef Mon Sep 17 00:00:00 2001 From: Mike Green Date: Thu, 15 Oct 2020 17:21:09 -0400 Subject: [PATCH] Use Rails asset pipeline URL functions to load icon font if they exist --- src/sass/icons/_mixins.scss | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/sass/icons/_mixins.scss b/src/sass/icons/_mixins.scss index 06ce1d38..dd47b479 100644 --- a/src/sass/icons/_mixins.scss +++ b/src/sass/icons/_mixins.scss @@ -2,13 +2,23 @@ $context-menu-icons: () !default; +@function context-menu-font-url($url) { + @if function-exists(asset-url) { + @return asset-url($url); + } @else if function-exists(font-url) { + @return font-url($url); + } @else { + @return url($url); + } +} + @font-face { font-family: '#{$context-menu-icon-font-name}'; - src: url('#{$context-menu-icon-font-path}#{$context-menu-icon-font-name}.eot?#{$context-menu-icons-cachebust}'); - src: url('#{$context-menu-icon-font-path}#{$context-menu-icon-font-name}.eot?#{$context-menu-icons-cachebust}#iefix') format('embedded-opentype'), - url('#{$context-menu-icon-font-path}#{$context-menu-icon-font-name}.woff2?#{$context-menu-icons-cachebust}') format('woff2'), - url('#{$context-menu-icon-font-path}#{$context-menu-icon-font-name}.woff?#{$context-menu-icons-cachebust}') format('woff'), - url('#{$context-menu-icon-font-path}#{$context-menu-icon-font-name}.ttf?#{$context-menu-icons-cachebust}') format('truetype'); + src: context-menu-font-url('#{$context-menu-icon-font-path}#{$context-menu-icon-font-name}.eot?#{$context-menu-icons-cachebust}'); + src: context-menu-font-url('#{$context-menu-icon-font-path}#{$context-menu-icon-font-name}.eot?#{$context-menu-icons-cachebust}#iefix') format('embedded-opentype'), + context-menu-font-url('#{$context-menu-icon-font-path}#{$context-menu-icon-font-name}.woff2?#{$context-menu-icons-cachebust}') format('woff2'), + context-menu-font-url('#{$context-menu-icon-font-path}#{$context-menu-icon-font-name}.woff?#{$context-menu-icons-cachebust}') format('woff'), + context-menu-font-url('#{$context-menu-icon-font-path}#{$context-menu-icon-font-name}.ttf?#{$context-menu-icons-cachebust}') format('truetype'); font-weight: normal; font-style: normal; }