From 5630a07e735147e7a809dc2550e068d442c6e51b Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Mon, 20 Mar 2023 12:37:50 +0600
Subject: [PATCH] Menu styles fixes without effects

---
 ubl-settings-manager.css   | 74 +++++++++++++++-----------------------
 ubl-settings-manager.glade | 22 +++++-------
 2 files changed, 37 insertions(+), 59 deletions(-)

diff --git a/ubl-settings-manager.css b/ubl-settings-manager.css
index 0354832..8d44fac 100644
--- a/ubl-settings-manager.css
+++ b/ubl-settings-manager.css
@@ -19,61 +19,48 @@ background-color: #404040;
 	font-weight: bold;
 	
 }
-.roundborder * {
+.roundborder > * {
 	border-width:0px;
 }
-.roundborder::backdrop * {
+.roundborder:backdrop > * {
 	border-width:0px;
 	border-radius:5px;
 }
 .noborder {
 	border: none;
 }
-.menu:hover {	
-    border-radius:0px;
-}
-.menu {	
-    border-radius:0px;
-}
-.menu:hover >* {
-  border-radius:0px;
-}
+
 .menuitembottom{
   margin-top:0px;
   margin-bottom:3px;
-  border-style: solid;
-  border-bottom-width: 1px;
-  border-left-width: 1px;
-  border-right-width: 1px;
-	border-color:alpha(@theme_text_color, 0.3);
-  border-radius:0px;
+  border-color:inherit;
+  border-left-width:inherit;
+  border-right-width:inherit;
 }
 .menuitemmiddle{
   margin-top:0px;
   margin-bottom:0px;
-  border-style: solid;
-  border-left-width: 1px;
-  border-right-width: 1px;
-	border-color:alpha(@theme_text_color, 0.3);
-  border-radius:0px;
+  border-color:inherit;
+  border-left-width:inherit;
+  border-right-width:inherit;
 }
 
 .menuitemtop{
   margin-bottom:0px;
-  border-style: solid;
-  border-top-width: 1px;
-  border-left-width: 1px;
-  border-right-width: 1px;
-	border-color:alpha(@theme_text_color, 0.3);
-  border-radius:0px;
+  border-color:inherit;
+  border-top-width:inherit;
+  border-left-width:inherit;
+  border-right-width:inherit;
 }
 .menuitemtop *{
   margin:2px 2px 0 2px;
   padding: 5px 10px 3px 5px;
+  border:transparent;
 }
 .menuitemmiddle *{
   margin:0 2px 0 2px;
   padding: 3px 10px 3px 5px;
+  border:transparent;
 }
 .menuitembottom *{
   margin:0 2px 2px 2px;
@@ -81,29 +68,23 @@ background-color: #404040;
 }
 .menuitemtop:hover {
   background:@theme_bg_color;
-  border-style: solid;
-  border-top-width: 1px;
-  border-left-width: 1px;
-  border-right-width: 1px;
-	border-color:alpha(@theme_text_color, 0.3);
-  border-radius:0px;
+  border-color:inherit;
+  border-top-width:inherit;
+  border-left-width:inherit;
+  border-right-width:inherit;
 }
 .menuitemmiddle:hover {
   background:@theme_bg_color;
-  border-style: solid;
-  border-left-width: 1px;
-  border-right-width: 1px;
-	border-color:alpha(@theme_text_color, 0.3);
-  border-radius:0px;
+  border-color:inherit;
+  border-left-width:inherit;
+  border-right-width:inherit;
 }
 .menuitembottom:hover {
   background:@theme_bg_color;
-  border-style: solid;
-  border-bottom-width: 1px;
-  border-left-width: 1px;
-  border-right-width: 1px;
-	border-color:alpha(@theme_text_color, 0.3);
-  border-radius:0px;
+  border-color:inherit;
+  border-bottom-width:0px;
+  border-left-width:inherit;
+  border-right-width:inherit;
   
 }
 .menuitemtop:hover* {
@@ -128,14 +109,17 @@ background-color: #404040;
 .workingbg, #workingbg {
 	background-color:@theme_base_color;
 }
+
 .workingbg.view.cell:selected {
 	background-color:@theme_selected_bg_color;
 }
+
 .workingbg.view.cell:hover {
 	background-color:darker(@theme_selected_bg_color);
 	color:@theme_selected_text_color;
 	border-radius:3px;
 }
+
 .bkim {
 	transition: 200ms ease-out;
     	background-image: none;
diff --git a/ubl-settings-manager.glade b/ubl-settings-manager.glade
index d2d04ba..c5b9de8 100644
--- a/ubl-settings-manager.glade
+++ b/ubl-settings-manager.glade
@@ -123,9 +123,6 @@
         </style>
       </object>
     </child>
-    <style>
-      <class name="menu"/>
-    </style>
   </object>
   <object class="GtkApplicationWindow" id="HelpSureWindow">
     <property name="can-focus">False</property>
@@ -338,13 +335,10 @@
         <property name="label" translatable="yes">Documentation</property>
         <property name="use-underline">True</property>
         <style>
-          <class name="menuitemmiddle"/>
+          <class name="menuitembottom"/>
         </style>
       </object>
     </child>
-    <style>
-      <class name="menu"/>
-    </style>
   </object>
   <object class="GtkMenu">
     <property name="visible">True</property>
@@ -456,7 +450,7 @@
                         <property name="height-request">64</property>
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="icon-name">com.ublinux.ubl-settings-manager</property>
+                        <property name="icon-name">ru.ublinux.ubl-settings-manager</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -627,7 +621,7 @@
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="pixel-size">32</property>
-            <property name="icon-name">com.ublinux.ubl-settings-manager</property>
+            <property name="icon-name">ru.ublinux.ubl-settings-manager</property>
             <property name="icon_size">5</property>
           </object>
         </child>
@@ -800,7 +794,7 @@
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="pixel-size">32</property>
-            <property name="icon-name">com.ublinux.ubl-settings-manager</property>
+            <property name="icon-name">ru.ublinux.ubl-settings-manager</property>
             <property name="icon_size">5</property>
           </object>
         </child>
@@ -1202,7 +1196,7 @@
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="pixel-size">32</property>
-            <property name="icon-name">com.ublinux.ubl-settings-manager</property>
+            <property name="icon-name">ru.ublinux.ubl-settings-manager</property>
             <property name="icon_size">5</property>
           </object>
         </child>
@@ -1455,7 +1449,7 @@
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="pixel-size">32</property>
-            <property name="icon-name">com.ublinux.ubl-settings-manager</property>
+            <property name="icon-name">ru.ublinux.ubl-settings-manager</property>
             <property name="icon_size">5</property>
           </object>
         </child>
@@ -1882,7 +1876,7 @@
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="pixel-size">32</property>
-            <property name="icon-name">com.ublinux.ubl-settings-manager</property>
+            <property name="icon-name">ru.ublinux.ubl-settings-manager</property>
             <property name="icon_size">5</property>
           </object>
         </child>
@@ -1968,7 +1962,7 @@
     <property name="website-label" translatable="yes">Project Home Page</property>
     <property name="authors">UBGroup</property>
     <property name="artists">UBGroup</property>
-    <property name="logo-icon-name">com.ublinux.ubl-settings-manager</property>
+    <property name="logo-icon-name">ru.ublinux.ubl-settings-manager</property>
     <property name="license-type">gpl-2-0</property>
     <child internal-child="vbox">
       <object class="GtkBox">