From e042a6facba0a104d9867579ba9c5aee8a8a06b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= <daniruiz@kali.org>
Date: Thu, 2 Dec 2021 08:33:00 +0100
Subject: [PATCH] Gnome-Shell: improve background for hovered items in calendar
 popover

---
 .../Kali-Dark/gnome-shell/gnome-shell.css     | 16 +++++++++--
 .../Kali-Light/gnome-shell/gnome-shell.css    | 16 +++++++++--
 .../Kali/sass/gnome-shell/_common-tweaks.scss | 27 ++++++++++++++++---
 3 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
index b47b9137..8b311138 100644
--- a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
+++ b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
@@ -2253,6 +2253,10 @@ StScrollBar {
   .toggle-switch:checked {
     background-image: url("assets/toggle-on-dark.svg"); }
 
+.popup-menu-item.selected, .popup-menu-item:active {
+  background-color: #3b3e46;
+  color: #eeeeec; }
+
 /* App Switcher */
 .switcher-list .item-box:outlined {
   padding: 6px;
@@ -2408,12 +2412,20 @@ StScrollBar {
     text-shadow: none;
     icon-shadow: none;
     box-shadow: none; }
-  .calendar .calendar-day-base:active, .calendar .calendar-day-base:selected {
+  .calendar .pager-button:hover, .calendar .pager-button:focus {
+    background-color: #3b3e46; }
+  .calendar .calendar-day-base:hover, .calendar .calendar-day-base:focus, .calendar .calendar-day-base:active, .calendar .calendar-day-base:selected {
     color: #eeeeec;
-    background-color: #383d4b; }
+    background-color: #3b3e46; }
+  .calendar .calendar-today:hover, .calendar .calendar-today:focus {
+    background-color: #3b3e46;
+    color: #eeeeec; }
   .calendar .calendar-today:active, .calendar .calendar-today:selected {
     background: #2777ff;
     color: #ffffff; }
+    .calendar .calendar-today:active:hover, .calendar .calendar-today:active:focus, .calendar .calendar-today:selected:hover, .calendar .calendar-today:selected:focus {
+      background-color: #3b3e46;
+      color: #eeeeec; }
 
 /* Events */
 .events-button {
diff --git a/share/themes/Kali-Light/gnome-shell/gnome-shell.css b/share/themes/Kali-Light/gnome-shell/gnome-shell.css
index ab4a0e98..7ef44986 100644
--- a/share/themes/Kali-Light/gnome-shell/gnome-shell.css
+++ b/share/themes/Kali-Light/gnome-shell/gnome-shell.css
@@ -2248,6 +2248,10 @@ StScrollBar {
   .toggle-switch:checked {
     background-image: url("assets/toggle-on.svg"); }
 
+.popup-menu-item.selected, .popup-menu-item:active {
+  background-color: #eaebec;
+  color: #5c616c; }
+
 /* App Switcher */
 .switcher-list .item-box:outlined {
   padding: 6px;
@@ -2403,12 +2407,20 @@ StScrollBar {
     text-shadow: none;
     icon-shadow: none;
     box-shadow: none; }
-  .calendar .calendar-day-base:active, .calendar .calendar-day-base:selected {
+  .calendar .pager-button:hover, .calendar .pager-button:focus {
+    background-color: #eaebec; }
+  .calendar .calendar-day-base:hover, .calendar .calendar-day-base:focus, .calendar .calendar-day-base:active, .calendar .calendar-day-base:selected {
     color: #5c616c;
-    background-color: #e6e6e6; }
+    background-color: #eaebec; }
+  .calendar .calendar-today:hover, .calendar .calendar-today:focus {
+    background-color: #eaebec;
+    color: #5c616c; }
   .calendar .calendar-today:active, .calendar .calendar-today:selected {
     background: #2777ff;
     color: #ffffff; }
+    .calendar .calendar-today:active:hover, .calendar .calendar-today:active:focus, .calendar .calendar-today:selected:hover, .calendar .calendar-today:selected:focus {
+      background-color: #eaebec;
+      color: #5c616c; }
 
 /* Events */
 .events-button {
diff --git a/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss b/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss
index 39a6d44f..0e30d94f 100644
--- a/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss
+++ b/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss
@@ -64,6 +64,14 @@ $_osd_color: if($variant=='light', black, $fg_color);
   }
 }
 
+// menu items
+.popup-menu-item {
+    &.selected, &:active {
+        background-color: $popover_hover_color;
+        color: $fg_color;
+    }
+}
+
 /* App Switcher */
 // switcher onscreen panel
 .switcher-list {
@@ -242,17 +250,30 @@ $_osd_color: if($variant=='light', black, $fg_color);
 .calendar {
   @include notification_bubble($flat: true);
 
+  .pager-button {
+    &:hover, &:focus { background-color: $popover_hover_color }
+  }
+
   .calendar-day-base {
-    &:active, &:selected {
+    &:hover, &:focus,
+    &:active,&:selected {
       color: $fg_color;
-      background-color: if($variant=='light', darken($bg_color, 10%), lighten($bg_color, 10%));
+      background-color: $popover_hover_color;
     }
   }
 
   .calendar-today {
-    &:active, &:selected {
+    &:hover,&:focus {
+      background-color: $popover_hover_color;
+      color: $fg_color;
+    }
+    &:active,&:selected {
       background: $selected_bg_color;
       color: $selected_fg_color;
+      &:hover,&:focus {
+        background-color: $popover_hover_color;
+        color: $fg_color;
+      }
     }
   }
 }