diff options
| author | Jouni Koivuviita <jouni@vaadin.com> | 2014-06-10 22:26:06 +0300 |
|---|---|---|
| committer | Jouni Koivuviita <jouni@vaadin.com> | 2014-06-16 07:55:35 +0000 |
| commit | a69d2ecfba35a8191f79acb6138eeaabc118c752 (patch) | |
| tree | 23dacd0ef2ca9da83010d241c42f74279f460d7f /WebContent/VAADIN/themes/base | |
| parent | 083923c80f7b343b035d60e2df1b2f68dc214233 (diff) | |
| download | vaadin-framework-a69d2ecfba35a8191f79acb6138eeaabc118c752.tar.gz vaadin-framework-a69d2ecfba35a8191f79acb6138eeaabc118c752.zip | |
Remove FontAwesome files from Valo (use directly from Base)
Deprecate ‘font’ mixin in favor of ‘v-font’. The deprecated mixin will
print a warning message to the console.
Change-Id: I28ae1d39606c2c6ff7bee2e8cc811acf7e2479a2
Diffstat (limited to 'WebContent/VAADIN/themes/base')
| -rw-r--r-- | WebContent/VAADIN/themes/base/fonts/fonts.scss | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/WebContent/VAADIN/themes/base/fonts/fonts.scss b/WebContent/VAADIN/themes/base/fonts/fonts.scss index 2a882ab53d..608fe7c280 100644 --- a/WebContent/VAADIN/themes/base/fonts/fonts.scss +++ b/WebContent/VAADIN/themes/base/fonts/fonts.scss @@ -3,10 +3,10 @@ } @mixin fonticons { - @include font(FontAwesome, fontawesome-webfont); + @include v-font(FontAwesome, fontawesome-webfont); } -@mixin font($font-family, $file-name) { +@mixin v-font($font-family, $file-name) { @font-face { font-family: '#{$font-family}'; src: url('#{$file-name}.eot'); @@ -23,3 +23,8 @@ display: inline-block; } } + +@mixin font($font-family, $file-name) { + @warn "The 'font' mixin is DEPRECATED. You should use the corresponding 'v-font' mixin instead."; + @include v-font($font-family, $file-name); +} |