From e7c92ec1c479270676745c37cf129c10a68164ec Mon Sep 17 00:00:00 2001
From: MrOtherGuy <jastekken@outlook.com>
Date: Tue, 4 Dec 2018 18:35:33 +0200
Subject: [PATCH] Fix inconsistencies with buttons inside popups

---
 chrome/theme_popups_and_menus.css |  8 +++++---
 chrome/theme_toolbars.css         | 22 +++++++++++++---------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/chrome/theme_popups_and_menus.css b/chrome/theme_popups_and_menus.css
index 86d4873..0dc55a8 100644
--- a/chrome/theme_popups_and_menus.css
+++ b/chrome/theme_popups_and_menus.css
@@ -1,6 +1,7 @@
-/*!!! IMPORT theme_color_variables.css !!!*/
 /* Makes popups, menus and context menus dark */
-@import url(theme_color_variables.css);
+/* Color editing should generally be done in theme_color_variables.css */
+
+/*!!! IMPORT theme_color_variables.css !!!*/
 
 .panel-arrowcontent,
 #alltabs-popup .arrowscrollbox-scrollbox,
@@ -68,7 +69,8 @@ panelview,
    background-color:  var(--uc-dark-bkgnd-color) !important;
 }
 
-.subviewbutton:hover{
+.subviewbutton:hover,
+#widget-overflow-list > .toolbarbutton-1:hover{
   background-color: var(--uc-active-color) !important;
 }
 
diff --git a/chrome/theme_toolbars.css b/chrome/theme_toolbars.css
index ea110d2..5a5c486 100644
--- a/chrome/theme_toolbars.css
+++ b/chrome/theme_toolbars.css
@@ -1,5 +1,8 @@
+/* General toolbar coloring - buttons, text, findbar etc. */
+/* Color editing should generally be done in theme_color_variables.css */
+
 /*!!! IMPORT theme_color_variables.css !!!*/
-@import url(theme_color_variables.css);
+
 #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar),
 #browser-bottombox,
 .browserContainer > findbar,
@@ -40,13 +43,13 @@
 .toolbarbutton-icon, toolbarbutton stack{ border-radius: 0px !important; }
 :root:not([uidensity="compact"]) #back-button > .toolbarbutton-icon{ border-radius: 10000px !important; }
 
-toolbar toolbarbutton:not([disabled]):hover > .toolbarbutton-icon,
-toolbar toolbarbutton:not([disabled]):hover > stack,
-toolbar toolbarbutton[open="true"] > .toolbarbutton-icon,
-toolbar toolbarbutton[open="true"] > stack,
-toolbar toolbarbutton[checked="true"] > .toolbarbutton-icon,
-toolbar toolbarbutton[checked="true"] > stack,
-toolbar .bookmark-item:hover,
+.toolbarbutton-1:not([disabled]):hover > .toolbarbutton-icon,
+.toolbarbutton-1:not([disabled]):hover > stack,
+.toolbarbutton-1[open="true"] > .toolbarbutton-icon,
+.toolbarbutton-1[open="true"] > stack,
+.toolbarbutton-1[checked="true"] > .toolbarbutton-icon,
+.toolbarbutton-1[checked="true"] > stack,
+#PlacesToolbarItems .bookmark-item:hover,
 #page-action-buttons image:hover,
 .urlbar-icon:hover,
 #TabsToolbar .scrollbutton-down:hover,
@@ -62,7 +65,8 @@ findbar toolbarbutton[checked="true"]{
 #TabsToolbar .scrollbutton-up > .toolbarbutton-icon,
 #downloads-indicator-anchor,
 #PersonalToolbar .bookmark-item > .toolbarbutton-icon,
-#titlebar .titlebar-button > .toolbarbutton-icon{
+#titlebar .titlebar-button > .toolbarbutton-icon,
+#widget-overflow-list toolbarbutton > .toolbarbutton-icon{
   background-color: transparent !important;
   box-shadow: none !important;
 }