From 47fe1e31e76322b00247821012ba37c4b8194c1c Mon Sep 17 00:00:00 2001
From: overdodactyl <pjohns33@protonmail.com>
Date: Sat, 14 Apr 2018 18:55:45 -0600
Subject: [PATCH] remove some redundancies

---
 .../webextension-tweaks/generic_style.css     | 41 +++++++++++++++++--
 .../webextension-tweaks/https_everywhere.css  | 17 --------
 .../webextension-tweaks/skip_redirect.css     | 18 --------
 scripts/webextension_mappings.txt             |  1 +
 4 files changed, 38 insertions(+), 39 deletions(-)
 delete mode 100644 css/userContent-files/webextension-tweaks/https_everywhere.css
 delete mode 100644 css/userContent-files/webextension-tweaks/skip_redirect.css

diff --git a/css/userContent-files/webextension-tweaks/generic_style.css b/css/userContent-files/webextension-tweaks/generic_style.css
index 3e01568..5636831 100644
--- a/css/userContent-files/webextension-tweaks/generic_style.css
+++ b/css/userContent-files/webextension-tweaks/generic_style.css
@@ -1,3 +1,27 @@
+/* Pop Up Background Fixes */
+@-moz-document url-prefix("moz-extension://css_exfil_protection_UUID/popup.html"),
+               url-prefix("moz-extension://https_everywhere_UUID/pages/popup"),
+               url-prefix("moz-extension://skip_redirect_UUID/") {
+  :root {
+    --in-content-page-background: var(--tone-6)!important;
+    --in-content-box-background: rgba(11,11,12,0.2)!important;
+    --in-content-box-border-color: rgba(249, 249, 250, 0.3)!important;
+    --in-content-box-background-hover: rgba(11,11,12,0.2)!important;
+  }
+  button {
+    margin-top: 3px !important;
+  }
+  input {
+    margin-top: 3px !important;
+    margin-bottom: 3px !important;
+  }
+  textarea,
+  input  {
+    margin-left: 0px !important;
+  }
+
+}
+
 @-moz-document url-prefix("moz-extension://1_click_youtube_video_downloader_UUID"),
                url-prefix("moz-extension://autocopy_UUID"),
                url-prefix("moz-extension://custom_titlebar_text_UUID"),
@@ -7,11 +31,15 @@
                url-prefix("moz-extension://neat_url_UUID/"),
                url-prefix("moz-extension://smart_referer_UUID/"),
                url-prefix("moz-extension://tab_suspender_UUID/"),
+               url-prefix("moz-extension://css_exfil_protection_UUID/"),
+               url-prefix("moz-extension://https_everywhere_UUID/"),
+               url-prefix("moz-extension://skip_redirect_UUID/"),
                url-prefix("moz-extension://generic_styling_1_UUID"),
                url-prefix("moz-extension://generic_styling_2_UUID"),
                url-prefix("moz-extension://generic_styling_3_UUID"),
                url-prefix("moz-extension://generic_styling_4_UUID"),
-               url-prefix("moz-extension://generic_styling_5_UUID") {
+               url-prefix("moz-extension://generic_styling_5_UUID")
+  {
   * {
     color: var(--in-content-page-color) !important;
     background-color: var(--in-content-page-background)!important;
@@ -27,6 +55,9 @@
   a {
     color: var(--in-content-link-color) !important;
   }
+  a:hover {
+    color: var(--in-content-link-color-hover) !important;
+  }
   h1, h2, h3, h4, h5, h6 {
     color: var(--in-content-category-text-selected)!important
   }
@@ -38,6 +69,9 @@
     background: var(--in-content-box-background)!important;
     color: var(--in-content-page-color)!important;
   }
+  input[type="file"] {
+    background-color: var(--in-content-page-background)!important;
+  }
 
   textarea,
   input[type="input"],
@@ -60,7 +94,7 @@
   input[type="submit"] {
     -moz-appearance: none!important;
     background-image: none!important;
-    background-color: var(--in-content-page-background)!important;
+
     color: var(--in-content-page-color)!important;
     border: 1px solid!important;
     border-color: var(--in-content-box-border-color)!important;
@@ -70,6 +104,5 @@
   input[type="submit"]:hover {
     background-color: var(--in-content-box-background-hover)!important
   }
-}
 
-/* Pop Up Background Fixes */
+}
diff --git a/css/userContent-files/webextension-tweaks/https_everywhere.css b/css/userContent-files/webextension-tweaks/https_everywhere.css
deleted file mode 100644
index b49844f..0000000
--- a/css/userContent-files/webextension-tweaks/https_everywhere.css
+++ /dev/null
@@ -1,17 +0,0 @@
-/*! Alters the webextension HTTPS Everywhere
-  IMPORTANT: change the Internal UUID */
-@-moz-document url-prefix("moz-extension://https_everywhere_UUID/") {
-  body {
-    color: var(--tone-4)!important;
-    background: var(--tone-6)!important
-  }
-  html {
-    background-color: var(--tone-6)!important
-  }
-  a {
-    color: var(--accent-1)!important
-  }
-  h3 {
-    color: var(--tone-4)!important
-  }
-}
diff --git a/css/userContent-files/webextension-tweaks/skip_redirect.css b/css/userContent-files/webextension-tweaks/skip_redirect.css
deleted file mode 100644
index 6e93d0a..0000000
--- a/css/userContent-files/webextension-tweaks/skip_redirect.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*! Alters the webextension Skip Redirect
-  IMPORTANT: change the Internal UUID */
-@-moz-document url-prefix("moz-extension://skip_redirect_UUID/") {
-  body {
-    background: var(--tone-6)!important;
-    color: var(--tone-4)!important
-  }
-  input[type=number],
-  input[type=text],
-  textarea {
-    -moz-appearance: none!important;
-    background: var(--tone-5)!important;
-    color: var(--grey-30)!important
-  }
-  label a {
-    color: var(--accent-1)!important
-  }
-}
diff --git a/scripts/webextension_mappings.txt b/scripts/webextension_mappings.txt
index 51d19f4..9919983 100644
--- a/scripts/webextension_mappings.txt
+++ b/scripts/webextension_mappings.txt
@@ -1,6 +1,7 @@
 1_click_youtube_video_downloader|YoutubeDownloader@PeterOlayev.com
 autocopy|autocopy@mozilla.org
 brief|brief@mozdev.org
+css_exfil_protection|{7fc8ef53-24ec-4205-87a4-1e745953bb0d}
 cookie_autodelete|CookieAutoDelete@kennydo.com
 custom_titlebar_text|{b5a43a70-4092-4899-9c44-63799150b35e}
 dark_mode|{174b2d58-b983-4501-ab4b-07e71203cb43}