From 7f55e5d54d92e7f14de74bc51865943137c84ef8 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Mon, 13 Apr 2020 16:40:12 -0400
Subject: [PATCH] Fine tune CSS and fix CSS regressions in last commit

Related commit:
- https://github.com/gorhill/uBlock/commit/e917213e81d40b00cefd7f493fcbabb450ccb10d

Specifically, intended font size was no longer
set properly for mobile in popup panel.
---
 src/css/3p-filters.css  |  3 ---
 src/css/about.css       | 12 ------------
 src/css/common.css      | 27 +++++++++++++++++----------
 src/css/dashboard.css   |  5 -----
 src/css/logger-ui.css   |  5 -----
 src/css/popup-fenix.css |  2 +-
 src/css/settings.css    |  6 ------
 7 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/src/css/3p-filters.css b/src/css/3p-filters.css
index 477e08873..f6bfebd02 100644
--- a/src/css/3p-filters.css
+++ b/src/css/3p-filters.css
@@ -183,9 +183,6 @@ body.updating .listEntry.checked.obsolete .updating {
     }
 
 @media (pointer: coarse) {
-    body {
-        font: 16px/1.5 sans-serif;
-    }
     .listEntries {
         margin-inline-start: 0;
         -webkit-margin-start: 0;
diff --git a/src/css/about.css b/src/css/about.css
index 5236a2561..f6f143f17 100644
--- a/src/css/about.css
+++ b/src/css/about.css
@@ -1,9 +1,3 @@
-body {
-    border: 0;
-    font: 14px/1.5 sans-serif;
-    margin: 0;
-    padding: 0;
-    }
 .entries {
     margin: 0.5em 0;
     margin-inline-start: 2em;
@@ -12,9 +6,3 @@ body {
 .entry {
     margin: 0.5em 0;
     }
-
-@media (pointer: coarse) {
-    body {
-        font: 16px/1.5 sans-serif;
-    }
-}
diff --git a/src/css/common.css b/src/css/common.css
index a0c8df8f1..a760935ef 100644
--- a/src/css/common.css
+++ b/src/css/common.css
@@ -1,3 +1,20 @@
+body {
+    font: 14px/1.5 sans-serif;
+    }
+@media (pointer: coarse) {
+    body {
+        font: 16px/1.5 sans-serif;
+    }
+}
+body {
+    background-color: var(--bg-0);
+    border: 0;
+    box-sizing: border-box;
+    color: var(--fg-0);
+    fill: var(--fg-0);
+    margin: 0;
+    padding: 0;
+    }
 @font-face {
     font-family: 'FontAwesome';
     font-weight: normal;
@@ -14,16 +31,6 @@
       -moz-user-select: none;
       -webkit-user-select: none;
     }
-body {
-    background-color: var(--bg-0);
-    border: 0;
-    box-sizing: border-box;
-    color: var(--fg-0);
-    fill: var(--fg-0);
-    font: 14px/1.5 sans-serif;
-    margin: 0;
-    padding: 0;
-    }
 code {
     background-color: var(--bg-code);
     padding: 0 0.25em;
diff --git a/src/css/dashboard.css b/src/css/dashboard.css
index c282a8677..b32b9763b 100644
--- a/src/css/dashboard.css
+++ b/src/css/dashboard.css
@@ -1,10 +1,6 @@
 html, body {
-    border: 0;
-    font: 14px/1.5 sans-serif;
     height: 100%;
-    margin: 0;
     overflow: hidden;
-    padding: 0;
     position: relative;
     width: 100%;
     }
@@ -83,7 +79,6 @@ body:not(.canUpdateShortcuts) .tabButton[data-pane="shortcuts.html"] {
 @media (pointer: coarse) {
     #dashboard-nav {
         flex-wrap: nowrap;
-        font: 16px/1.5 sans-serif;
         overflow-x: auto;
     }
     #dashboard-nav .logo {
diff --git a/src/css/logger-ui.css b/src/css/logger-ui.css
index 7fff41f62..9f8818e7e 100644
--- a/src/css/logger-ui.css
+++ b/src/css/logger-ui.css
@@ -1,13 +1,8 @@
 body {
-    background-color: white;
-    border: 0;
-    color: black;
     display: flex;
     flex-direction: column;
     height: 100vh;
-    margin: 0;
     overflow: hidden;
-    padding: 0;
     width: 100vw;
     }
 textarea {
diff --git a/src/css/popup-fenix.css b/src/css/popup-fenix.css
index 47a50146b..fdf45b478 100644
--- a/src/css/popup-fenix.css
+++ b/src/css/popup-fenix.css
@@ -10,6 +10,7 @@
 /* Internal CSS values */
 body {
     white-space: nowrap;
+    min-width: 375px;
     }
 
 a {
@@ -128,7 +129,6 @@ body.needSave #revertRules {
     display: flex;
     flex-direction: column;
     font-size: 1.4em;
-    min-width: 4em;
     }
 .toolRibbon [data-i18n] {
     font-size: x-small;
diff --git a/src/css/settings.css b/src/css/settings.css
index 14a6ac4be..da389dbf4 100644
--- a/src/css/settings.css
+++ b/src/css/settings.css
@@ -34,9 +34,3 @@ hr {
 body.advancedUser [href="advanced-settings.html"] {
     display: inline-flex;
     }
-
-@media (pointer: coarse) {
-    body {
-        font: 16px/1.5 sans-serif;
-    }
-}