From d6fb8b7607844a253c26d00da0aadd2a086e7de5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= Date: Thu, 23 Sep 2021 09:25:09 +0200 Subject: [PATCH] Gnome-Shell: Update for GNOME 41 --- .../Kali-Dark/gnome-shell/gnome-shell.css | 22 +++++++++++-------- .../Kali-Light/gnome-shell/gnome-shell.css | 22 +++++++++++-------- .../upstream/gnome-shell-sass/_drawing.scss | 2 +- .../gnome-shell-sass/widgets/_app-grid.scss | 3 +-- .../gnome-shell-sass/widgets/_entries.scss | 2 +- .../widgets/_message-list.scss | 14 ++++++++++++ .../widgets/_search-entry.scss | 7 ++---- .../Kali/sass/gnome-shell/upstream/sync.sh | 2 +- 8 files changed, 46 insertions(+), 28 deletions(-) diff --git a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css index c50579a9..5126e124 100644 --- a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css +++ b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css @@ -152,7 +152,7 @@ stage { StEntry { border-radius: 8px; padding: 8px; - border-width: 1px; + border-width: 0; color: #eeeeec; background-color: #272a34; border-color: #0d0e11; @@ -160,7 +160,7 @@ StEntry { selected-color: #ffffff; } StEntry:focus { border-color: #00348d; - box-shadow: inset 0 0 0 1px #2777ff; } + box-shadow: inset 0 0 0 2px #2777ff; } StEntry:insensitive { color: #888a8d; border-color: #242731; @@ -719,6 +719,13 @@ StScrollBar { margin: 8px 16px 0; padding: 4px; spacing: 12px; } + .message-list-controls .dnd-button { + border-width: 2px; + border-color: transparent; + border-radius: 99px; + border-style: solid; } + .message-list-controls .dnd-button:focus { + border-color: rgba(39, 119, 255, 0.6); } .message { border-width: 1px; @@ -1327,18 +1334,16 @@ StScrollBar { border-radius: 18px; color: rgba(238, 238, 236, 0.7); background-color: #23252e; - border-color: #0d0e11; margin-top: 12px; - margin-bottom: 6px; } + margin-bottom: 6px; + border-width: 2px; + border-color: transparent; } .search-entry:hover { background-color: #2e313d; - border-color: #13151a; color: #fafaf9; } .search-entry:focus { - padding: 6px 8px; - border-width: 2px; border-style: solid; border-color: #2777ff; color: #eeeeec; @@ -1553,8 +1558,7 @@ StScrollBar { .rename-folder-popup .rename-folder-popup-item:ltr, .rename-folder-popup .rename-folder-popup-item:rtl { padding: 0 12px; } -.app-menu, -.app-well-menu { +.app-menu { max-width: 27.25em; } .page-indicator { diff --git a/share/themes/Kali-Light/gnome-shell/gnome-shell.css b/share/themes/Kali-Light/gnome-shell/gnome-shell.css index ac47a0ef..394dde34 100644 --- a/share/themes/Kali-Light/gnome-shell/gnome-shell.css +++ b/share/themes/Kali-Light/gnome-shell/gnome-shell.css @@ -152,7 +152,7 @@ stage { StEntry { border-radius: 8px; padding: 8px; - border-width: 1px; + border-width: 0; color: #5c616c; background-color: #fafafa; border-color: #d9d9d9; @@ -160,7 +160,7 @@ StEntry { selected-color: #ffffff; } StEntry:focus { border-color: #0051da; - box-shadow: inset 0 0 0 1px #2777ff; } + box-shadow: inset 0 0 0 2px #2777ff; } StEntry:insensitive { color: #aeb0b6; border-color: #fdfdfd; @@ -718,6 +718,13 @@ StScrollBar { margin: 8px 16px 0; padding: 4px; spacing: 12px; } + .message-list-controls .dnd-button { + border-width: 2px; + border-color: transparent; + border-radius: 99px; + border-style: solid; } + .message-list-controls .dnd-button:focus { + border-color: rgba(39, 119, 255, 0.6); } .message { border-width: 1px; @@ -1326,18 +1333,16 @@ StScrollBar { border-radius: 18px; color: rgba(92, 97, 108, 0.7); background-color: #ffffff; - border-color: #d9d9d9; margin-top: 12px; - margin-bottom: 6px; } + margin-bottom: 6px; + border-width: 2px; + border-color: transparent; } .search-entry:hover { background-color: #f7f7f7; - border-color: #e6e6e6; color: #50555e; } .search-entry:focus { - padding: 6px 8px; - border-width: 2px; border-style: solid; border-color: #2777ff; color: #5c616c; @@ -1552,8 +1557,7 @@ StScrollBar { .rename-folder-popup .rename-folder-popup-item:ltr, .rename-folder-popup .rename-folder-popup-item:rtl { padding: 0 12px; } -.app-menu, -.app-well-menu { +.app-menu { max-width: 27.25em; } .page-indicator { 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 d5d959f0..f09eb123 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 @@ -46,7 +46,7 @@ border-color: if($fc==$selected_bg_color, $selected_borders_color, darken($fc,35%)); - box-shadow: inset 0 0 0 1px $fc; + box-shadow: inset 0 0 0 2px $fc; } @if $t==hover { } @if $t==insensitive { diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_app-grid.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_app-grid.scss index 626925ab..2df69116 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_app-grid.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_app-grid.scss @@ -108,8 +108,7 @@ $app_grid_fg_color: #fff; } // right-click app menu -.app-menu, -.app-well-menu { +.app-menu { max-width: 27.25em; } diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_entries.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_entries.scss index 0a43e86f..5a119455 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_entries.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_entries.scss @@ -3,7 +3,7 @@ StEntry { border-radius: $base_border_radius; padding: 8px; - border-width: 1px; + border-width: 0; color: $fg_color; @include entry(normal); //&:hover { @include entry(hover);} diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_message-list.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_message-list.scss index 02d122b9..bb9239f4 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_message-list.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_message-list.scss @@ -25,6 +25,20 @@ // NOTE: remove the padding if notification_bubble could remove margin for drop shadow padding: $base_margin; spacing: $base_spacing * 2; + + .dnd-button { + // We need this because the focus outline isn't inset like for the buttons + // so the dnd button would grow when it gets focus if we didn't change only + // its color when focusing. + border-width: 2px; + border-color: transparent; + border-radius: 99px; + border-style: solid; + + &:focus { + border-color: transparentize($selected_bg_color, 0.4); + } + } } // message bubbles diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_search-entry.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_search-entry.scss index b184e674..d3584fb9 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_search-entry.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_search-entry.scss @@ -10,19 +10,16 @@ $search_entry_height: 36px; border-radius: $search_entry_height * 0.5; // half the height color: transparentize($fg_color,0.3); background-color: $bg_color; - border-color: $borders_color; margin-top: $base_spacing * 2; margin-bottom: $base_spacing; - + border-width: 2px; + border-color: transparent; &:hover { background-color: $hover_bg_color; - border-color: $hover_borders_color; color: $hover_fg_color; } &:focus { - padding: $base_padding $base_padding+2; // 1px less to account for wider border - border-width: 2px; border-style: solid; border-color: $selected_bg_color; color: $fg_color; diff --git a/src/themes/Kali/sass/gnome-shell/upstream/sync.sh b/src/themes/Kali/sass/gnome-shell/upstream/sync.sh index acd32cee..5e2f683a 100755 --- a/src/themes/Kali/sass/gnome-shell/upstream/sync.sh +++ b/src/themes/Kali/sass/gnome-shell/upstream/sync.sh @@ -4,7 +4,7 @@ GREEN='\033[0;32m' YELLOW='\033[0;33m' RESET='\033[0m' -VERSION=40.3 +VERSION=41.0 echo printf " $YELLOW[ i ]$RESET Upstream version $VERSION\n"