From c9ff1bf872cb3c2c3ea10f1bf59ff974c87ba6a0 Mon Sep 17 00:00:00 2001
From: SethBurkart123 <hi25S.burkart@hills.adventist.edu.au>
Date: Fri, 2 Feb 2024 15:06:39 +1100
Subject: [PATCH] fix: popup button missing VITAL css :)

---
 src/SEQTA.ts                | 40 ++++++++++++++++++++-----------------
 src/css/documentload.scss   |  2 ++
 src/css/injected.scss       | 21 +++++++------------
 src/css/injected/popup.scss |  6 ++++++
 4 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/src/SEQTA.ts b/src/SEQTA.ts
index 8bc1af99..9552853f 100644
--- a/src/SEQTA.ts
+++ b/src/SEQTA.ts
@@ -58,13 +58,16 @@ document.addEventListener(
     if (hasSEQTAText && hasSEQTATitle && !IsSEQTAPage) {
       IsSEQTAPage = true
       console.log('[BetterSEQTA+] Verified SEQTA Page')
-
-      import('./css/injected.scss')
       import('./css/documentload.scss')
 
+      
       enableCurrentTheme()
       try {
         const items = await browser.storage.local.get() as SettingsState
+
+        if (items.onoff) {
+          import('./css/injected.scss')
+        }
         
         main(items)
       } catch (error: any) {
@@ -739,32 +742,33 @@ function InjectCustomIcons() {
 }
 
 export function AppendElementsToDisabledPage() {
+  console.log("Appending elements to disabled page")
   AddBetterSEQTAElements(false)
 
   let settingsStyle = document.createElement('style')
-  settingsStyle.innerText = `
+  settingsStyle.innerHTML = `
   .addedButton {
-    position: absolute !important
-    right: 50px
-    width: 35px
-    height: 35px
-    padding: 6px !important
-    overflow: unset !important
-    border-radius: 50%
-    margin: 7px !important
-    cursor: pointer
-    color: white !important
+    position: absolute !important;
+    right: 50px;
+    width: 35px;
+    height: 35px;
+    padding: 6px !important;
+    overflow: unset !important;
+    border-radius: 50%;
+    margin: 7px !important;
+    cursor: pointer;
+    color: white !important;
   }
   .addedButton svg {
-    margin: 6px
+    margin: 6px;
   }
   .outside-container {
-    top: 48px !important
+    top: 48px !important;
   }
   #ExtensionPopup {
-    border-radius: 1rem
-    box-shadow: 0px 0px 20px -2px rgba(0, 0, 0, 0.6)
-    transform-origin: 70% 0
+    border-radius: 1rem;
+    box-shadow: 0px 0px 20px -2px rgba(0, 0, 0, 0.6);
+    transform-origin: 70% 0;
   }
   `
   document.head.append(settingsStyle)
diff --git a/src/css/documentload.scss b/src/css/documentload.scss
index cce501de..8d332a3f 100644
--- a/src/css/documentload.scss
+++ b/src/css/documentload.scss
@@ -15,6 +15,8 @@
  * along with EvenBetterSEQTA.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+@import './injected/popup.scss';
+
 html {
   background: #161616 !important;
   background-color: #161616;
diff --git a/src/css/injected.scss b/src/css/injected.scss
index 7b641bc9..9451addf 100644
--- a/src/css/injected.scss
+++ b/src/css/injected.scss
@@ -1,7 +1,6 @@
 @charset "UTF-8";
 @import url('https://fonts.googleapis.com/css?family=Rubik:300,400,500,600');
 
-@import './injected/popup.scss';
 @import './injected/sidebar-animation.scss';
 @import './injected/theme.scss';
 @import './injected/transparency.scss';
@@ -1112,11 +1111,7 @@ div > ol:has(.uiFileHandlerWrapper) {
   border-radius: 1rem;
   box-shadow: 0px 10px 15px -3px rgba(0, 0, 0, 0.4);
 }
-#ExtensionPopup {
-  border-radius: 1rem;
-  box-shadow: 0px 0px 20px -2px rgba(0, 0, 0, 0.6);
-  transform-origin: 70% 0;
-}
+
 #menu li.active {
   color: #ffffff !important;
   background: rgba(0, 0, 0, 0.35);
@@ -1419,12 +1414,14 @@ ul {
 .title {
   color: var(--text-primary) !important;
 }
-.dailycal > .content > .wrapper > .days > tbody > tr > td > .entriesWrapper > .entry[data-yiq="light"],
-.dailycal > .content > .wrapper > .days > tbody > tr > td > .entriesWrapper > .entry[data-yiq="light"] .title {
+.entry[data-yiq="light"],
+.quickbar[data-yiq="light"] .title,
+.entry[data-yiq="light"] .title {
   color: #fff !important;
 }
-.dailycal > .content > .wrapper > .days > tbody > tr > td > .entriesWrapper > .entry[data-yiq="dark"],
-.dailycal > .content > .wrapper > .days > tbody > tr > td > .entriesWrapper > .entry[data-yiq="dark"] .title {
+.entry[data-yiq="dark"],
+.quickbar[data-yiq="dark"] .title,
+.entry[data-yiq="dark"] .title {
   color: #000 !important;
 }
 div.entry.class {
@@ -1994,10 +1991,6 @@ li.MessageList__unread___3imtO {
 .menuShown #menuToggle .hamburger-line:nth-child(3) {
   transform: translateY(-6px) rotate(-45deg);
 }
-#AddedSettings {
-  top: 17.5px !important;
-  z-index: 21 !important;
-}
 .day-empty {
   font-size: 30px;
   display: flex;
diff --git a/src/css/injected/popup.scss b/src/css/injected/popup.scss
index 484409c1..e40d80e4 100644
--- a/src/css/injected/popup.scss
+++ b/src/css/injected/popup.scss
@@ -28,4 +28,10 @@
   object-fit: cover;
   pointer-events: none;
   border: none !important;
+}
+
+#ExtensionPopup {
+  border-radius: 1rem;
+  box-shadow: 0px 0px 20px -2px rgba(0, 0, 0, 0.6);
+  transform-origin: 70% 0;
 }
\ No newline at end of file