From cc682230e2715ad69f1b9b7f09bb4125d1f6ba34 Mon Sep 17 00:00:00 2001 From: SirStendec Date: Thu, 22 Mar 2018 22:39:27 -0400 Subject: [PATCH] Add info and question icons. Bump version to beta1.7. Add chat badge visibility. Add support for setting inheritance merge strategies. --- changelog.html | 10 ++ res/font/ffz-fontello.eot | Bin 15664 -> 16220 bytes res/font/ffz-fontello.svg | 6 +- res/font/ffz-fontello.ttf | Bin 15480 -> 16036 bytes res/font/ffz-fontello.woff | Bin 9524 -> 9816 bytes res/font/ffz-fontello.woff2 | Bin 8004 -> 8204 bytes src/main.js | 2 +- src/modules/chat/badges.js | 11 ++- .../main_menu/components/badge-visibility.vue | 92 +++++++++++------- src/modules/main_menu/setting-mixin.js | 15 ++- src/settings/context.js | 31 ++++-- src/settings/types.js | 81 +++++++++++++++ .../twitch-twilight/modules/chat/line.js | 1 + styles/icons.scss | 2 + styles/widgets.scss | 1 + styles/widgets/badge-visibility.scss | 21 ++++ 16 files changed, 222 insertions(+), 51 deletions(-) create mode 100644 src/settings/types.js create mode 100644 styles/widgets/badge-visibility.scss diff --git a/changelog.html b/changelog.html index 21482a70..a8efb70a 100644 --- a/changelog.html +++ b/changelog.html @@ -1,3 +1,13 @@ +
4.0.0-beta1.7@a50bda0e204137eb8f28
+ + +
4.0.0-beta1.7@18be0a772c267953f6e3
+ +
4.0.0-beta1.6@d2469b218214357ed0c0