From 920cd60676dca9d43483da98e0f9db779827a4f1 Mon Sep 17 00:00:00 2001
From: overdodactyl <pjohns33@protonmail.com>
Date: Mon, 19 Feb 2018 19:40:25 -0700
Subject: [PATCH] Rouund 2 of variable replacements #65

---
 .../userContent_no_addons.css                 |  18 +-
 color_variables.css                           |  11 +-
 userContent-files/about_pages/addons.css      |   4 +-
 .../about_pages/newtab_and_home.css           |   4 +-
 .../webextension-tweaks/umatrix.css           |   2 +-
 .../webextension-tweaks/vim_vixen.css         |  14 +-
 userContent.css                               | 160 +++++++++---------
 7 files changed, 103 insertions(+), 110 deletions(-)

diff --git a/alternative_user_files/userContent_no_addons.css b/alternative_user_files/userContent_no_addons.css
index 249749d..4ecaddd 100644
--- a/alternative_user_files/userContent_no_addons.css
+++ b/alternative_user_files/userContent_no_addons.css
@@ -58,16 +58,12 @@
 }
 
 :root {
-  --primary-dark-color: var(--grey-70);
-  /* Color of FF dark theme nav-bar */
   --primary-light-color: var(--grey-40);
-  /* Off white */
   --light-accent-color: var(--grey-50);
-  /* Slightly darker off white */
-  --dark-accent: var(--grey-80);
-  /* darker shade of main color */
   --mid-way-color: var(--grey-60);
-  /* inbetween main dark and light color */
+  --primary-dark-color: var(--grey-70);
+  --dark-accent: var(--grey-80);
+  --darksest: var(--grey-90);
   --primary-accent-color: var(--blue-40);
   --primary-accent-color-dark: var(--blue-50);
   --primary-accent-color-darkest: var(--blue-60);
@@ -594,7 +590,7 @@
 
   .detail-view-container {
     font-size: 1.25rem;
-    color: #ccc !important;
+    color: var(--primary-light-color) !important;
   }
 
   page#addons-page,
@@ -606,7 +602,7 @@
   #categories,
   #header-utils-btn {
     background: var(--primary-dark-color) !important;
-    color: #ccc important;
+    color: var(--primary-light-color) important;
   }
 
   richlistitem.category:not([selected]),
@@ -974,7 +970,7 @@
   /* Preferencs/close button */
 
   .prefs-pane-button button:hover {
-    background-color: var(--grey-90) !important;
+    background-color: var(--darksest) !important;
   }
 
   /* Main background */
@@ -1044,7 +1040,7 @@
   /* Onboarding Message */
 
   #onboarding-notification-bar {
-    background: var(--grey-90) !important;
+    background: var(--darksest) !important;
     color: var(--primary-light-color) !important;
     border-top: 2px solid var(--primary-dark-color) !important;
   }
diff --git a/color_variables.css b/color_variables.css
index ae15944..26e9ab5 100644
--- a/color_variables.css
+++ b/color_variables.css
@@ -68,11 +68,12 @@
 
 
 :root {
-	--primary-dark-color: var(--grey-70);  /* Color of FF dark theme nav-bar */
-	--primary-light-color: var(--grey-40); /* Off white */
-	--light-accent-color: var(--grey-50); /* Slightly darker off white */
-	--dark-accent: var(--grey-80); /* darker shade of main color */
-	--mid-way-color: var(--grey-60); /* inbetween main dark and light color */
+  --primary-light-color: var(--grey-40);
+  --light-accent-color: var(--grey-50);
+  --mid-way-color: var(--grey-60);
+	--primary-dark-color: var(--grey-70);
+	--dark-accent: var(--grey-80);
+  --darksest: var(--grey-90);
 	--primary-accent-color: var(--blue-40);
 	--primary-accent-color-dark: var(--blue-50);
   --primary-accent-color-darkest: var(--blue-60);
diff --git a/userContent-files/about_pages/addons.css b/userContent-files/about_pages/addons.css
index 22a9d8c..c125935 100644
--- a/userContent-files/about_pages/addons.css
+++ b/userContent-files/about_pages/addons.css
@@ -11,12 +11,12 @@
 
 	.detail-view-container {
     	font-size: 1.25rem;
-    	color: #ccc !important;
+    	color: var(--primary-light-color) !important;
   	}
 
 	page#addons-page, page.greasemonkey #greasemonkey-sort-bar, #list-view[type="userstyle"] #addon-list-empty[hidden] ~ #userstyle-sorting, #addons-page .global-info-container, .alert, #nav-header, #categories, #header-utils-btn {
 		background: var(--primary-dark-color) !important;
-		color: #ccc important;
+		color: var(--primary-light-color) important;
 	}
 
 	richlistitem.category:not([selected]), #detail-contrib-description, page.greasemonkey #greasemonkey-sort-bar .text-link {
diff --git a/userContent-files/about_pages/newtab_and_home.css b/userContent-files/about_pages/newtab_and_home.css
index 8d95b0e..1c485cc 100644
--- a/userContent-files/about_pages/newtab_and_home.css
+++ b/userContent-files/about_pages/newtab_and_home.css
@@ -80,7 +80,7 @@
 
 	/* Preferencs/close button */
 	  .prefs-pane-button button:hover {
-	    background-color: var(--grey-90) !important;;
+	    background-color: var(--darksest) !important;;
 	  }
 
 
@@ -140,7 +140,7 @@
 
 	/* Onboarding Message */
 	#onboarding-notification-bar {
-		background: var(--grey-90) !important;
+		background: var(--darksest) !important;
 		color: var(--primary-light-color) !important;
 		border-top: 2px solid var(--primary-dark-color) !important;
 	}
diff --git a/userContent-files/webextension-tweaks/umatrix.css b/userContent-files/webextension-tweaks/umatrix.css
index d2aafc3..b9f7551 100644
--- a/userContent-files/webextension-tweaks/umatrix.css
+++ b/userContent-files/webextension-tweaks/umatrix.css
@@ -25,7 +25,7 @@
   .tabButton.selected {
     border-bottom: none !important;
     background-color: var(--primary-dark-color) !important;
-    border-color: var(--grey-50 ) !important;
+    border-color: var(--light-accent-color) !important;
     color: var(--primary-accent-color) !important;
   }
 
diff --git a/userContent-files/webextension-tweaks/vim_vixen.css b/userContent-files/webextension-tweaks/vim_vixen.css
index 959855f..723f764 100644
--- a/userContent-files/webextension-tweaks/vim_vixen.css
+++ b/userContent-files/webextension-tweaks/vim_vixen.css
@@ -5,18 +5,18 @@
 
   /* Top Border */
   .vimvixen-console-command-wrapper {
-    border-top: 1px solid var(--grey-60) !important;
+    border-top: 1px solid var(--mid-way-color) !important;
   }
 
   /* Header */
   .vimvixen-console-completion-title {
-    background-color: var(--grey-90) !important;
-    border-bottom: 1px solid var(--grey-60) !important;
+    background-color: var(--darksest) !important;
+    border-bottom: 1px solid var(--mid-way-color) !important;
   }
 
   /* Main Content */
   .vimvixen-console-completion {
-    background-color: var(--grey-80) !important;
+    background-color: var(--dark-accent) !important;
     color: #b1b1b3 !important;
     font-family: Menlo, monospace !important;
   }
@@ -24,7 +24,7 @@
   /* Command Line */
   .vimvixen-console-command,
   .vimvixen-console-command-input {
-    background-color: var(--grey-90) !important;
+    background-color: var(--darksest) !important;
     color: var(--grey-30) !important;
   }
 
@@ -52,10 +52,10 @@
   }
 
   .vimvixen-settings-form textarea[name="json"] {
-    background-color: var(--grey-60) !important;
+    background-color: var(--mid-way-color) !important;
     -moz-appearance: none !important;
     color: var(--primary-light-color) !important;
-    border-color: var(--grey-60);
+    border-color: var(--mid-way-color);
   }
 
   ::-moz-selection {
diff --git a/userContent.css b/userContent.css
index a2972a1..3675fde 100644
--- a/userContent.css
+++ b/userContent.css
@@ -58,16 +58,12 @@
 }
 
 :root {
-  --primary-dark-color: var(--grey-70);
-  /* Color of FF dark theme nav-bar */
   --primary-light-color: var(--grey-40);
-  /* Off white */
   --light-accent-color: var(--grey-50);
-  /* Slightly darker off white */
-  --dark-accent: var(--grey-80);
-  /* darker shade of main color */
   --mid-way-color: var(--grey-60);
-  /* inbetween main dark and light color */
+  --primary-dark-color: var(--grey-70);
+  --dark-accent: var(--grey-80);
+  --darksest: var(--grey-90);
   --primary-accent-color: var(--blue-40);
   --primary-accent-color-dark: var(--blue-50);
   --primary-accent-color-darkest: var(--blue-60);
@@ -220,7 +216,7 @@
 
   .detail-view-container {
     font-size: 1.25rem;
-    color: #ccc !important;
+    color: var(--primary-light-color) !important;
   }
 
   page#addons-page,
@@ -232,7 +228,7 @@
   #categories,
   #header-utils-btn {
     background: var(--primary-dark-color) !important;
-    color: #ccc important;
+    color: var(--primary-light-color) important;
   }
 
   richlistitem.category:not([selected]),
@@ -600,7 +596,7 @@
   /* Preferencs/close button */
 
   .prefs-pane-button button:hover {
-    background-color: var(--grey-90) !important;
+    background-color: var(--darksest) !important;
   }
 
   /* Main background */
@@ -670,7 +666,7 @@
   /* Onboarding Message */
 
   #onboarding-notification-bar {
-    background: var(--grey-90) !important;
+    background: var(--darksest) !important;
     color: var(--primary-light-color) !important;
     border-top: 2px solid var(--primary-dark-color) !important;
   }
@@ -1055,7 +1051,7 @@
 /*! Alters the webextension Brief
   IMPORTANT: change the Internal UUID */
 
-@-moz-document url-prefix("moz-extension://e0561760-8efe-b747-9e3b-ffcd6a3f29bc/")  {
+@-moz-document url-prefix("moz-extension://brief_UUID/")  {
   h2 {
     color: var(--primary-accent-color) !important;
   }
@@ -1084,7 +1080,7 @@
 /*! Alters the webextension Cookie AutoDelete
   IMPORTANT: change the Internal UUID */
 
-@-moz-document url-prefix("moz-extension://789561e8-17c9-874c-ad1c-6a8226b1f2f1/")  {
+@-moz-document url-prefix("moz-extension://cookie_autodelete_UUID/")  {
   a {
     color: var(--primary-accent-color);
   }
@@ -1146,7 +1142,7 @@
 /*! Alters the webextension Dark Mode
   IMPORTANT: change the Internal UUID */
 
-@-moz-document url-prefix("moz-extension://32b18bd1-4169-b649-b20a-ebafe1e7e549/")  {
+@-moz-document url-prefix("moz-extension://dark_mode_UUID/")  {
   /* Headers */
 
   .comment {
@@ -1395,7 +1391,7 @@
 /*! Alters the webextension NoScript
   IMPORTANT: change the Internal UUID */
 
-@-moz-document url-prefix("moz-extension://856ddafd-d0a5-f04e-b493-1c651b88b555/")  {
+@-moz-document url-prefix("moz-extension://noscript_UUID/")  {
   body {
     background: var(--mid-way-color) !important;
   }
@@ -1612,7 +1608,7 @@
 /*! Alters the webextension Smart HTTPS
   IMPORTANT: change the Internal UUID */
 
-@-moz-document url-prefix("moz-extension://3f7c8927-a1d4-6349-ab7f-91a7f031a571/")  {
+@-moz-document url-prefix("moz-extension://smart_https_UUID/")  {
   body {
     background-color: var(--mid-way-color) !important;
     color: var(--primary-light-color) !important;
@@ -1633,7 +1629,7 @@
 /*! Alters the webextension Tab Suspender (memory saver)
   IMPORTANT: change the Internal UUID */
 
-@-moz-document url-prefix("moz-extension://731831ee-3f54-b049-8509-193907bdaa5d/")  {
+@-moz-document url-prefix("moz-extension://tab_suspender_UUID/")  {
   label,
   body {
     color: var(--primary-light-color) !important;
@@ -1715,63 +1711,6 @@
     background: var(--primary-light-color) !important;
   }
 }
-/*! Alters the webextension uBO-Scope
-  IMPORTANT: change the Internal UUID */
-
-@-moz-document url-prefix("moz-extension://7ce809b7-4a3b-484c-89de-42aa4db7f5de/")  {
-  body {
-    background: var(--mid-way-color) !important;
-  }
-
-  #topPane {
-    background-color: var(--mid-way-color) !important;
-    color: var(--primary-light-color) !important;
-  }
-
-  #heatmaps .togglerBar {
-    background: var(--mid-way-color) !important;
-  }
-
-  body.theoretical #heatmaps .heatmap.theoretical {
-    background: var(--mid-way-color) !important;
-  }
-
-  #heatmaps .heatmap {
-    border: none;
-    background: var(--mid-way-color) !important;
-  }
-
-  #heatmaps.list .hmcell {
-    background-color: var(--mid-way-color) !important;
-    color: var(--primary-light-color) !important;
-  }
-
-  #domain3rdDetails {
-    background-color: var(--primary-dark-color) !important;
-    border: 1px solid var(--primary-dark-color) !important;
-  }
-
-  #domain3rdDetails #authority {
-    background-color: var(--dark-accent) !important;
-    position: relative;
-  }
-
-  #scores .scores .score.actual {
-    color: white !important;
-  }
-
-  #scores .scores .score.theoretical {
-    color: var(--primary-dark-color) !important;
-  }
-
-  body.theoretical #scores .scores .score.actual {
-    color: var(--primary-dark-color) !important;
-  }
-
-  body.theoretical #scores .scores .score.theoretical {
-    color: var(--primary-light-color) !important;
-  }
-}
 /*! Alters the webextension uBlock Origin
   IMPORTANT: change the Internal UUID */
 
@@ -2058,6 +1997,63 @@
     color: var(--primary-light-color) !important;
   }
 }
+/*! Alters the webextension uBO-Scope
+  IMPORTANT: change the Internal UUID */
+
+@-moz-document url-prefix("moz-extension://ubo_scope_UUID/")  {
+  body {
+    background: var(--mid-way-color) !important;
+  }
+
+  #topPane {
+    background-color: var(--mid-way-color) !important;
+    color: var(--primary-light-color) !important;
+  }
+
+  #heatmaps .togglerBar {
+    background: var(--mid-way-color) !important;
+  }
+
+  body.theoretical #heatmaps .heatmap.theoretical {
+    background: var(--mid-way-color) !important;
+  }
+
+  #heatmaps .heatmap {
+    border: none;
+    background: var(--mid-way-color) !important;
+  }
+
+  #heatmaps.list .hmcell {
+    background-color: var(--mid-way-color) !important;
+    color: var(--primary-light-color) !important;
+  }
+
+  #domain3rdDetails {
+    background-color: var(--primary-dark-color) !important;
+    border: 1px solid var(--primary-dark-color) !important;
+  }
+
+  #domain3rdDetails #authority {
+    background-color: var(--dark-accent) !important;
+    position: relative;
+  }
+
+  #scores .scores .score.actual {
+    color: white !important;
+  }
+
+  #scores .scores .score.theoretical {
+    color: var(--primary-dark-color) !important;
+  }
+
+  body.theoretical #scores .scores .score.actual {
+    color: var(--primary-dark-color) !important;
+  }
+
+  body.theoretical #scores .scores .score.theoretical {
+    color: var(--primary-light-color) !important;
+  }
+}
 /*! Alters the webextension uMatrix
   IMPORTANT: change the Internal UUID */
 
@@ -2084,7 +2080,7 @@
   .tabButton.selected {
     border-bottom: none !important;
     background-color: var(--primary-dark-color) !important;
-    border-color: var(--grey-50 ) !important;
+    border-color: var(--light-accent-color) !important;
     color: var(--primary-accent-color) !important;
   }
 
@@ -2316,20 +2312,20 @@
   /* Top Border */
 
   .vimvixen-console-command-wrapper {
-    border-top: 1px solid var(--grey-60) !important;
+    border-top: 1px solid var(--mid-way-color) !important;
   }
 
   /* Header */
 
   .vimvixen-console-completion-title {
-    background-color: var(--grey-90) !important;
-    border-bottom: 1px solid var(--grey-60) !important;
+    background-color: var(--darksest) !important;
+    border-bottom: 1px solid var(--mid-way-color) !important;
   }
 
   /* Main Content */
 
   .vimvixen-console-completion {
-    background-color: var(--grey-80) !important;
+    background-color: var(--dark-accent) !important;
     color: #b1b1b3 !important;
     font-family: Menlo, monospace !important;
   }
@@ -2338,7 +2334,7 @@
 
   .vimvixen-console-command,
   .vimvixen-console-command-input {
-    background-color: var(--grey-90) !important;
+    background-color: var(--darksest) !important;
     color: var(--grey-30) !important;
   }
 
@@ -2368,10 +2364,10 @@
   }
 
   .vimvixen-settings-form textarea[name="json"] {
-    background-color: var(--grey-60) !important;
+    background-color: var(--mid-way-color) !important;
     -moz-appearance: none !important;
     color: var(--primary-light-color) !important;
-    border-color: var(--grey-60);
+    border-color: var(--mid-way-color);
   }
 
   ::-moz-selection {