From 9f4e595c7264a52ab85eb07c4d1411e4efb09ab1 Mon Sep 17 00:00:00 2001 From: Kuuuube <61125188+Kuuuube@users.noreply.github.com> Date: Thu, 20 Jun 2024 12:03:17 -0400 Subject: Fix settings display when shadow is on auto and body is light or dark (#1089) --- ext/js/app/popup.js | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ext/js/app') diff --git a/ext/js/app/popup.js b/ext/js/app/popup.js index 75e2bd84..50e2fca9 100644 --- a/ext/js/app/popup.js +++ b/ext/js/app/popup.js @@ -24,6 +24,7 @@ import {ExtensionError} from '../core/extension-error.js'; import {deepEqual} from '../core/utilities.js'; import {addFullscreenChangeEventListener, computeZoomScale, convertRectZoomCoordinates, getFullscreenElement} from '../dom/document-util.js'; import {loadStyle} from '../dom/style-util.js'; +import {checkPopupPreviewURL} from '../pages/settings/popup-preview-controller.js'; import {ThemeController} from './theme-controller.js'; /** @@ -1014,6 +1015,10 @@ export class Popup extends EventDispatcher { const {general} = options; this._themeController.theme = general.popupTheme; this._themeController.outerTheme = general.popupOuterTheme; + this._themeController.siteOverride = checkPopupPreviewURL(optionsContext.url); + if (this._themeController.outerTheme === 'site' && this._themeController.siteOverride && ['dark', 'light'].includes(this._themeController.theme)) { + this._themeController.outerTheme = this._themeController.theme; + } this._initialWidth = general.popupWidth; this._initialHeight = general.popupHeight; this._horizontalOffset = general.popupHorizontalOffset; -- cgit v1.2.3