Merge pull request #15 from 2coolchampion/dev

Dev
2coolchampion · Dec 15, 2023 · 53d132b · 53d132b
2 parents 230f3db + 79ad2fb
commit 53d132b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/src/pages/background/index.ts b/src/pages/background/index.ts
@@ -19,6 +19,7 @@ chrome.runtime.onInstalled.addListener(async () => {
     matches: ['*://*/*'],
     js: ["src/pages/content/index.js"],
     // KEY for cache invalidation
+    css: ["Global.chunk.css"],
     // css: ["assets/css/contentStyle.chunk.css"],
   }]).then(async () => {
     const registeredScripts = await chrome.scripting.getRegisteredContentScripts();

diff --git a/src/pages/content/components/Demo/app.tsx b/src/pages/content/components/Demo/app.tsx
@@ -1,4 +1,5 @@
 import { useEffect } from "react";
+import Styles from "@src/global.css";
 
 export default function App() {
   useEffect(() => {
@@ -7,8 +8,9 @@ export default function App() {
 
   return (
     <>
+    <style>{Styles}</style>
       <div 
-        className="text-lime-400 p-4 w-screen bg-red-400"
+        className="text-lime-400 p-4 w-screen bg-red-400 font-sans" // Need to set the font family because otherwise it would inherit from website.
       >
         content view
         <button

diff --git a/src/pages/content/components/Demo/index.tsx b/src/pages/content/components/Demo/index.tsx
@@ -1,13 +1,11 @@
 import { createRoot } from "react-dom/client";
-import '../../../../global.css'
 import App from "@src/pages/content/components/Demo/app";
 import refreshOnUpdate from "virtual:reload-on-update-in-view";
 
 refreshOnUpdate("pages/content");
 
 const root = document.createElement("div");
 root.id = "fictional-fortnight-content-view-root";
-root.style.all = "unset";
 
 document.body.append(root);
 

diff --git a/src/pages/popup/Popup.tsx b/src/pages/popup/Popup.tsx
@@ -66,6 +66,7 @@ const Popup = () => {
               updatedList.map((site) => `*://${site}/*`) :
               whitelist.map((site) => `*://${site}/*`),
               js: ["src/pages/content/index.js"],
+              css: ["./assets/css/_virtual_reload-on-update-in-view.chunk.css"],
             }
           ])
     } else if (mode === 'blacklist') {
@@ -78,6 +79,7 @@ const Popup = () => {
           updatedList.map((site) => `*://${site}/*`) : 
           blacklist.map((site) => `*://${site}/*`),
           js: ["src/pages/content/index.js"],
+          css: ["./assets/css/_virtual_reload-on-update-in-view.chunk.css"],
         }
       ])
     }
@@ -282,14 +284,14 @@ const Popup = () => {
   const renderButton = () => {
     if (isOnList()) {
       return (
-        <button className="text-sm p-1 border-1 border-red-500" onClick={removeFromList}>
+        <button className="text-sm p-1 border border-red-500" onClick={removeFromList}>
           -
           {currentSiteHostname}
         </button>
       );
     } else {
       return (
-        <button className="text-sm p-1 border-1 border-green-500" onClick={addToList}>
+        <button className="text-sm p-1 border border-green-500" onClick={addToList}>
           +
           {currentSiteHostname}
         </button>