From 69a7c6771b1d3a03f95c545b31e04372db549dd2 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Tue, 18 Feb 2020 09:53:20 -0500
Subject: [PATCH] Fine tune fenix UI as per Bram's feedback

---
 src/css/popup-fenix.css | 45 +++++++++++++++++------------------------
 src/js/start.js         |  7 +------
 2 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/src/css/popup-fenix.css b/src/css/popup-fenix.css
index 935d95969..206adcd89 100644
--- a/src/css/popup-fenix.css
+++ b/src/css/popup-fenix.css
@@ -1,3 +1,17 @@
+ /* External CSS values override */
+body {
+    color: #20123a;
+    fill: #20123a;
+    }
+.fa-icon {
+    padding: 0 0.1em;
+    }
+.fa-icon.fa-icon-badged > .fa-icon-badge {
+    bottom: auto;
+    top: -20%;
+    }
+
+/* Internal CSS values */
 body {
     background-color: white;
     border: 0;
@@ -6,16 +20,6 @@ body {
     white-space: nowrap;
     }
 
-h2 {
-    background-color: #eee;
-    border: 0;
-    color: #666;
-    cursor: pointer;
-    font-size: 100%;
-    font-weight: normal;
-    padding: 0.2em;
-    text-align: center;
-    }
 a {
     color: inherit;
     text-decoration: none;
@@ -34,7 +38,7 @@ a {
     }
 hr {
     border: 0;
-    border-top: 1px solid #ddd;
+    border-top: 1px solid #e3e2e3;
     margin: 0;
     padding: 0;
     }
@@ -43,7 +47,7 @@ hr {
     }
 
 #sticky {
-    background-color: white;
+    background-color: inherit;
     position: sticky;
     top: 0;
     z-index: 100;
@@ -60,7 +64,7 @@ hr {
     margin: 0.5em 0;
     }
 #switch .fa-icon {
-    fill: #0046ff;
+    fill: #0060df;
     cursor: pointer;
     font-size: 700%;
     margin: 0;
@@ -96,9 +100,6 @@ body.off #switch .fa-icon {
 .rulesetTools [id]:not(:first-of-type) {
     margin-top: 0.2em;
     }
-.rulesetTools [id]:hover {
-    fill: black;
-    }
 body.needReload #refresh,
 body.needSave #saveRules,
 body.needSave #revertRules {
@@ -142,9 +143,7 @@ body.needSave #revertRules {
     }
 
 .tool {
-    color: #444;
     cursor: pointer;
-    fill: #444;
     padding: 0 0.5em;
     unicode-bidi: embed;
     visibility: hidden;
@@ -152,10 +151,6 @@ body.needSave #revertRules {
 .tool.enabled {
     visibility: visible;
     }
-.tool.enabled:hover {
-    color: #444;
-    fill: #444;
-    }
 
 .statValue {
     margin: 0;
@@ -176,10 +171,6 @@ body.needSave #revertRules {
 #extraTools > span.on .fa-icon >.nope {
     visibility: visible;
     }
-#extraTools > span:hover {
-    color: #222;
-    fill: #222;
-    }
 
 #main:not(.dfEnabled) #moreButton .fa-icon {
     transform: rotate(180deg);
@@ -252,7 +243,7 @@ body[dir="rtl"] #tooltip {
     display: none;
     }
 #firewallContainer > div > span {
-    background-color: #e6e6e6;
+    background-color: #e0e0e6;
     border: none;
     box-sizing: border-box;
     -moz-box-sizing: border-box;
diff --git a/src/js/start.js b/src/js/start.js
index b2089d345..d623bfe06 100644
--- a/src/js/start.js
+++ b/src/js/start.js
@@ -346,12 +346,7 @@ if (
     browser.browserAction.setPopup instanceof Function
 ) {
     let uiFlavor = µb.hiddenSettings.uiFlavor;
-    if (
-        uiFlavor === 'unset' &&
-        vAPI.webextFlavor.major > 68 &&
-        vAPI.webextFlavor.soup.has('firefox') &&
-        vAPI.webextFlavor.soup.has('mobile')
-    ) {
+    if ( uiFlavor === 'unset' && vAPI.webextFlavor.soup.has('mobile') ) {
         uiFlavor = 'fenix';
     }
     if ( uiFlavor !== 'unset' && /\w+/.test(uiFlavor) ) {