diff options
| author | Raffael <qwasli@users.noreply.github.com> | 2021-05-18 10:38:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-18 11:38:03 +0300 |
| commit | 786627a89595b0fed8e7eccfc5c0ef25ac9b2218 (patch) | |
| tree | 90938fdc31131ebbd7c3e1f970996df1cbff5751 /themes | |
| parent | a32ea51c62a48b14ad0b88c97a50d57bb5592ae4 (diff) | |
| download | vaadin-framework-786627a89595b0fed8e7eccfc5c0ef25ac9b2218.tar.gz vaadin-framework-786627a89595b0fed8e7eccfc5c0ef25ac9b2218.zip | |
include @font-face definition in mixin so -icons variable has effect (#12295)
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/src/main/themes/VAADIN/themes/valo/fonts/vaadin-icons/_vaadin-icons.scss | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/themes/src/main/themes/VAADIN/themes/valo/fonts/vaadin-icons/_vaadin-icons.scss b/themes/src/main/themes/VAADIN/themes/valo/fonts/vaadin-icons/_vaadin-icons.scss index 88dbebb8cc..3b66d5990b 100644 --- a/themes/src/main/themes/VAADIN/themes/valo/fonts/vaadin-icons/_vaadin-icons.scss +++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/vaadin-icons/_vaadin-icons.scss @@ -1,20 +1,20 @@ -$vaadin-icons-pathPrefix: null; +@mixin vaadin-icons { -@if $v-relative-paths == false { - $vaadin-icons-pathPrefix: "../valo/fonts/vaadin-icons/"; -} + $vaadin-icons-pathPrefix: null; -@font-face { - font-family: 'Vaadin-Icons'; - src: url('#{$vaadin-icons-pathPrefix}Vaadin-Icons.eot'); - src: url('#{$vaadin-icons-pathPrefix}Vaadin-Icons.eot?#iefix') format('embedded-opentype'), - url('#{$vaadin-icons-pathPrefix}Vaadin-Icons.woff') format('woff'), - url('#{$vaadin-icons-pathPrefix}Vaadin-Icons.ttf') format('truetype'), - url('#{$vaadin-icons-pathPrefix}Vaadin-Icons.svg#icomoon') format('svg'); -} -.Vaadin-Icons { - font-family: 'Vaadin-Icons'; -} + @if $v-relative-paths == false { + $vaadin-icons-pathPrefix: "../valo/fonts/vaadin-icons/"; + } -@mixin vaadin-icons { + @font-face { + font-family: 'Vaadin-Icons'; + src: url('#{$vaadin-icons-pathPrefix}Vaadin-Icons.eot'); + src: url('#{$vaadin-icons-pathPrefix}Vaadin-Icons.eot?#iefix') format('embedded-opentype'), + url('#{$vaadin-icons-pathPrefix}Vaadin-Icons.woff') format('woff'), + url('#{$vaadin-icons-pathPrefix}Vaadin-Icons.ttf') format('truetype'), + url('#{$vaadin-icons-pathPrefix}Vaadin-Icons.svg#icomoon') format('svg'); + } + .Vaadin-Icons { + font-family: 'Vaadin-Icons'; + } } |