Merge pull request #10 from SinclaM/finalize-mathquill-overrides

Finalize mathquill overrides
SinclaM · Jul 23, 2022 · 9375d4f · 9375d4f
2 parents 03e453d + 1ab5328
commit 9375d4f
Show file tree

Hide file tree

Showing 22 changed files with 4,011 additions and 2,936 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -1,2 +1,3 @@
 node_modules/
 dist/
+src/preload/extend_mathquill.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "desmos-unlocked",
-    "version": "1.0.7",
+    "version": "1.1.0",
     "description": "Browser extension for better user control of the Desmos graphing calculator configuration ",
     "main": "background.js",
     "scripts": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://github.com/SinclaM/desmos-unlocked#readme",
     "devDependencies": {
-        "@types/chrome": "0.0.135",
+        "@types/chrome": "0.0.193",
         "@types/sinon": "^10.0.0",
         "@typescript-eslint/eslint-plugin": "4.17.0",
         "@typescript-eslint/parser": "4.17.0",

diff --git a/public/chrome_manifest.json b/public/chrome_manifest.json
@@ -1,8 +1,8 @@
 {
     "name": "Desmos Unlocked",
-    "version": "1.0.7",
+    "version": "1.1.0",
     "description": "Browser extension for better user control of the Desmos graphing calculator configuration",
-    "permissions": ["storage", "declarativeNetRequest", "declarativeNetRequestWithHostAccess", "webRequest"],
+    "permissions": ["storage", "declarativeNetRequestWithHostAccess", "webRequest"],
     "manifest_version": 3,
     "background": {
         "service_worker": "background.js"
@@ -35,15 +35,6 @@
             "128": "images/logo/128.png"
         }
     },
-    "declarative_net_request": {
-        "rule_resources": [
-            {
-                "id": "ruleset_1",
-                "enabled": true,
-                "path": "net_request_rules.json"
-            }
-        ]
-    },
     "icons": {
         "16": "images/logo/16.png",
         "32": "images/logo/32.png",

diff --git a/public/edge_manifest.json b/public/edge_manifest.json
@@ -1,8 +1,8 @@
 {
     "name": "Desmos Unlocked",
-    "version": "1.0.7",
+    "version": "1.1.0",
     "description": "Browser extension for better user control of the Desmos graphing calculator configuration",
-    "permissions": ["storage", "declarativeNetRequest", "declarativeNetRequestWithHostAccess", "webRequest"],
+    "permissions": ["storage", "declarativeNetRequestWithHostAccess", "webRequest"],
     "manifest_version": 3,
     "background": {
         "service_worker": "background.js"
@@ -35,15 +35,6 @@
             "128": "images/logo/128.png"
         }
     },
-    "declarative_net_request": {
-        "rule_resources": [
-            {
-                "id": "ruleset_1",
-                "enabled": true,
-                "path": "net_request_rules.json"
-            }
-        ]
-    },
     "icons": {
         "16": "images/logo/16.png",
         "32": "images/logo/32.png",

diff --git a/public/firefox_manifest.json b/public/firefox_manifest.json
@@ -1,6 +1,6 @@
 {
     "name": "Desmos Unlocked",
-    "version": "1.0.7",
+    "version": "1.1.0",
     "description": "Browser extension for better user control of the Desmos graphing calculator configuration",
     "permissions": ["https://*.desmos.com/*", "storage", "webRequest", "webRequestBlocking"],
     "manifest_version": 2,

diff --git a/public/images/extern-link.svg b/public/images/extern-link.svg
diff --git a/public/net_request_rules.json b/public/net_request_rules.json
diff --git a/public/opera_manifest.json b/public/opera_manifest.json
@@ -1,8 +1,8 @@
 {
     "name": "Desmos Unlocked",
-    "version": "1.0.7",
+    "version": "1.1.0",
     "description": "Browser extension for better user control of the Desmos graphing calculator configuration",
-    "permissions": ["storage", "declarativeNetRequest", "declarativeNetRequestWithHostAccess", "webRequest"],
+    "permissions": ["storage", "declarativeNetRequestWithHostAccess", "webRequest"],
     "manifest_version": 3,
     "background": {
         "service_worker": "background.js"
@@ -35,15 +35,6 @@
             "128": "images/logo/128.png"
         }
     },
-    "declarative_net_request": {
-        "rule_resources": [
-            {
-                "id": "ruleset_1",
-                "enabled": true,
-                "path": "net_request_rules.json"
-            }
-        ]
-    },
     "icons": {
         "16": "images/logo/16.png",
         "32": "images/logo/32.png",

diff --git a/public/popup.css b/public/popup.css
@@ -25,17 +25,38 @@ header {
     padding-right: 25px;
 }
 
-a {
+header a {
     display: flex;
     width: 17%;
     align-items: center;
     justify-content: space-between;
 }
 
-a img {
+header a img {
     padding-right: 5px;
 }
 
+#config-container a {
+    text-decoration: none;
+}
+
+#config-container a,
+#config-container a:visited,
+#config-container a:hover,
+#config-containera:active {
+    color: inherit;
+}
+
+#config-container a[href^="http"]::after,
+#config-container a[href^="https://"]::after
+{
+    content: url(./images/extern-link.svg);
+    width: 11px;
+    height: 11px;
+    margin-left: 7px;
+    display: inline-block;
+}
+
 #github-image {
     height: 40px;
 }
@@ -213,11 +234,14 @@ h2 {
     align-items: center;
 }
 
+textarea {
+    resize: none;
+    font-size: 1.4em;
+}
+
 #breakout textarea {
     flex-grow: 0.5;
     height: 1.5em;
-    resize: none;
-    font-size: 1.4em;
 }
 
 #set-chars {
@@ -230,3 +254,30 @@ h2 {
     grid-template-columns: 260px 100px;
     align-items: center;
 }
+
+#extend-mq h2 {
+    margin-top: 10px;
+    margin-bottom: 0px;
+}
+
+#collapsible textarea {
+    grid-row: 1 / span 3;
+}
+
+#collapsible .container {
+    display: grid;
+    grid-template-columns: 70% 25%;
+    grid-template-rows: 3em 3em 3em;
+    row-gap: 10px;
+    column-gap: 10px;
+}
+
+#collapsible button {
+    height: 20px;
+    padding: 0px;
+    align-self: center;
+}
+
+#error-bar {
+    color: #cc0000;
+}