From 3f461d00749a7eb50058970c8c69046bc32b75c8 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Wed, 17 Aug 2022 15:32:53 +0200
Subject: [PATCH] Get contextmenu and toolbar menulist closer to shoelace menu
 styling

---
 api/templates/default/etemplate2.css   | 12 +++++++++++-
 pixelegg/css/pixelegg.css              |  5 ++++-
 pixelegg/less/layout_dhtmlSubmenu.less |  6 +++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index 8e4943e560..3b66a558c2 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -3140,10 +3140,20 @@ et2-button.transparent-button::part(container) {
 .et2_toolbar_actionlist et2-button.et2_toolbar_hasCaption {
     width:auto;
 }
+.ui-toolbar-menulist et2-button::part(label) {
+    font-size: 11px;
+}
 .ui-toolbar-menulist et2-button::part(base) {
     border: none;
-    margin: 0.3em;
     background-color: transparent;
+    line-height: var(--sl-line-height-normal);
+    padding: var(--sl-spacing-2x-small) var(--sl-spacing-2x-small);
+    margin: 2px 8px 2px;
+}
+.ui-toolbar-menulist et2-dropdown-button::part(base)
+{
+    border: none;
+    border-radius: 0;
 }
 .ui-toolbar-menulist > button {
     margin: 0 !important;
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 35c4d9e452..ecf12e20fc 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -3171,9 +3171,12 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub
   color: #373f3f;
 }
 div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected {
-  background-color: rgba(153, 204, 255, 0.4) !important;
+  background-color: hsl(200, 98%, 39%) !important;
   background-image: none !important;
 }
+div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected div.sub_item_text {
+  color: hsl(0, 0%, 100%);
+}
 div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl div.sub_sep {
   border-top: 1px solid #E6E6E6;
 }
diff --git a/pixelegg/less/layout_dhtmlSubmenu.less b/pixelegg/less/layout_dhtmlSubmenu.less
index e288550d2e..962ffeedff 100644
--- a/pixelegg/less/layout_dhtmlSubmenu.less
+++ b/pixelegg/less/layout_dhtmlSubmenu.less
@@ -30,11 +30,15 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon{
 			td.sub_item_icon {
 
 			}
-			background-color: @color_hover_row !important;
+			background-color: hsl(200deg 98% 39%) !important;
 			background-image: none !important;
+			div.sub_item_text {
+				color: hsl(0deg 0% 100%);
+			}
 		}
 		div.sub_sep {
 			border-top: 1px solid #E6E6E6;
 		}
+
 	}
 }