diff options
| author | Anna Koskinen <Ansku@users.noreply.github.com> | 2021-05-18 13:43:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-18 13:43:30 +0300 |
| commit | 2914812bcf44c92a80c76bf6d4815cc41d393bbb (patch) | |
| tree | 05fc96a21bcc28f6afd87e715b197abf8ef9bc39 /themes | |
| parent | 1e029aa6eaede081f8b9529f3f014e3725fc302a (diff) | |
| download | vaadin-framework-2914812bcf44c92a80c76bf6d4815cc41d393bbb.tar.gz vaadin-framework-2914812bcf44c92a80c76bf6d4815cc41d393bbb.zip | |
include @font-face definition in mixin so -icons variable has effect (#12309)
* 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'; + } } |