Fix scrollbars on info, legal, and issues; add theming to legal and i…

…ssues (#1096) * Add theming support to generic-page-main.js * Mark scrollbars on info, issues, and legal * Remove quick-start-guide-main.js in favor of generic-page-main.js * Default body to hidden on issues and legal
yomidevs · Jun 20, 2024 · 8f33cb7 · 8f33cb7
1 parent 9f4e595
commit 8f33cb7
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 48 deletions.
diff --git a/ext/info.html b/ext/info.html
@@ -18,7 +18,7 @@
 <body hidden>
 
 <!-- Main content -->
-<div class="content-outer"><div class="content">
+<div class="content-outer"><div class="content scrollbar">
 <div class="content-left"></div>
 <div class="content-center">
 

diff --git a/ext/issues.html b/ext/issues.html
@@ -15,10 +15,10 @@
     <link rel="stylesheet" type="text/css" href="/css/settings.css">
     <script src="/js/pages/generic-page-main.js" type="module"></script>
 </head>
-<body>
+<body hidden>
 
 <!-- Main content -->
-<div class="content-outer"><div class="content">
+<div class="content-outer"><div class="content scrollbar">
 <div class="content-left"></div>
 <div class="content-center">
 

diff --git a/ext/js/pages/generic-page-main.js b/ext/js/pages/generic-page-main.js
@@ -16,18 +16,33 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+import {ThemeController} from '../app/theme-controller.js';
+import {Application} from '../application.js';
 import {DocumentFocusController} from '../dom/document-focus-controller.js';
 import {ExtensionContentController} from './common/extension-content-controller.js';
+import {SettingsController} from './settings/settings-controller.js';
+
+await Application.main(true, async (application) => {
+    const settingsController = new SettingsController(application);
+    await settingsController.prepare();
+    /** @type {ThemeController} */
+    const themeController = new ThemeController(document.documentElement);
+    themeController.prepare();
+    const optionsFull = await application.api.optionsGetFull();
+    const {profiles, profileCurrent} = optionsFull;
+    const primaryProfile = (profileCurrent >= 0 && profileCurrent < profiles.length) ? profiles[profileCurrent] : null;
+    if (primaryProfile !== null) {
+        themeController.theme = primaryProfile.options.general.popupTheme;
+        themeController.siteOverride = true;
+        themeController.updateTheme();
+    }
+    document.body.hidden = false;
 
-/** Entry point. */
-function main() {
     const documentFocusController = new DocumentFocusController();
     documentFocusController.prepare();
 
     const extensionContentController = new ExtensionContentController();
     extensionContentController.prepare();
 
     document.documentElement.dataset.loaded = 'true';
-}
-
-main();
+});
diff --git a/ext/js/pages/quick-start-guide-main.js b/ext/js/pages/quick-start-guide-main.js
diff --git a/ext/legal.html b/ext/legal.html
@@ -17,11 +17,11 @@
    <script src="/js/pages/generic-page-main.js" type="module"></script>
 </head>
 
-<body>
+<body hidden>
 
    <!-- Main content -->
    <div class="content-outer">
-      <div class="content">
+      <div class="content scrollbar">
          <div class="content-left"></div>
          <div class="content-center">
 

diff --git a/ext/quick-start-guide.html b/ext/quick-start-guide.html
@@ -13,7 +13,7 @@
     <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
     <link rel="stylesheet" type="text/css" href="/css/material.css">
     <link rel="stylesheet" type="text/css" href="/css/settings.css">
-    <script src="/js/pages/quick-start-guide-main.js" type="module"></script>
+    <script src="/js/pages/generic-page-main.js" type="module"></script>
 </head>
 <body hidden>