From adbb5f7dfd90a7fb6eebf1149c0105094dcf35c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= Date: Mon, 11 May 2020 11:08:50 +0200 Subject: [PATCH] Gnome-Shell: pull upstream theme changes for 3.36.2 --- share/themes/Kali-Dark/gnome-shell/gnome-shell.css | 5 +++-- share/themes/Kali-Light/gnome-shell/gnome-shell.css | 5 +++-- .../upstream/gnome-shell-sass/widgets/_calendar.scss | 6 ++++-- src/themes/Kali/sass/gnome-shell-sass/upstream/sync.sh | 2 +- 4 files changed, 11 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 61812059..1264fe7d 100644 --- a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css +++ b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css @@ -525,9 +525,10 @@ StScrollBar { background-color: #3681ff; color: #ffffff; } .calendar .calendar-day-with-events { - color: white; - font-weight: bold; background-image: url("assets/calendar-today.svg"); } + .calendar .calendar-day-with-events.calendar-work-day { + color: white; + font-weight: bold; } .calendar .calendar-other-month-day { color: rgba(238, 238, 236, 0.5); } .calendar .calendar-week-number { diff --git a/share/themes/Kali-Light/gnome-shell/gnome-shell.css b/share/themes/Kali-Light/gnome-shell/gnome-shell.css index f0d6d72d..5eb043c4 100644 --- a/share/themes/Kali-Light/gnome-shell/gnome-shell.css +++ b/share/themes/Kali-Light/gnome-shell/gnome-shell.css @@ -524,9 +524,10 @@ StScrollBar { background-color: #3681ff; color: #ffffff; } .calendar .calendar-day-with-events { - color: #737a88; - font-weight: bold; background-image: url("assets/calendar-today.svg"); } + .calendar .calendar-day-with-events.calendar-work-day { + color: #737a88; + font-weight: bold; } .calendar .calendar-other-month-day { color: rgba(92, 97, 108, 0.5); } .calendar .calendar-week-number { diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_calendar.scss b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_calendar.scss index 288d7049..ff87ab85 100644 --- a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_calendar.scss +++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_calendar.scss @@ -153,9 +153,11 @@ } .calendar-day-with-events { - color: lighten($fg_color,10%); - font-weight: bold; background-image: url("assets/calendar-today.svg"); + &.calendar-work-day { + color: lighten($fg_color,10%); + font-weight: bold; + } } .calendar-other-month-day { diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/sync.sh b/src/themes/Kali/sass/gnome-shell-sass/upstream/sync.sh index 66e9aec7..60fda4c4 100755 --- a/src/themes/Kali/sass/gnome-shell-sass/upstream/sync.sh +++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/sync.sh @@ -4,7 +4,7 @@ GREEN='\033[0;32m' YELLOW='\033[0;33m' RESET='\033[0m' -VERSION=3.36.1 +VERSION=3.36.2 echo echo -e " $YELLOW[ i ]$RESET Upstream version $VERSION"