From 3bc5f3f49e05a399eabeadf1632a92c8055db25e Mon Sep 17 00:00:00 2001
From: Lootyhoof <lootyhoofer@gmail.com>
Date: Sun, 12 Apr 2020 16:08:31 +0100
Subject: [PATCH] [Pale-Moon] Issue #1773 - Improve persona styling on Mac

---
 application/palemoon/themes/osx/browser.css | 38 ++++++++++++++-------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/application/palemoon/themes/osx/browser.css b/application/palemoon/themes/osx/browser.css
index 1314e551be..062b33e0b3 100644
--- a/application/palemoon/themes/osx/browser.css
+++ b/application/palemoon/themes/osx/browser.css
@@ -218,13 +218,21 @@ toolbarbutton.chevron:-moz-locale-dir(rtl) > .toolbarbutton-icon {
 /* ::::: bookmark buttons ::::: */
 
 toolbarbutton.bookmark-item {
-  color: #222;
   border: 0;
   border-radius: 10000px;
   padding: 1px 8px;
   margin: 0 0 1px;
 }
 
+toolbarbutton.bookmark-item:not(:-moz-lwtheme) {
+  color: #222;
+}
+
+toolbarbutton.bookmark-item:-moz-lwtheme {
+  color: inherit;
+  text-shadow: inherit;
+}
+
 .bookmark-item > .toolbarbutton-menu-dropmarker {
   list-style-image: url("chrome://browser/skin/places/folderDropArrow.png");
   -moz-image-region: rect(0, 7px, 5px, 0);
@@ -254,18 +262,25 @@ toolbarbutton.bookmark-item[open="true"] {
   background-color: rgba(0, 0, 0, .205);
 }
 
-toolbarbutton.bookmark-item:hover,
-toolbarbutton.bookmark-item[open="true"] {
-  color: #FFF !important;
-  text-shadow: 0 1px rgba(0, 0, 0, .4) !important;
+toolbarbutton.bookmark-item:-moz-lwtheme-brighttext:hover,
+toolbarbutton.bookmark-item[open="true"]:-moz-lwtheme-brighttext {
+  background-color: rgba(255, 255, 255, .3);
 }
 
+toolbarbutton.bookmark-item:not(:-moz-lwtheme):hover,
+toolbarbutton.bookmark-item[open="true"]:not(:-moz-lwtheme) {
+  color: #FFF;
+  text-shadow: 0 1px rgba(0, 0, 0, .4);
+}
+
+.bookmark-item:-moz-lwtheme-brighttext > .toolbarbutton-menu-dropmarker,
 .bookmark-item:hover > .toolbarbutton-menu-dropmarker,
 .bookmark-item[open="true"] > .toolbarbutton-menu-dropmarker {
   -moz-image-region: rect(5px, 7px, 10px, 0);
 }
 
 @media (min-resolution: 2dppx) {
+  .bookmark-item:-moz-lwtheme-brighttext > .toolbarbutton-menu-dropmarker,
   .bookmark-item:hover > .toolbarbutton-menu-dropmarker,
   .bookmark-item[open="true"] > .toolbarbutton-menu-dropmarker {
   -moz-image-region: rect(10px, 14px, 20px, 0);
@@ -278,6 +293,11 @@ toolbarbutton.bookmark-item[open="true"] {
   background-color: rgba(0, 0, 0, .5);
 }
 
+toolbarbutton.bookmark-item:-moz-lwtheme-brighttext:hover,
+toolbarbutton.bookmark-item[open="true"]:-moz-lwtheme-brighttext {
+  background-color: rgba(255,255,255, .3);
+}
+
 toolbarbutton.bookmark-item > menupopup {
   margin-top: 2px;
   margin-inline-start: 3px;
@@ -1738,14 +1758,6 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   margin-top: 0px;
 }
 
-/* make the tab text colors match those of the Windows client */
-@media (-moz-mac-lion-theme) {
-  tab {
-    text-shadow: none;
-    color: black !important;
-  }
-}
-
 .tabbrowser-tab:hover,
 .tabs-newtab-button:hover {
   background-image: @toolbarShadowOnTab@, var(--tab-background-hover),