Small changes to merged PR #33

GODrums · Oct 19, 2023 · 415c058 · 415c058
1 parent 3362254
commit 415c058
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -78,9 +78,9 @@ In some cases, Firefox does not grant extensions necessary permissions automatic
 <div style="display: flex; flex-direction: row; align-items: center; flex-wrap: wrap; gap: 1rem;">
 <img align="center" src="https://icongr.am/devicon/typescript-original.svg?size=128&color=currentColor" alt="Typescript" width="50" height="50">
 <img align="center" src="https://icongr.am/devicon/webpack-original-wordmark.svg?size=128&color=currentColor" alt="Typescript" width="100">
-<img align="center" src="https://cdn.jsdelivr.net/gh/devicons/devicon/icons/tailwindcss/tailwindcss-original-wordmark.svg" alt="Typescript" width="100">
 <img align="center" src="https://cdn.jsdelivr.net/gh/devicons/devicon/icons/eslint/eslint-original-wordmark.svg" alt="Typescript" width="100">
 <img align="center" src="https://raw.githubusercontent.com/prettier/prettier-logo/master/images/prettier-banner-dark.svg" alt="Typescript" width="100">
+<img align="center" src="https://cdn.jsdelivr.net/gh/devicons/devicon/icons/jquery/jquery-plain-wordmark.svg" alt="Typescript" width="50" height="50">
 <img align="center" src="https://cdn.jsdelivr.net/gh/devicons/devicon/icons/mocha/mocha-plain.svg" alt="Typescript" height="50" width="50">
 </div>
 

diff --git a/css/popup.css b/css/popup.css
@@ -350,12 +350,12 @@ input[type="color"]::-webkit-color-swatch-wrapper {
     flex-direction: row;
     justify-content: space-between;
     align-items: center;
+    padding-right: 15px;
 }
 
 .ResetColorsIcon {
-    width: 25px;
-    height: 25px;
-    margin-right: 15px;
+    width: 22px;
+    height: 22px;
     display: inline-block;
     vertical-align: middle;
     filter: invert(82%) sepia(3%) saturate(242%) hue-rotate(202deg) brightness(85%) contrast(92%);

diff --git a/html/csfloat.html b/html/csfloat.html
@@ -98,7 +98,7 @@
 <div class="Group">
     <div class="GroupHeader ColorsHeader">
         <span>COLORS</span>
-        <img src="../public/reset.svg" class="ResetColorsIcon" id="resetColors" title="Reset to default colors" site="csfloat" />
+        <img src="../public/rotate-left-solid.svg" class="ResetColorsIcon" id="resetColors" title="Reset to default colors" site="csfloat" />
     </div>
     <div class="GroupElement">
         <p class="ElementText" title="Default: #008000">Profit color</p>

diff --git a/html/skinbid.html b/html/skinbid.html
@@ -45,7 +45,7 @@
 <div class="Group">
     <div class="GroupHeader ColorsHeader">
         <span>COLORS</span>
-        <img src="../public/reset.svg" class="ResetColorsIcon" id="resetColors" title="Reset to default colors" site="skinbid" />
+        <img src="../public/rotate-left-solid.svg" class="ResetColorsIcon" id="resetColors" title="Reset to default colors" site="skinbid" />
     </div>
     <div class="GroupElement">
         <p class="ElementText" title="Default: #008000">Profit color</p>

diff --git a/html/skinport.html b/html/skinport.html
@@ -79,7 +79,7 @@
 <div class="Group">
     <div class="GroupHeader ColorsHeader">
         <span>COLORS</span>
-        <img src="../public/reset.svg" class="ResetColorsIcon" id="resetColors" title="Reset to default colors" site="skinport" />
+        <img src="../public/rotate-left-solid.svg" class="ResetColorsIcon" id="resetColors" title="Reset to default colors" site="skinport" />
     </div>
     <div class="GroupElement">
         <p class="ElementText" title="Default: #008000">Profit color</p>

diff --git a/public/reset.svg b/public/reset.svg
diff --git a/public/rotate-left-solid.svg b/public/rotate-left-solid.svg
diff --git a/src/background.ts b/src/background.ts
@@ -47,7 +47,7 @@ export const defaultSettings: Extension.Settings = {
         skinbid: {
             profit: "#0cb083",
             loss: "#ce0000",
-            neutral: "#000000"
+            neutral: "#FFFFFF"
         }
     }
 };

diff --git a/src/popup.ts b/src/popup.ts
@@ -61,7 +61,7 @@ function addListeners() {
         if (attrName) {
             const [site, color] = attrName.split('-');
 
-            chrome.storage.local.get((data) => {
+            chrome.storage.local.get(['colors']).then((data) => {
                 if (data.colors && data.colors[site]) {
                     data.colors[site][color] = $(this).val();
                     chrome.storage.local.set({
@@ -103,6 +103,10 @@ function addListeners() {
         $('#InputProfitColor').val(defaultColors[attrSite].profit);
         $('#InputLossColor').val(defaultColors[attrSite].loss);
         $('#InputNeutralColor').val(defaultColors[attrSite].neutral);
+
+        $('.SideBar').css('height', '528px');
+        $('.MainContent').css('height', '528px');
+        $('.Warning').show(100);
     });
 }