Fixed buttons in the general tab

4 files changed, 58 insertions, 42 deletions

diff --git a/src/pages/popup/popup.html b/src/pages/popup/popup.html
index 48f6f116..ffc1c864 100644
--- a/src/pages/popup/popup.html
+++ b/src/pages/popup/popup.html
@@ -35,7 +35,7 @@
         <h4>Reddit</h4></a>
       <input id="disable-reddit" type="checkbox">
     </div>
-    <div class="some-block" id="wikipedia"><a class="title" href="https://wikipedia.com"><img src="../../assets/images/wikipedia-icon.png">
+    <div class="some-block" id="wikipedia"><a class="title" href="https://wikipedia.com"><img src="../../assets/images/wikipedia-icon.svg">
         <h4>Wikipedia</h4></a>
       <input id="disable-wikipedia" type="checkbox">
     </div>
@@ -48,15 +48,15 @@
         <h4>Medium</h4></a>
       <input id="disable-medium" type="checkbox">
     </div>
-    <div class="some-block" id="peertube"><a class="title" href="https://peertube.com"><img src="../../assets/images/peertube-icon.png">
-        <h4>Peertube</h4></a>
+    <div class="some-block" id="peertube"><a class="title" href="https://peertube.com"><img src="../../assets/images/peertube-icon.svg">
+        <h4>PeerTube</h4></a>
       <input id="disable-peertube" type="checkbox">
     </div>
     <div class="some-block" id="lbry"><a class="title" href="https://lbry.com"><img src="../../assets/images/lbry-icon.png">
         <h4>LBRY</h4></a>
       <input id="disable-lbry" type="checkbox">
     </div>
-    <div class="some-block" id="search"><a class="title" href="https://libredirect.invalid">
+    <div class="some-block" id="search"><a class="title" href="https://search.libredirect.invalid">
         <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
           <path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"></path>
         </svg>
@@ -77,34 +77,35 @@
         <h4>Maps</h4></a>
       <input id="disable-osm" type="checkbox">
     </div>
-    <div class="some-block" id="sendTargets"><a class="title" href="https://send.invalid">
+    <div class="some-block" id="sendTargets"><a class="title" href="https://send.libredirect.invalid">
         <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
           <path d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM14 13v4h-4v-4H7l5-5 5 5h-3z"></path>
         </svg>
         <h4>Send Files</h4></a>
       <input id="disable-sendTargets" type="checkbox">
     </div>
+    <hr>
     <div class="some-block" id="change_instance_div"><a class="title button" id="change_instance">
+        <h4>Change Instance</h4>
         <svg xmlns="http://www.w3.org/2000/svg" height="26px" viewBox="0 0 24 24" width="26px" fill="currentColor">
           <path d="M12 4V1L8 5l4 4V6c3.31 0 6 2.69 6 6 0 1.01-.25 1.97-.7 2.8l1.46 1.46C19.54 15.03 20 13.57 20 12c0-4.42-3.58-8-8-8zm0 14c-3.31 0-6-2.69-6-6 0-1.01.25-1.97.7-2.8L5.24 7.74C4.46 8.97 4 10.43 4 12c0 4.42 3.58 8 8 8v3l4-4-4-4v3z"></path>
-        </svg>
-        <h4>Change Instance</h4></a></div>
-    <div class="some-block"><a class="title button" id="more-options">
-        <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="26px" viewBox="0 0 24 24" width="26px" fill="currentColor">
-          <path d="M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z"></path>
-        </svg>
-        <h4>Settings</h4></a></div>
+        </svg></a></div>
     <div class="some-block" id="copy_raw_div" title="Copy the original redirected link">        <a class="title button" id="copy_raw">
+        <h4>Copy Raw</h4>
         <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
           <path d="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm0 16H8V7h11v14z"></path>
-        </svg>
-        <h4>Copy Raw</h4></a></div>
+        </svg></a></div>
     <div class="some-block" id="unify_div" title="Unify cookies across all selected instances"><a class="title button" id="unify">
-        <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
-          <rect fill="none" height="24" width="24"></rect>
-          <path d="M18,2H9C7.9,2,7,2.9,7,4v12c0,1.1,0.9,2,2,2h9c1.1,0,2-0.9,2-2V4C20,2.9,19.1,2,18,2z M18,16H9V4h9V16z M3,15v-2h2v2H3z M3,9.5h2v2H3V9.5z M10,20h2v2h-2V20z M3,18.5v-2h2v2H3z M5,22c-1.1,0-2-0.9-2-2h2V22z M8.5,22h-2v-2h2V22z M13.5,22L13.5,22l0-2h2 v0C15.5,21.1,14.6,22,13.5,22z M5,6L5,6l0,2H3v0C3,6.9,3.9,6,5,6z"></path>
-        </svg>
-        <h4>Unify Settings</h4></a></div>
+        <h4>Unify Settings</h4>
+        <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
+          <path d="M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z"></path>
+        </svg></a></div>
+    <div class="some-block"><a class="title button" id="more-options">
+        <h4>Settings</h4>
+        <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="26px" viewBox="0 0 24 24" width="26px" fill="currentColor">
+          <path d="M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z"></path>
+        </svg></a></div>
+    <div class="space"></div>
     <script type="module" src="../options/init.js"></script>
     <script type="module" src="./popup.js"></script>
     <script src="../../assets/javascripts/localise.js"></script>
diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js
index b9c75791..824f178b 100644
--- a/src/pages/popup/popup.js
+++ b/src/pages/popup/popup.js
@@ -98,14 +98,14 @@ utils.unify(true).then(r => {
   }
 })
 
-
 document.getElementById("more-options").addEventListener("click", () => browser.runtime.openOptionsPage());
 
-generalHelper.init().then(() => {
-  let popupFrontends = generalHelper.getPopupFrontends();
-  for (const frontend of generalHelper.allPopupFrontends)
-    if (!popupFrontends.includes(frontend))
-      document.getElementById(frontend).classList.add("hide")
-    else
-      document.getElementById(frontend).classList.remove("hide")
-});
\ No newline at end of file
+browser.storage.local.get(
+  'popupFrontends',
+  r => {
+    for (const frontend of generalHelper.allPopupFrontends)
+      if (!r.popupFrontends.includes(frontend))
+        document.getElementById(frontend).classList.add("hide")
+      else
+        document.getElementById(frontend).classList.remove("hide")
+  });
\ No newline at end of file
diff --git a/src/pages/popup/popup.pug b/src/pages/popup/popup.pug
index 35234b15..5e067f3f 100644
--- a/src/pages/popup/popup.pug
+++ b/src/pages/popup/popup.pug
@@ -52,7 +52,7 @@ html(lang="en")
 
         #wikipedia.some-block
             a.title(href="https://wikipedia.com")
-                img(src="../../assets/images/wikipedia-icon.png")
+                img(src="../../assets/images/wikipedia-icon.svg")
                 h4 Wikipedia
             input#disable-wikipedia(type="checkbox")
 
@@ -64,8 +64,8 @@ html(lang="en")
 
         #peertube.some-block
             a.title(href="https://peertube.com")
-                img(src="../../assets/images/peertube-icon.png")
-                h4 Peertube
+                img(src="../../assets/images/peertube-icon.svg")
+                h4 PeerTube
             input#disable-peertube(type="checkbox")
 
         #lbry.some-block
@@ -75,7 +75,7 @@ html(lang="en")
             input#disable-lbry(type="checkbox")
 
         #search.some-block
-            a.title(href="https://libredirect.invalid")
+            a.title(href="https://search.libredirect.invalid")
                 +search
                 h4 Search
             input#disable-search(type="checkbox")
@@ -93,30 +93,34 @@ html(lang="en")
             input#disable-osm(type="checkbox")
 
         #sendTargets.some-block
-            a.title(href="https://send.invalid")
+            a.title(href="https://send.libredirect.invalid")
                 +send
                 h4 Send Files
             input#disable-sendTargets(type="checkbox")
 
+        hr
+
         #change_instance_div.some-block
             a#change_instance.title.button
-                +change_instance
                 h4 Change Instance
-
-        .some-block
-            a#more-options.title.button
-                +settings
-                h4 Settings
+                +change_instance
 
         #copy_raw_div.some-block(title="Copy the original redirected link")         
             a#copy_raw.title.button
-                +copy_raw
                 h4 Copy Raw
+                +copy_raw
 
         #unify_div.some-block(title="Unify cookies across all selected instances")
             a#unify.title.button
-                +unify
                 h4 Unify Settings
+                +unify
+
+        .some-block
+            a#more-options.title.button
+                h4 Settings
+                +settings
+
+        .space
 
         script(type="module" src="../options/init.js")
         script(type="module" src="./popup.js")
diff --git a/src/pages/popup/style.css b/src/pages/popup/style.css
index 4cc56145..8136237a 100644
--- a/src/pages/popup/style.css
+++ b/src/pages/popup/style.css
@@ -1,5 +1,5 @@
 body {
-    width: 240px;
+    width: 230px;
     min-height: auto;
 }
 
@@ -9,4 +9,15 @@ html, body {
 
 .hide {
     display: none !important;
+}
+
+.button {
+    display: flex;
+    margin: 0 auto;
+    justify-content: space-between;
+    width: 100%;
+}
+
+.space {
+    height: 10px;
 }
\ No newline at end of file