From 869b795e6478c34e6593b5f6ace2fe265973ebbd Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Thu, 1 Oct 2015 22:37:21 +0300 Subject: Change ValoIcons to ThemeIcons and moved to base (#18472) Change-Id: I7122252e9b238fdca0383d0698623fe5a9e3f262 --- WebContent/VAADIN/themes/base/fonts/fonts.scss | 7 ++- .../themes/base/fonts/themeicons-webfont.eot | Bin 0 -> 12734 bytes .../themes/base/fonts/themeicons-webfont.svg | 50 +++++++++++++++++++++ .../themes/base/fonts/themeicons-webfont.ttf | Bin 0 -> 12612 bytes .../themes/base/fonts/themeicons-webfont.woff | Bin 0 -> 7868 bytes WebContent/VAADIN/themes/base/grid/grid.scss | 4 +- .../VAADIN/themes/valo/components/_checkbox.scss | 2 +- .../themes/valo/components/_colorpicker.scss | 2 +- .../VAADIN/themes/valo/components/_combobox.scss | 4 +- .../VAADIN/themes/valo/components/_datefield.scss | 10 ++--- .../VAADIN/themes/valo/components/_label.scss | 2 +- .../VAADIN/themes/valo/components/_menubar.scss | 6 +-- .../themes/valo/components/_notification.scss | 2 +- .../themes/valo/components/_richtextarea.scss | 4 +- .../VAADIN/themes/valo/components/_table.scss | 8 ++-- .../VAADIN/themes/valo/components/_tabsheet.scss | 4 +- .../VAADIN/themes/valo/components/_tree.scss | 4 +- .../themes/valo/components/_twincolselect.scss | 4 +- WebContent/VAADIN/themes/valo/fonts/_fonts.scss | 2 +- .../valo/fonts/valoicons/valoicons-webfont.eot | Bin 12610 -> 0 bytes .../valo/fonts/valoicons/valoicons-webfont.svg | 46 ------------------- .../valo/fonts/valoicons/valoicons-webfont.ttf | Bin 12492 -> 0 bytes .../valo/fonts/valoicons/valoicons-webfont.woff | Bin 7856 -> 0 bytes .../valo/fonts/valoicons/valoicons-webfont.woff2 | Bin 6400 -> 0 bytes 24 files changed, 85 insertions(+), 76 deletions(-) create mode 100644 WebContent/VAADIN/themes/base/fonts/themeicons-webfont.eot create mode 100644 WebContent/VAADIN/themes/base/fonts/themeicons-webfont.svg create mode 100644 WebContent/VAADIN/themes/base/fonts/themeicons-webfont.ttf create mode 100644 WebContent/VAADIN/themes/base/fonts/themeicons-webfont.woff delete mode 100644 WebContent/VAADIN/themes/valo/fonts/valoicons/valoicons-webfont.eot delete mode 100644 WebContent/VAADIN/themes/valo/fonts/valoicons/valoicons-webfont.svg delete mode 100644 WebContent/VAADIN/themes/valo/fonts/valoicons/valoicons-webfont.ttf delete mode 100644 WebContent/VAADIN/themes/valo/fonts/valoicons/valoicons-webfont.woff delete mode 100644 WebContent/VAADIN/themes/valo/fonts/valoicons/valoicons-webfont.woff2 (limited to 'WebContent/VAADIN/themes') diff --git a/WebContent/VAADIN/themes/base/fonts/fonts.scss b/WebContent/VAADIN/themes/base/fonts/fonts.scss index 608fe7c280..1f5c0cf6a2 100644 --- a/WebContent/VAADIN/themes/base/fonts/fonts.scss +++ b/WebContent/VAADIN/themes/base/fonts/fonts.scss @@ -1,9 +1,14 @@ +$v-font-awesome: true !default; // Set to false to exclude Font Awesome + @mixin fonts { @include fonticons; + @include v-font(ThemeIcons, themeicons-webfont); } @mixin fonticons { - @include v-font(FontAwesome, fontawesome-webfont); + @if $v-font-awesome { + @include v-font(FontAwesome, fontawesome-webfont); + } } @mixin v-font($font-family, $file-name) { diff --git a/WebContent/VAADIN/themes/base/fonts/themeicons-webfont.eot b/WebContent/VAADIN/themes/base/fonts/themeicons-webfont.eot new file mode 100644 index 0000000000..9cc04785e2 Binary files /dev/null and b/WebContent/VAADIN/themes/base/fonts/themeicons-webfont.eot differ diff --git a/WebContent/VAADIN/themes/base/fonts/themeicons-webfont.svg b/WebContent/VAADIN/themes/base/fonts/themeicons-webfont.svg new file mode 100644 index 0000000000..59685c3b3a --- /dev/null +++ b/WebContent/VAADIN/themes/base/fonts/themeicons-webfont.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/fonts/themeicons-webfont.ttf b/WebContent/VAADIN/themes/base/fonts/themeicons-webfont.ttf new file mode 100644 index 0000000000..1b7dd4a6ad Binary files /dev/null and b/WebContent/VAADIN/themes/base/fonts/themeicons-webfont.ttf differ diff --git a/WebContent/VAADIN/themes/base/fonts/themeicons-webfont.woff b/WebContent/VAADIN/themes/base/fonts/themeicons-webfont.woff new file mode 100644 index 0000000000..7d055f6dd0 Binary files /dev/null and b/WebContent/VAADIN/themes/base/fonts/themeicons-webfont.woff differ diff --git a/WebContent/VAADIN/themes/base/grid/grid.scss b/WebContent/VAADIN/themes/base/grid/grid.scss index 341f486d26..a176114fb6 100644 --- a/WebContent/VAADIN/themes/base/grid/grid.scss +++ b/WebContent/VAADIN/themes/base/grid/grid.scss @@ -121,7 +121,7 @@ $v-grid-details-border-bottom-stripe: 1px solid darken($v-grid-row-background-co &:after { content: "\f0c9"; display: block; - font-family: FontAwesome, sans-serif; + font-family: ThemeIcons, sans-serif; font-size: $v-grid-header-font-size; } } @@ -247,7 +247,7 @@ $v-grid-details-border-bottom-stripe: 1px solid darken($v-grid-row-background-co padding-right: round($v-grid-header-font-size * 1.2) + $v-grid-cell-padding-horizontal; &:after { - font-family: FontAwesome, sans-serif; + font-family: ThemeIcons, sans-serif; content: "\f0de" " " attr(sort-order); position: absolute; right: $v-grid-cell-padding-horizontal; diff --git a/WebContent/VAADIN/themes/valo/components/_checkbox.scss b/WebContent/VAADIN/themes/valo/components/_checkbox.scss index 690aa57f36..569a414734 100644 --- a/WebContent/VAADIN/themes/valo/components/_checkbox.scss +++ b/WebContent/VAADIN/themes/valo/components/_checkbox.scss @@ -35,7 +35,7 @@ */ @mixin valo-checkbox-icon-style { content: "\f00c"; - font-family: ValoIcons; + font-family: ThemeIcons; } diff --git a/WebContent/VAADIN/themes/valo/components/_colorpicker.scss b/WebContent/VAADIN/themes/valo/components/_colorpicker.scss index fe365aa6ff..3f334e893c 100644 --- a/WebContent/VAADIN/themes/valo/components/_colorpicker.scss +++ b/WebContent/VAADIN/themes/valo/components/_colorpicker.scss @@ -160,7 +160,7 @@ outline: none; &:before { - font-family: ValoIcons; + font-family: ThemeIcons; content: "\f141"; } } diff --git a/WebContent/VAADIN/themes/valo/components/_combobox.scss b/WebContent/VAADIN/themes/valo/components/_combobox.scss index a200641a0d..606a948dfb 100644 --- a/WebContent/VAADIN/themes/valo/components/_combobox.scss +++ b/WebContent/VAADIN/themes/valo/components/_combobox.scss @@ -334,7 +334,7 @@ * @group combobox */ @mixin valo-combobox-button-icon-style { - font-family: ValoIcons; + font-family: ThemeIcons; content: "\f078"; } @@ -420,7 +420,7 @@ height: ceil($v-unit-size/1.5); line-height: ceil($v-unit-size/1.5); text-align: center; - font-family: ValoIcons; + font-family: ThemeIcons; @include transform( scale(.8) ); color: valo-font-color($v-background-color); diff --git a/WebContent/VAADIN/themes/valo/components/_datefield.scss b/WebContent/VAADIN/themes/valo/components/_datefield.scss index f27bc9073a..6ff8a70dba 100644 --- a/WebContent/VAADIN/themes/valo/components/_datefield.scss +++ b/WebContent/VAADIN/themes/valo/components/_datefield.scss @@ -266,7 +266,7 @@ * @group datefield */ @mixin valo-datefield-button-icon-style { - font-family: ValoIcons; + font-family: ThemeIcons; content: "\f073"; } @@ -570,7 +570,7 @@ * @group datefield */ @mixin valo-datefield-calendarpanel-nextmonth-icon-style { - font-family: ValoIcons; + font-family: ThemeIcons; content: "\f105"; } @@ -581,7 +581,7 @@ * @group datefield */ @mixin valo-datefield-calendarpanel-prevmonth-icon-style { - font-family: ValoIcons; + font-family: ThemeIcons; content: "\f104"; } @@ -592,7 +592,7 @@ * @group datefield */ @mixin valo-datefield-calendarpanel-nextyear-icon-style { - font-family: ValoIcons; + font-family: ThemeIcons; content: "\f101"; } @@ -603,7 +603,7 @@ * @group datefield */ @mixin valo-datefield-calendarpanel-prevyear-icon-style { - font-family: ValoIcons; + font-family: ThemeIcons; content: "\f100"; } diff --git a/WebContent/VAADIN/themes/valo/components/_label.scss b/WebContent/VAADIN/themes/valo/components/_label.scss index f94fc1ff9f..95500ceafe 100644 --- a/WebContent/VAADIN/themes/valo/components/_label.scss +++ b/WebContent/VAADIN/themes/valo/components/_label.scss @@ -259,7 +259,7 @@ $v-letter-spacing--h4: 0 !default; font-size: round($v-font-size * 0.95); &:before { - font-family: ValoIcons; + font-family: ThemeIcons; content: "\f00c"; margin-right: .5em; margin-left: round($v-unit-size/-2); diff --git a/WebContent/VAADIN/themes/valo/components/_menubar.scss b/WebContent/VAADIN/themes/valo/components/_menubar.scss index e1350ff9e7..4b4a657d6a 100644 --- a/WebContent/VAADIN/themes/valo/components/_menubar.scss +++ b/WebContent/VAADIN/themes/valo/components/_menubar.scss @@ -54,7 +54,7 @@ display: none; + .#{$primary-stylename}-menuitem-caption:after { - font-family: ValoIcons; + font-family: ThemeIcons; content: "\f078"; font-size: 0.7em; vertical-align: .15em; @@ -285,7 +285,7 @@ * @group menubar */ @mixin valo-menubar-submenu-indicator-style { - font-family: ValoIcons; + font-family: ThemeIcons; content: "\f054"; line-height: $v-selection-item-height + 2px; } @@ -298,7 +298,7 @@ */ @mixin valo-menubar-checked-icon-style { content: "\f00c"; - font-family: ValoIcons; + font-family: ThemeIcons; } diff --git a/WebContent/VAADIN/themes/valo/components/_notification.scss b/WebContent/VAADIN/themes/valo/components/_notification.scss index cf288cca25..ee3cf67a7c 100644 --- a/WebContent/VAADIN/themes/valo/components/_notification.scss +++ b/WebContent/VAADIN/themes/valo/components/_notification.scss @@ -185,7 +185,7 @@ $v-notification-title-color: $v-focus-color !default; font-weight: $v-font-weight + 100; &:before { - font-family: ValoIcons; + font-family: ThemeIcons; content: "\f00c"; margin-right: .5em; } diff --git a/WebContent/VAADIN/themes/valo/components/_richtextarea.scss b/WebContent/VAADIN/themes/valo/components/_richtextarea.scss index ca731e6373..7aa55b0fce 100644 --- a/WebContent/VAADIN/themes/valo/components/_richtextarea.scss +++ b/WebContent/VAADIN/themes/valo/components/_richtextarea.scss @@ -73,7 +73,7 @@ $valo-richtextarea-use-valo-icons: true !default; } div:before { - font-family: ValoIcons; + font-family: ThemeIcons; } @each $pair in $icons { @@ -84,7 +84,7 @@ $valo-richtextarea-use-valo-icons: true !default; } } } - } // Use ValoIcons + } // Use ThemeIcons .#{$primary-stylename} .gwt-RichTextToolbar-bottom { font-size: round($v-font-size * 0.8); diff --git a/WebContent/VAADIN/themes/valo/components/_table.scss b/WebContent/VAADIN/themes/valo/components/_table.scss index f7e17483d8..63735cb4b9 100644 --- a/WebContent/VAADIN/themes/valo/components/_table.scss +++ b/WebContent/VAADIN/themes/valo/components/_table.scss @@ -599,7 +599,7 @@ $v-table-background-color: null !default; */ @mixin valo-table-sort-asc-icon-style { content: '\f0de'; - font-family: ValoIcons; + font-family: ThemeIcons; } /** @@ -610,7 +610,7 @@ $v-table-background-color: null !default; */ @mixin valo-table-sort-desc-icon-style { content: '\f0dd'; - font-family: ValoIcons; + font-family: ThemeIcons; } /** @@ -620,7 +620,7 @@ $v-table-background-color: null !default; * @group table */ @mixin valo-table-column-selector-icon-style { - font-family: ValoIcons; + font-family: ThemeIcons; content: "\f013"; } @@ -632,7 +632,7 @@ $v-table-background-color: null !default; */ @mixin valo-table-column-visible-icon-style { content: "\f00c"; - font-family: ValoIcons; + font-family: ThemeIcons; } diff --git a/WebContent/VAADIN/themes/valo/components/_tabsheet.scss b/WebContent/VAADIN/themes/valo/components/_tabsheet.scss index be6796db97..07fdb4650b 100644 --- a/WebContent/VAADIN/themes/valo/components/_tabsheet.scss +++ b/WebContent/VAADIN/themes/valo/components/_tabsheet.scss @@ -378,7 +378,7 @@ $v-tabsheet-content-animation-enabled: $v-animations-enabled !default; * @group tabsheet */ @mixin valo-tabsheet-scroller-prev-icon-style { - font-family: ValoIcons; + font-family: ThemeIcons; content: "\f053"; } @@ -389,7 +389,7 @@ $v-tabsheet-content-animation-enabled: $v-animations-enabled !default; * @group tabsheet */ @mixin valo-tabsheet-scroller-next-icon-style { - font-family: ValoIcons; + font-family: ThemeIcons; content: "\f054"; } diff --git a/WebContent/VAADIN/themes/valo/components/_tree.scss b/WebContent/VAADIN/themes/valo/components/_tree.scss index f8c46ac08f..95ae8d3b5e 100644 --- a/WebContent/VAADIN/themes/valo/components/_tree.scss +++ b/WebContent/VAADIN/themes/valo/components/_tree.scss @@ -290,7 +290,7 @@ $v-tree-expand-animation-enabled: false !default; */ @mixin valo-tree-collapsed-icon-style { content: "\f0da"; - font-family: ValoIcons; + font-family: ThemeIcons; } /** @@ -303,6 +303,6 @@ $v-tree-expand-animation-enabled: false !default; @mixin valo-tree-expanded-icon-style ($force: false) { @if $v-tree-animations-enabled == false or $force { content: "\f0d7"; - font-family: ValoIcons; + font-family: ThemeIcons; } } diff --git a/WebContent/VAADIN/themes/valo/components/_twincolselect.scss b/WebContent/VAADIN/themes/valo/components/_twincolselect.scss index b9b9bcd06d..51063e236f 100644 --- a/WebContent/VAADIN/themes/valo/components/_twincolselect.scss +++ b/WebContent/VAADIN/themes/valo/components/_twincolselect.scss @@ -89,7 +89,7 @@ * @group twin-column-select */ @mixin valo-twincolselect-add-icon-style { - font-family: ValoIcons; + font-family: ThemeIcons; content: "\f054"; } @@ -100,6 +100,6 @@ * @group twin-column-select */ @mixin valo-twincolselect-remove-icon-style { - font-family: ValoIcons; + font-family: ThemeIcons; content: "\f053"; } diff --git a/WebContent/VAADIN/themes/valo/fonts/_fonts.scss b/WebContent/VAADIN/themes/valo/fonts/_fonts.scss index e330612e92..b947106f38 100644 --- a/WebContent/VAADIN/themes/valo/fonts/_fonts.scss +++ b/WebContent/VAADIN/themes/valo/fonts/_fonts.scss @@ -15,7 +15,7 @@ $fontawesome-pathPrefix: null; @mixin valo-fonts { // Valo Icons - @include v-font(ValoIcons, "#{$fontawesome-pathPrefix}../valo/fonts/valoicons/valoicons-webfont"); + @include v-font(ThemeIcons, "#{$fontawesome-pathPrefix}../base/fonts/themeicons-webfont"); @if $v-font-awesome { @include v-font(FontAwesome, "#{$fontawesome-pathPrefix}../base/fonts/fontawesome-webfont"); } diff --git a/WebContent/VAADIN/themes/valo/fonts/valoicons/valoicons-webfont.eot b/WebContent/VAADIN/themes/valo/fonts/valoicons/valoicons-webfont.eot deleted file mode 100644 index 7b95e11d7b..0000000000 Binary files a/WebContent/VAADIN/themes/valo/fonts/valoicons/valoicons-webfont.eot and /dev/null differ diff --git a/WebContent/VAADIN/themes/valo/fonts/valoicons/valoicons-webfont.svg b/WebContent/VAADIN/themes/valo/fonts/valoicons/valoicons-webfont.svg deleted file mode 100644 index c975dce73b..0000000000 --- a/WebContent/VAADIN/themes/valo/fonts/valoicons/valoicons-webfont.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/WebContent/VAADIN/themes/valo/fonts/valoicons/valoicons-webfont.ttf b/WebContent/VAADIN/themes/valo/fonts/valoicons/valoicons-webfont.ttf deleted file mode 100644 index 1bf68bf55b..0000000000 Binary files a/WebContent/VAADIN/themes/valo/fonts/valoicons/valoicons-webfont.ttf and /dev/null differ diff --git a/WebContent/VAADIN/themes/valo/fonts/valoicons/valoicons-webfont.woff b/WebContent/VAADIN/themes/valo/fonts/valoicons/valoicons-webfont.woff deleted file mode 100644 index 7c7dda4ed4..0000000000 Binary files a/WebContent/VAADIN/themes/valo/fonts/valoicons/valoicons-webfont.woff and /dev/null differ diff --git a/WebContent/VAADIN/themes/valo/fonts/valoicons/valoicons-webfont.woff2 b/WebContent/VAADIN/themes/valo/fonts/valoicons/valoicons-webfont.woff2 deleted file mode 100644 index f9f5f5031d..0000000000 Binary files a/WebContent/VAADIN/themes/valo/fonts/valoicons/valoicons-webfont.woff2 and /dev/null differ -- cgit v1.2.3