diff options
| author | Ilia Motornyi <elmot@vaadin.com> | 2017-02-09 11:17:35 +0200 |
|---|---|---|
| committer | Henri Sara <henri.sara@gmail.com> | 2017-02-09 11:17:35 +0200 |
| commit | 96a63f93abb4afee36c149974128390b13f62d4c (patch) | |
| tree | afc82be2ffff19aafb452469a030a7e0d3190d8a /themes/src | |
| parent | 322ba2ab9d7a6af8a8e68c063da7480e08843118 (diff) | |
| download | vaadin-framework-96a63f93abb4afee36c149974128390b13f62d4c.tar.gz vaadin-framework-96a63f93abb4afee36c149974128390b13f62d4c.zip | |
Include Vaadin-Icons into the project, (#8485)
Include Vaadin-Icons into the valo theme in the project,
make vaadin-icons dependency 'provided'
Fixes #8471
Diffstat (limited to 'themes/src')
| -rw-r--r-- | themes/src/main/themes/VAADIN/themes/valo/fonts/_fonts.scss | 2 | ||||
| -rw-r--r-- | themes/src/main/themes/VAADIN/themes/valo/fonts/vaadin-icons/vaadin-icons.scss | 20 |
2 files changed, 21 insertions, 1 deletions
diff --git a/themes/src/main/themes/VAADIN/themes/valo/fonts/_fonts.scss b/themes/src/main/themes/VAADIN/themes/valo/fonts/_fonts.scss index 9c45d6deda..63e5f66892 100644 --- a/themes/src/main/themes/VAADIN/themes/valo/fonts/_fonts.scss +++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/_fonts.scss @@ -4,7 +4,7 @@ @import "roboto/roboto"; @import "lato/lato"; @import "lora/lora"; -@import "../../../VAADIN/addons/vaadin-icons/vaadin-icons.scss"; +@import "vaadin-icons/vaadin-icons.scss"; /// Include VaadinIcons. They are included in Valo /// since Vaadin Framework version 8.0 (#7979) 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 new file mode 100644 index 0000000000..f99c8f3dce --- /dev/null +++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/vaadin-icons/vaadin-icons.scss @@ -0,0 +1,20 @@ +$vaadin-icons-pathPrefix: null; + +@if $v-relative-paths == false { + $vaadin-icons-pathPrefix: "../valo/fonts/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'; +} + +@mixin vaadin-icons { +}
\ No newline at end of file |