From 7e368dd4d5525117166fc5e1e543b9b4c544616a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= <daniruiz@kali.org>
Date: Wed, 2 Mar 2022 17:07:31 +0100
Subject: [PATCH] Gnome-Shell: update calendar theme tweaks

---
 .../Kali-Dark/gnome-shell/gnome-shell.css     | 131 +++++-------------
 .../Kali-Light/gnome-shell/gnome-shell.css    | 131 +++++-------------
 .../Kali/sass/gnome-shell/_common-tweaks.scss |  94 +------------
 .../upstream/gnome-shell-sass/_drawing.scss   |   2 +-
 .../gnome-shell-sass/_drawing.scss.patch      |   4 +
 5 files changed, 75 insertions(+), 287 deletions(-)
 create mode 100644 src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_drawing.scss.patch

diff --git a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
index 6262ddfc..fb67c026 100644
--- a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
+++ b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
@@ -134,16 +134,14 @@ stage {
   .screenshot-ui-show-pointer-button:insensitive, .screenshot-ui-type-button:insensitive {
     color: rgba(238, 238, 236, 0.5);
     background-color: rgba(238, 238, 236, 0.05);
-    background-color: transparent;
-    color: rgba(255, 255, 255, 0.5); }
+    background-color: transparent; }
   .screenshot-ui-show-pointer-button:insensitive, .screenshot-ui-type-button:insensitive {
     background-color: transparent;
     background-color: none; }
     .screenshot-ui-show-pointer-button:insensitive:insensitive, .screenshot-ui-type-button:insensitive:insensitive {
       color: rgba(238, 238, 236, 0.5);
       background-color: rgba(238, 238, 236, 0.05);
-      background-color: transparent;
-      color: rgba(255, 255, 255, 0.5); }
+      background-color: transparent; }
   .screenshot-ui-show-pointer-button:focus, .screenshot-ui-type-button:focus {
     color: #eeeeec;
     background-color: #37435a;
@@ -488,8 +486,7 @@ StScrollBar {
   .datemenu-today-button:insensitive {
     color: rgba(238, 238, 236, 0.5);
     background-color: rgba(238, 238, 236, 0.05);
-    background-color: transparent;
-    color: rgba(255, 255, 255, 0.5); }
+    background-color: transparent; }
   .datemenu-today-button:focus {
     color: #eeeeec;
     background-color: #2c364c;
@@ -519,8 +516,7 @@ StScrollBar {
   .calendar:insensitive {
     color: rgba(238, 238, 236, 0.5);
     background-color: rgba(238, 238, 236, 0.05);
-    background-color: transparent;
-    color: rgba(255, 255, 255, 0.5); }
+    background-color: transparent; }
   .calendar:focus {
     color: #eeeeec;
     background-color: #2c364c;
@@ -1810,8 +1806,7 @@ StScrollBar {
       .app-folder-dialog .folder-name-container .edit-folder-button:insensitive {
         color: rgba(238, 238, 236, 0.5);
         background-color: rgba(238, 238, 236, 0.05);
-        background-color: transparent;
-        color: rgba(255, 255, 255, 0.5); }
+        background-color: transparent; }
       .app-folder-dialog .folder-name-container .edit-folder-button:focus {
         color: #eeeeec;
         background-color: #2c364c;
@@ -2699,96 +2694,34 @@ $_osd_color: if($variant=='light', black, $fg_color);
       background-image: url("assets/view-grid-symbolic-dark.svg"); }
 
 /* Date/Time Menu */
-/*
-@mixin notification_bubble($flat: false) {
-  border-width: 1px;
-  border-style: solid;
-  border-radius: $base_border_radius + 2px;
-  margin: $base_margin;
-
-  @if $flat {
-    @include button(undecorated);
-  } @else {
-    @include button(normal);
-  }
-
-  &:focus {
-    @include button(focus);
-  }
-
-  &:hover {
-    @include button(hover);
-    box-shadow: none;
-  }
-
-  &:active {
-    @include button(active);
-  }
-}
-
-// overall menu
-#calendarArea {
-  background-image: if($variant == 'light', url("assets/kali-dragon.svg"),
-                                            url("assets/kali-dragon-dark.svg"));
-  background-size: contain;
-}
-
-.events-section-title { padding: 1em; }
-
 .datemenu-today-button {
-  @include notification_bubble($flat: true);
-
-  .date-label {
-    font-size: 1.5em;
-    font-weight: 300;
-  }
-}
-
-.calendar {
-  @include notification_bubble($flat: true);
-
-  .pager-button {
-    &:hover, &:focus { background-color: $popover_hover_color }
-  }
-
-  .calendar-day-base {
-    &:hover, &:focus,
-    &:active,&:selected {
-      color: $fg_color;
-      background-color: $popover_hover_color;
-    }
-  }
-
-  .calendar-today {
-    &: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;
-      }
-    }
-  }
-}
-
-/* Events */
-/*
-.events-button { @include notification_bubble($flat: true); }
-
-/* World clocks */
-/*
-.world-clocks-button {
-  @include notification_bubble($flat: true);
-}
-
-.weather-button {
-  @include notification_bubble($flat: true);
-}
-
+  border-radius: 8px;
+  margin: 4px;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
+  color: #eeeeec;
+  background-color: #2d2f38; }
+  .datemenu-today-button:focus {
+    color: #eeeeec;
+    background-color: #2c364c;
+    box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.6); }
+    .datemenu-today-button:focus:hover {
+      background-color: #333d54;
+      box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.7); }
+    .datemenu-today-button:focus:active {
+      background-color: #39435b;
+      box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.7); }
+  .datemenu-today-button:hover {
+    color: #eeeeec;
+    background-color: #343640; }
+  .datemenu-today-button:active {
+    color: #eeeeec;
+    background-color: #3b3d49; }
+  .datemenu-today-button:insensitive {
+    color: inherit; }
+  .datemenu-today-button .day-label {
+    font-weight: normal; }
+  .datemenu-today-button .date-label {
+    font-weight: lighter; }
 
 /* Search */
 .search-entry {
diff --git a/share/themes/Kali-Light/gnome-shell/gnome-shell.css b/share/themes/Kali-Light/gnome-shell/gnome-shell.css
index 5538fde8..dfff1d8f 100644
--- a/share/themes/Kali-Light/gnome-shell/gnome-shell.css
+++ b/share/themes/Kali-Light/gnome-shell/gnome-shell.css
@@ -134,16 +134,14 @@ stage {
   .screenshot-ui-show-pointer-button:insensitive, .screenshot-ui-type-button:insensitive {
     color: rgba(92, 97, 108, 0.5);
     background-color: rgba(92, 97, 108, 0.05);
-    background-color: transparent;
-    color: rgba(255, 255, 255, 0.5); }
+    background-color: transparent; }
   .screenshot-ui-show-pointer-button:insensitive, .screenshot-ui-type-button:insensitive {
     background-color: transparent;
     background-color: none; }
     .screenshot-ui-show-pointer-button:insensitive:insensitive, .screenshot-ui-type-button:insensitive:insensitive {
       color: rgba(92, 97, 108, 0.5);
       background-color: rgba(92, 97, 108, 0.05);
-      background-color: transparent;
-      color: rgba(255, 255, 255, 0.5); }
+      background-color: transparent; }
   .screenshot-ui-show-pointer-button:focus, .screenshot-ui-type-button:focus {
     color: #5c616c;
     background-color: #313d55;
@@ -488,8 +486,7 @@ StScrollBar {
   .datemenu-today-button:insensitive {
     color: rgba(92, 97, 108, 0.5);
     background-color: rgba(92, 97, 108, 0.05);
-    background-color: transparent;
-    color: rgba(255, 255, 255, 0.5); }
+    background-color: transparent; }
   .datemenu-today-button:focus {
     color: #5c616c;
     background-color: #e2eaf9;
@@ -519,8 +516,7 @@ StScrollBar {
   .calendar:insensitive {
     color: rgba(92, 97, 108, 0.5);
     background-color: rgba(92, 97, 108, 0.05);
-    background-color: transparent;
-    color: rgba(255, 255, 255, 0.5); }
+    background-color: transparent; }
   .calendar:focus {
     color: #5c616c;
     background-color: #e2eaf9;
@@ -1810,8 +1806,7 @@ StScrollBar {
       .app-folder-dialog .folder-name-container .edit-folder-button:insensitive {
         color: rgba(92, 97, 108, 0.5);
         background-color: rgba(92, 97, 108, 0.05);
-        background-color: transparent;
-        color: rgba(255, 255, 255, 0.5); }
+        background-color: transparent; }
       .app-folder-dialog .folder-name-container .edit-folder-button:focus {
         color: #5c616c;
         background-color: #e2eaf9;
@@ -2695,96 +2690,34 @@ $_osd_color: if($variant=='light', black, $fg_color);
       background-image: url("assets/view-grid-symbolic-dark.svg"); }
 
 /* Date/Time Menu */
-/*
-@mixin notification_bubble($flat: false) {
-  border-width: 1px;
-  border-style: solid;
-  border-radius: $base_border_radius + 2px;
-  margin: $base_margin;
-
-  @if $flat {
-    @include button(undecorated);
-  } @else {
-    @include button(normal);
-  }
-
-  &:focus {
-    @include button(focus);
-  }
-
-  &:hover {
-    @include button(hover);
-    box-shadow: none;
-  }
-
-  &:active {
-    @include button(active);
-  }
-}
-
-// overall menu
-#calendarArea {
-  background-image: if($variant == 'light', url("assets/kali-dragon.svg"),
-                                            url("assets/kali-dragon-dark.svg"));
-  background-size: contain;
-}
-
-.events-section-title { padding: 1em; }
-
 .datemenu-today-button {
-  @include notification_bubble($flat: true);
-
-  .date-label {
-    font-size: 1.5em;
-    font-weight: 300;
-  }
-}
-
-.calendar {
-  @include notification_bubble($flat: true);
-
-  .pager-button {
-    &:hover, &:focus { background-color: $popover_hover_color }
-  }
-
-  .calendar-day-base {
-    &:hover, &:focus,
-    &:active,&:selected {
-      color: $fg_color;
-      background-color: $popover_hover_color;
-    }
-  }
-
-  .calendar-today {
-    &: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;
-      }
-    }
-  }
-}
-
-/* Events */
-/*
-.events-button { @include notification_bubble($flat: true); }
-
-/* World clocks */
-/*
-.world-clocks-button {
-  @include notification_bubble($flat: true);
-}
-
-.weather-button {
-  @include notification_bubble($flat: true);
-}
-
+  border-radius: 8px;
+  margin: 4px;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
+  color: #5c616c;
+  background-color: #f7f7f8; }
+  .datemenu-today-button:focus {
+    color: #5c616c;
+    background-color: #e2eaf9;
+    box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.6); }
+    .datemenu-today-button:focus:hover {
+      background-color: #e9f1ff;
+      box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.7); }
+    .datemenu-today-button:focus:active {
+      background-color: #e9f1ff;
+      box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.7); }
+  .datemenu-today-button:hover {
+    color: #5c616c;
+    background-color: white; }
+  .datemenu-today-button:active {
+    color: #5c616c;
+    background-color: white; }
+  .datemenu-today-button:insensitive {
+    color: inherit; }
+  .datemenu-today-button .day-label {
+    font-weight: normal; }
+  .datemenu-today-button .date-label {
+    font-weight: lighter; }
 
 /* Search */
 .search-entry {
diff --git a/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss b/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss
index 00dd5ca6..36e7409d 100644
--- a/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss
+++ b/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss
@@ -175,98 +175,16 @@ $_osd_color: if($variant=='light', black, $fg_color);
 }
 
 /* Date/Time Menu */
-// notification styling
-/*
-@mixin notification_bubble($flat: false) {
-  border-width: 1px;
-  border-style: solid;
-  border-radius: $base_border_radius + 2px;
-  margin: $base_margin;
-
-  @if $flat {
-    @include button(undecorated);
-  } @else {
-    @include button(normal);
-  }
-
-  &:focus {
-    @include button(focus);
-  }
-
-  &:hover {
-    @include button(hover);
-    box-shadow: none;
-  }
-
-  &:active {
-    @include button(active);
-  }
-}
-
-// overall menu
-#calendarArea {
-  background-image: if($variant == 'light', url("assets/kali-dragon.svg"),
-                                            url("assets/kali-dragon-dark.svg"));
-  background-size: contain;
-}
-
-.events-section-title { padding: 1em; }
-
 .datemenu-today-button {
-  @include notification_bubble($flat: true);
+  @include card($flat: false);
 
-  .date-label {
-    font-size: 1.5em;
-    font-weight: 300;
-  }
+  &:insensitive { color: inherit; }
+
+  .day-label { font-weight: normal; }
+
+  .date-label { font-weight: lighter; }
 }
 
-.calendar {
-  @include notification_bubble($flat: true);
-
-  .pager-button {
-    &:hover, &:focus { background-color: $popover_hover_color }
-  }
-
-  .calendar-day-base {
-    &:hover, &:focus,
-    &:active,&:selected {
-      color: $fg_color;
-      background-color: $popover_hover_color;
-    }
-  }
-
-  .calendar-today {
-    &: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;
-      }
-    }
-  }
-}
-
-/* Events */
-/*
-.events-button { @include notification_bubble($flat: true); }
-
-/* World clocks */
-/*
-.world-clocks-button {
-  @include notification_bubble($flat: true);
-}
-
-.weather-button {
-  @include notification_bubble($flat: true);
-}
-
-
 /* Search */
 
 // search entry
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_drawing.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_drawing.scss
index 10c1c3f3..9fe5eb8c 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_drawing.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_drawing.scss
@@ -225,7 +225,7 @@ $button_bg_color: mix($tc, $c, 5%);
     &:insensitive {
       @include button(insensitive);
       background-color: transparent;
-      color: transparentize($selected_fg_color, .5);
+      //color: transparentize($selected_fg_color, .5);
     }
   }
 }
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_drawing.scss.patch b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_drawing.scss.patch
new file mode 100644
index 00000000..a52d04b6
--- /dev/null
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_drawing.scss.patch
@@ -0,0 +1,4 @@
+228c228
+<       color: transparentize($selected_fg_color, .5);
+---
+>       //color: transparentize($selected_fg_color, .5);