From 5d7b1ac030860458427e5452b082500e60c4d491 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Thu, 10 Oct 2024 17:42:30 +0600
Subject: [PATCH] Fixes

---
 source/ubl-settings-datetime.c |   2 +-
 ubl-settings-datetime.css      | 130 ++++++++++++++++++++-------------
 2 files changed, 79 insertions(+), 53 deletions(-)

diff --git a/source/ubl-settings-datetime.c b/source/ubl-settings-datetime.c
index 0ef7363..0f5ca95 100644
--- a/source/ubl-settings-datetime.c
+++ b/source/ubl-settings-datetime.c
@@ -53,7 +53,7 @@ void yon_save_parameters(main_window *widgets){
     const char *zone = gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->ZoneCombo));
 
     if (!yon_char_is_empty(region)&&!yon_char_is_empty(zone)){
-        char *zone_parameter = yon_char_unite(region,"/",zone,NULL);
+        char *zone_parameter = yon_char_unite((char*)region,"/",(char*)zone,NULL);
         yon_config_register(ZONE_parameter,ZONE_parameter_command,zone_parameter);
         free(zone_parameter);
     }
diff --git a/ubl-settings-datetime.css b/ubl-settings-datetime.css
index 526a8f8..f60dc43 100644
--- a/ubl-settings-datetime.css
+++ b/ubl-settings-datetime.css
@@ -20,58 +20,84 @@
 border-color:alpha(@theme_text_color, 0.01);
 }
 
-.menuitemtop{
-margin-bottom:0px;
-}
-.menuitemtop *{
-margin:2px 2px 0 2px;
-padding: 5px 10px 3px 5px;
-}
-.menuitemmiddle *{
-margin:0 2px 0 2px;
-padding: 3px 10px 3px 5px;
-}
-.menuitembottom *{
-margin:0 2px 2px 2px;
-padding: 3px 10px 5px 5px;
-}
-.menuitemtop:hover {
-background:@theme_bg_color;
-border-color:inherit;
-border-left-width:inherit;
-border-right-width:inherit;
-}
-.menuitemmiddle:hover {
-background:@theme_bg_color;
-border-color:inherit;
-border-left-width:inherit;
-border-right-width:inherit;
-}
-.menuitembottom:hover {
-background:@theme_bg_color;
-border-color:inherit;
-border-left-width:inherit;
-border-right-width:inherit;
-
-}
-.menuitemtop:hover* {
-margin:2px 2px 0 2px;
-padding: 5px 10px 3px 5px;
-background:@theme_selected_bg_color;
-border-radius:2px;
-}
-.menuitemmiddle:hover* {
-margin:0 2px 0 2px;
-padding: 3px 10px 3px 5px;
-background:@theme_selected_bg_color;
-border-radius:2px;
-}
-.menuitembottom:hover* {
-margin:0 2px 2px 2px;
-padding: 3px 10px 5px 5px;
-background:@theme_selected_bg_color;
-border-radius:2px;
-}
+.menuitembottom{
+	margin-top:0px;
+	margin-bottom:4px;
+	border-color:inherit;
+	border-left-width:inherit;
+	border-right-width:inherit;
+  }
+  .menuitemmiddle{
+	margin-top:0px;
+	margin-bottom:0px;
+	border-color:inherit;
+	border-left-width:inherit;
+	border-right-width:inherit;
+  }
+  
+  .menuitemtop{
+	margin-bottom:0px;
+	border-color:inherit;
+	border-top-width:inherit;
+	border-left-width:inherit;
+	border-right-width:inherit;
+  }
+  .menuitemtop>*{
+	margin:2px 2px 0 2px;
+	padding: 3px 10px 3px 5px;
+	border:transparent;
+  }
+  .menuitemmiddle>*{
+	margin:0 2px 0 2px;
+	padding: 3px 10px 3px 5px;
+	border:transparent;
+  }
+  .menuitembottom>*{
+	margin:0 2px 2px 2px;
+	padding: 3px 10px 3px 5px;
+  }
+  .menuitemtop:hover {
+	background:@theme_base_color;
+	border-color:inherit;
+	border-top-width:inherit;
+	border-left-width:inherit;
+	border-right-width:inherit;
+  }
+  .menuitemmiddle:hover {
+	background:@theme_base_color;
+	border-color:inherit;
+	border-left-width:inherit;
+	border-right-width:inherit;
+  }
+  .menuitembottom:hover {
+	background:@theme_base_color;
+	border-color:inherit;
+	border-bottom-width:0px;
+	border-left-width:inherit;
+	border-right-width:inherit;
+	
+  }
+  .menuitemtop:hover>* {
+	margin:2px 2px 0 2px;
+	padding: 3px 10px 3px 5px;
+	/* padding: 5px 0 3px 5px; */
+	background:@theme_selected_bg_color;
+	border-radius:2px;
+  }
+  .menuitemmiddle:hover>* {
+	margin:0 2px 0px 2px;
+	padding: 3px 10px 3px 5px;
+	/* padding: 3px 0px 3px 5px; */
+	background:@theme_selected_bg_color;
+	border-radius:2px;
+  }
+  .menuitembottom:hover>* {
+	margin:0 2px 2px 2px;
+	padding: 3px 10px 3px 5px;
+	/* padding: 3px 0px 5px 5px; */
+	background:@theme_selected_bg_color;
+	border-radius:2px;
+  }
 
 .noborder{
   border:none;