From 92e9f69c8069644c544301a51fbbd351e799e99d Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Wed, 25 Nov 2020 23:22:05 -0500 Subject: Popup style updates (#1066) * Replace compactGlossaries option with new glossaryLayoutMode option * Update attributes * Update attributes * Update color definitions * Fix default theme scrollbar --- ext/fg/css/client.css | 4 ++-- ext/fg/float.html | 2 +- ext/fg/js/popup.js | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) (limited to 'ext/fg') diff --git a/ext/fg/css/client.css b/ext/fg/css/client.css index 227f5030..0957c758 100644 --- a/ext/fg/css/client.css +++ b/ext/fg/css/client.css @@ -28,8 +28,8 @@ iframe.yomichan-float { box-sizing: border-box; } -iframe.yomichan-float[data-yomichan-theme=dark], -iframe.yomichan-float[data-yomichan-theme=auto][data-yomichan-site-color=dark] { +iframe.yomichan-float[data-outer-theme=dark], +iframe.yomichan-float[data-outer-theme=auto][data-site-color=dark] { background-color: #1e1e1e; border: 1px solid #666; box-shadow: 0 0 10px rgba(255, 255, 255, 0.5); diff --git a/ext/fg/float.html b/ext/fg/float.html index 36aedb7a..5874f44d 100644 --- a/ext/fg/float.html +++ b/ext/fg/float.html @@ -1,5 +1,5 @@ - + diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js index 00afb773..b3af3d6f 100644 --- a/ext/fg/js/popup.js +++ b/ext/fg/js/popup.js @@ -186,8 +186,10 @@ class Popup extends EventDispatcher { } updateTheme() { - this._frame.dataset.yomichanTheme = this._options.general.popupOuterTheme; - this._frame.dataset.yomichanSiteColor = this._getSiteColor(); + const {popupTheme, popupOuterTheme} = this._options.general; + this._frame.dataset.theme = popupTheme; + this._frame.dataset.outerTheme = popupOuterTheme; + this._frame.dataset.siteColor = this._getSiteColor(); } async setCustomOuterCss(css, useWebExtensionApi) { -- cgit v1.2.3