From 99e31abc670fe923baa78bf4fc1858a1934eda10 Mon Sep 17 00:00:00 2001
From: Tim Nguyen <ntim.bugs@gmail.com>
Date: Wed, 7 Apr 2021 09:15:30 +0000
Subject: [PATCH] Bug 1703458 - Fix some theme issues after bug 1701448.
 r=desktop-theme-reviewers,Itiel

* Actions menu icons can be too large (on Windows for instance)
* panel list font on Windows is inconsistent in add-ons manager and about:logins
* Fix RTL background-position for about:addons menu icons

Differential Revision: https://phabricator.services.mozilla.com/D111054
---
 browser/themes/osx/preferences/applications.css       | 7 -------
 browser/themes/shared/preferences/preferences.inc.css | 7 +++++++
 toolkit/mozapps/extensions/content/aboutaddons.css    | 2 +-
 toolkit/mozapps/extensions/content/panel-item.css     | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/browser/themes/osx/preferences/applications.css b/browser/themes/osx/preferences/applications.css
index 81df2f6c082d..7eb762cefdf3 100644
--- a/browser/themes/osx/preferences/applications.css
+++ b/browser/themes/osx/preferences/applications.css
@@ -2,13 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-.typeIcon,
-.actionIcon,
-.actionsMenu::part(icon) {
-  height: 16px;
-  width: 16px;
-}
-
 .actionsMenu > menupopup > menuitem > .menu-iconic-left {
   /* Undo content/browser/preferences/handlers.css - we don't
    * want icon-less labels to line up with the other labels.
diff --git a/browser/themes/shared/preferences/preferences.inc.css b/browser/themes/shared/preferences/preferences.inc.css
index 62b49b4a2836..efe248ffe220 100644
--- a/browser/themes/shared/preferences/preferences.inc.css
+++ b/browser/themes/shared/preferences/preferences.inc.css
@@ -368,6 +368,13 @@ checkbox {
   min-height: 30px !important;
 }
 
+.typeIcon,
+.actionIcon,
+.actionsMenu::part(icon) {
+  height: 16px;
+  width: 16px;
+}
+
 .typeIcon {
   margin-inline: 10px 9px !important;
 }
diff --git a/toolkit/mozapps/extensions/content/aboutaddons.css b/toolkit/mozapps/extensions/content/aboutaddons.css
index f02c65f55ce1..cac289a31844 100644
--- a/toolkit/mozapps/extensions/content/aboutaddons.css
+++ b/toolkit/mozapps/extensions/content/aboutaddons.css
@@ -735,7 +735,7 @@ button.tab-button:-moz-focusring {
 }
 
 panel-list {
-  font-size: 13px;
+  font: menu;
 }
 
 @media (max-width: 830px) {
diff --git a/toolkit/mozapps/extensions/content/panel-item.css b/toolkit/mozapps/extensions/content/panel-item.css
index 851f3c46672a..f4742ec0b0f4 100644
--- a/toolkit/mozapps/extensions/content/panel-item.css
+++ b/toolkit/mozapps/extensions/content/panel-item.css
@@ -27,7 +27,7 @@ button {
   border: none;
   position: relative;
   display: block;
-  font-size: inherit;
+  font: inherit;
   padding: 4px 8px;
   padding-inline-start: 32px;
   text-align: start;
@@ -35,7 +35,7 @@ button {
 }
 
 button:dir(rtl) {
-  background-position-x: right 14px;
+  background-position-x: right 8px;
 }
 
 :host([badged]) button::after {