v6.3.0

magicoflolis · magicoflolis · commit 737c7be33092 · 2024-03-01T14:42:05.000-08:00
Signed-off-by: Magic &lt;magicoflolis@tuta.io&gt;
diff --git a/dist/magic-userjs.user.js b/dist/magic-userjs.user.js
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "url": "https://github.com/magicoflolis/Userscript-Plus/issues/new"
   },
   "userJS": {
-    "version": "6.2.1",
+    "version": "6.3.0",
     "name": "Magic Userscript+ : Show Site All UserJS",
     "bugs": "https://github.com/magicoflolis/Userscript-Plus/issues/new",
     "homepage": "https://github.com/magicoflolis/Userscript-Plus",
@@ -33,10 +33,10 @@
     "web-run:firefox-android": "web-ext run --config=./tools/web-ext.js -t firefox-android --firefox-apk org.mozilla.firefox"
   },
   "devDependencies": {
-    "@swc/cli": "^0.3.9",
+    "@swc/cli": "^0.3.10",
     "@swc/core": "^1.4.2",
-    "@types/chrome": "0.0.260",
-    "@types/firefox-webext-browser": "120.0.0",
+    "@types/chrome": "0.0.262",
+    "@types/firefox-webext-browser": "120.0.1",
     "@types/greasemonkey": "4.0.7",
     "@types/tampermonkey": "^5.0.2",
     "@violentmonkey/types": "0.1.7",
@@ -46,11 +46,11 @@
     "crx3": "^1.1.3",
     "css-loader": "^6.10.0",
     "dotenv": "^16.4.5",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "globals": "^14.0.0",
     "http-server": "^14.1.1",
-    "mini-css-extract-plugin": "^2.8.0",
+    "mini-css-extract-plugin": "^2.8.1",
     "node-watch": "^0.7.4",
     "path-browserify": "^1.0.1",
     "prettier": "^3.2.5",
diff --git a/src/UserJS/main.js b/src/UserJS/main.js
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
@@ -88,5 +88,8 @@
   },
   "save": {
     "message": "Save"
+  },
+  "reset": {
+    "message": "Reset"
   }
 }
diff --git a/src/_locales/en_GB/messages.json b/src/_locales/en_GB/messages.json
@@ -82,5 +82,8 @@
   },
   "save": {
     "message": "Save"
+  },
+  "reset": {
+    "message": "Reset"
   }
 }
diff --git a/src/_locales/es/messages.json b/src/_locales/es/messages.json
@@ -88,5 +88,8 @@
   },
   "save": {
     "message": "Guardar"
+  },
+  "reset": {
+    "message": "Reiniciar"
   }
 }
diff --git a/src/_locales/fr/messages.json b/src/_locales/fr/messages.json
@@ -88,5 +88,8 @@
   },
   "save": {
     "message": "Sauvez"
+  },
+  "reset": {
+    "message": "Réinitialiser"
   }
 }
diff --git a/src/_locales/ja/messages.json b/src/_locales/ja/messages.json
@@ -88,5 +88,8 @@
   },
   "save": {
     "message": "拯救"
+  },
+  "reset": {
+    "message": "リセット"
   }
 }
diff --git a/src/_locales/nl/messages.json b/src/_locales/nl/messages.json
@@ -88,5 +88,8 @@
   },
   "save": {
     "message": "Opslaan"
+  },
+  "reset": {
+    "message": "Opnieuw instellen"
   }
 }
diff --git a/src/_locales/ru/messages.json b/src/_locales/ru/messages.json
@@ -88,5 +88,8 @@
   },
   "save": {
     "message": "Сохранить"
+  },
+  "reset": {
+    "message": "Перезагрузить"
   }
 }
diff --git a/src/_locales/zh/messages.json b/src/_locales/zh/messages.json
@@ -88,5 +88,8 @@
   },
   "save": {
     "message": "拯救"
+  },
+  "reset": {
+    "message": "重置"
   }
 }
diff --git a/src/_locales/zh_CN/messages.json b/src/_locales/zh_CN/messages.json
@@ -88,5 +88,8 @@
   },
   "save": {
     "message": "拯救"
+  },
+  "reset": {
+    "message": "重置"
   }
 }
diff --git a/src/_locales/zh_TW/messages.json b/src/_locales/zh_TW/messages.json
@@ -88,5 +88,8 @@
   },
   "save": {
     "message": "拯救"
+  },
+  "reset": {
+    "message": "重置"
   }
 }
diff --git a/src/sass/_main.scss b/src/sass/_main.scss
@@ -1,9 +1,3 @@
-$chDefault: hsla(0, 0%, 100%, 0.568);
-$chGF: hsla(197, 100%, 50%, 0.568);
-$chGit: hsla(213, 13%, 16%, 0.568);
-$chOpen: hsla(12, 86%, 50%, 0.568);
-$txtAreaBG: hsl(0, 0%, 0%);
-
 mujs-root {
   --mujs-even-row: hsl(222, 14%, 22%);
   --mujs-odd-row: hsl(222, 14%, 11%);
@@ -15,6 +9,11 @@ mujs-root {
   --mujs-sf-btn-color: hsl(12, 86%, 50%);
   --mujs-sf-txt-color: hsl(12, 79%, 55%);
   --mujs-txt-color: hsl(0, 0%, 100%);
+  --mujs-chck-color: hsla(0, 0%, 100%, 0.568);
+  --mujs-chck-gf: hsla(197, 100%, 50%, 0.568);
+  --mujs-chck-git: hsla(213, 13%, 16%, 0.568);
+  --mujs-chck-open: hsla(12, 86%, 50%, 0.568);
+  --mujs-placeholder: hsl(81, 56%, 54%);
 }
 
 mujs-root * {
@@ -212,6 +211,22 @@ mu-js {
     outline: none !important;
   }
 
+  textarea {
+    overflow-y: auto;
+    color: var(--mujs-placeholder, hsl(81, 56%, 54%));
+    background-color: var(--mujs-even-row, hsl(222, 14%, 18%));
+    border: 1px solid transparent;
+    border-radius: 10px;
+    resize: vertical;
+    outline: none;
+    font-family: monospace;
+    font-size: 14px;
+
+    &:focus {
+      outline: none;
+    }
+  }
+
   th,
   .mujs-cfg *:not(input[type='password'], input[type='text'], input[type='number']) {
     -webkit-user-select: none !important;
@@ -289,7 +304,7 @@ count-frame {
   .mujs-ratings {
     padding: 0 0.25em;
     border: 1px solid var(--mujs-txt-color, hsl(0, 0%, 100%));
-    border-radius: 16px;
+    border-radius: 1000px;
   }
 
   mu-jsbtn {
@@ -432,7 +447,7 @@ count-frame {
 
         // background-color: hsl(218, 38%, 13%);
         mujs-a {
-          color: hsl(81, 56%, 54%);
+          color: var(--mujs-placeholder, hsl(81, 56%, 54%));
 
           &:hover {
             color: hsl(81, 56%, 43%);
@@ -445,8 +460,8 @@ count-frame {
 
         mu-jsbtn {
           color: hsl(215, 47%, 24%);
-          background-color: hsl(81, 56%, 54%);
-          border-color: hsl(81, 56%, 54%);
+          background-color: var(--mujs-placeholder, hsl(81, 56%, 54%));
+          border-color: var(--mujs-placeholder, hsl(81, 56%, 54%));
 
           &:hover {
             background-color: hsl(81, 56%, 65%);
@@ -473,6 +488,25 @@ count-frame {
           width: -moz-fit-content;
           width: fit-content;
         }
+        mu-jsbtn,
+        mu-js {
+          height: -webkit-fit-content;
+          height: -moz-fit-content;
+          height: fit-content;
+        }
+        >mu-jsbtn {
+          margin: auto;
+        }
+        >mujs-column {
+          >mu-jsbtn {
+            padding: 0px 7px;
+          }
+        }
+        >textarea {
+          background-color: inherit;
+          border: 1px solid var(--mujs-txt-color, hsl(0, 0%, 100%));
+          border-radius: 14px;
+        }
       }
 
       >.mujs-uframe {
@@ -540,36 +574,56 @@ count-frame {
         border-radius: 4px;
         border: 1px solid var(--mujs-txt-color, hsl(0, 0%, 100%));
       }
+
+      input[type='text']::-webkit-input-placeholder {
+        color: var(--mujs-placeholder, hsl(81, 56%, 54%));
+      }
+
+      input[type='text']::-moz-placeholder {
+        color: var(--mujs-placeholder, hsl(81, 56%, 54%));
+      }
+
+      input[type='text']:-ms-input-placeholder {
+        color: var(--mujs-placeholder, hsl(81, 56%, 54%));
+      }
+
+      input[type='text']::-ms-input-placeholder {
+        color: var(--mujs-placeholder, hsl(81, 56%, 54%));
+      }
+
+      input[type='text']::placeholder {
+        color: var(--mujs-placeholder, hsl(81, 56%, 54%));
+      }
     }
   }
 
   .mujs-inlab {
     position: relative;
     width: 38px;
 
-    input[type*='checkbox'] {
+    input[type='checkbox'] {
       display: none;
 
       &:checked+label {
         margin-left: 0;
-        background-color: $chDefault;
+        background-color: var(--mujs-chck-color, hsla(0, 0%, 100%, 0.568));
 
         &:before {
           right: 0px;
         }
       }
 
-      &[id='greasyfork']:checked+label,
-      &[id='sleazyfork']:checked+label {
-        background-color: $chGF;
+      &[data-name='greasyfork']:checked+label,
+      &[data-name='sleazyfork']:checked+label {
+        background-color: var(--mujs-chck-gf, hsla(197, 100%, 50%, 0.568));
       }
 
-      &[id='openuserjs']:checked+label {
-        background-color: $chOpen;
+      &[data-name='openuserjs']:checked+label {
+        background-color: var(--mujs-chck-open, hsla(12, 86%, 50%, 0.568));
       }
 
-      &[id='github']:checked+label {
-        background-color: $chGit;
+      &[data-name='github']:checked+label {
+        background-color: var(--mujs-chck-git, hsla(213, 13%, 16%, 0.568));
       }
     }
 
@@ -597,21 +651,10 @@ count-frame {
     }
   }
 
-  [id='blacklist'] {
-    overflow-y: auto;
-    color: hsl(81, 56%, 54%);
+  [data-name='blacklist'] {
     background-color: var(--mujs-even-row, hsl(222, 14%, 18%));
     border: 1px solid transparent;
     border-radius: 10px;
-    resize: vertical;
-    outline: none;
-    border-style: none;
-    font-family: monospace;
-    font-size: 14px;
-
-    &:focus {
-      outline: none;
-    }
   }
 
   .mujs-sty-flex {
diff --git a/tests/compiled/magicuserjs.css b/tests/compiled/magicuserjs.css
diff --git a/tests/compiled/magicuserjs.css.map b/tests/compiled/magicuserjs.css.map

Original file line number	Diff line number	Diff line change
`@@ -88,5 +88,8 @@`
`88`	`88`	`},`
`89`	`89`	`"save": {`
`90`	`90`	`"message": "Save"`
	`91`	`+ },`
	`92`	`+ "reset": {`
	`93`	`+ "message": "Reset"`
`91`	`94`	`}`
`92`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,5 +82,8 @@`
`82`	`82`	`},`
`83`	`83`	`"save": {`
`84`	`84`	`"message": "Save"`
	`85`	`+ },`
	`86`	`+ "reset": {`
	`87`	`+ "message": "Reset"`
`85`	`88`	`}`
`86`	`89`	`}`