From ea2d98d25fae7c92a301ca3b99c84759d312a95a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= Date: Wed, 9 Sep 2020 11:24:43 +0200 Subject: [PATCH] Gnome-Shell: Update 3.37.92: prepare for update 3.38 --- .../Kali-Dark/gnome-shell/gnome-shell.css | 66 +++++++++++++++++-- .../Kali-Light/gnome-shell/gnome-shell.css | 66 +++++++++++++++++-- .../upstream/gnome-shell-sass/_drawing.scss | 2 +- .../gnome-shell-sass/widgets/_calendar.scss | 27 +++++++- .../gnome-shell-sass/widgets/_dialogs.scss | 2 +- .../widgets/_looking-glass.scss | 7 ++ .../widgets/_notifications.scss | 2 +- .../widgets/_search-results.scss | 4 ++ .../gnome-shell-sass/widgets/_slider.scss | 2 +- .../widgets/_window-picker.scss | 13 ++-- .../sass/gnome-shell-sass/upstream/sync.sh | 2 +- 11 files changed, 166 insertions(+), 27 deletions(-) diff --git a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css index bf9ae41b..dccccfa2 100644 --- a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css +++ b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css @@ -540,11 +540,55 @@ StScrollBar { height: 1.8em; width: 2.3em; border-radius: 2px; - padding: 0.5em 0 0; margin: 6px; background-color: #1e2128; color: #fafaf9; } +/* Events */ +.events-button { + border-width: 1px; + border-style: solid; + border-radius: 7px; + margin: 4px; + color: #eeeeec; + background-color: #292c37; + border-color: #1a1c23; + box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.3); + text-shadow: 0 1px rgba(0, 0, 0, 0.2); + icon-shadow: 0 1px rgba(0, 0, 0, 0.2); + padding: 12px; } + .events-button:focus { + color: #eeeeec; + text-shadow: 0 1px rgba(0, 0, 0, 0.2); + icon-shadow: 0 1px rgba(0, 0, 0, 0.2); + box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.6); } + .events-button:hover { + color: #eeeeec; + background-color: #2e313d; + border-color: #1a1c23; + box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.3); + text-shadow: 0 1px rgba(0, 0, 0, 0.2); + icon-shadow: 0 1px rgba(0, 0, 0, 0.2); } + .events-button:active { + color: #eeeeec; + background-color: #1c1e25; + border-color: #0b0b0e; + text-shadow: none; + icon-shadow: none; + box-shadow: none; } + .events-button .events-box { + spacing: 6px; } + .events-button .events-list { + spacing: 12px; } + .events-button .events-title { + color: #878787; + font-weight: bold; + margin-bottom: 4px; } + .events-button .event-time { + color: #bebeb6; + font-feature-settings: "tnum"; + font-size: 10pt; } + /* World clocks */ .world-clocks-button { border-width: 1px; @@ -808,7 +852,7 @@ StScrollBar { .candidate-page-button-icon { icon-size: 1em; } -/* Notifications & Mesage Tray */ +/* Notifications & Message Tray */ .notification-banner { min-height: 64px; width: 34em; } @@ -891,7 +935,7 @@ StScrollBar { text-align: center; font-size: 18pt; font-weight: 800; } - .message-dialog-content .message-dialog-title.leightweight { + .message-dialog-content .message-dialog-title.lightweight { font-size: 13pt; font-weight: 800; } .message-dialog-content .message-dialog-description { @@ -1234,8 +1278,7 @@ StScrollBar { /* Window Picker */ .window-picker { - -horizontal-spacing: 12px; - -vertical-spacing: 12px; + spacing: 6px; padding: 12px; } .window-picker.external-monitor { padding: 12px; } @@ -1264,8 +1307,7 @@ StScrollBar { padding: 3px; height: 24px; width: 24px; - box-shadow: -1px 1px 5px 0px rgba(0, 0, 0, 0.5); - -shell-close-overlap: 12px; } + box-shadow: -1px 1px 5px 0px rgba(0, 0, 0, 0.5); } .window-close:hover { background-color: #4187ff; } .window-close:active { @@ -1326,6 +1368,9 @@ StScrollBar { .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked { background-color: rgba(26, 28, 35, 0.9); } +.grid-search-results { + spacing: 36px; } + .search-provider-icon .list-search-provider-content { spacing: 12px; } .search-provider-icon .list-search-provider-content .list-search-provider-details { @@ -1831,6 +1876,13 @@ StScrollBar { .lg-dialog .shell-link:active { color: #5a97ff; } +.lg-dialog .actor-link { + color: #ccc; } + .lg-dialog .actor-link:hover { + color: white; } + .lg-dialog .actor-link:active { + color: #999999; } + .lg-completions-text { font-size: .9em; font-style: italic; } diff --git a/share/themes/Kali-Light/gnome-shell/gnome-shell.css b/share/themes/Kali-Light/gnome-shell/gnome-shell.css index 6e5645f8..63a82d57 100644 --- a/share/themes/Kali-Light/gnome-shell/gnome-shell.css +++ b/share/themes/Kali-Light/gnome-shell/gnome-shell.css @@ -539,11 +539,55 @@ StScrollBar { height: 1.8em; width: 2.3em; border-radius: 2px; - padding: 0.5em 0 0; margin: 6px; background-color: #fafafa; color: #686d7a; } +/* Events */ +.events-button { + border-width: 1px; + border-style: solid; + border-radius: 7px; + margin: 4px; + color: #5c616c; + background-color: white; + border-color: #d1d1d1; + box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1); + text-shadow: 0 1px rgba(255, 255, 255, 0.3); + icon-shadow: 0 1px rgba(255, 255, 255, 0.3); + padding: 12px; } + .events-button:focus { + color: #5c616c; + text-shadow: 0 1px rgba(255, 255, 255, 0.3); + icon-shadow: 0 1px rgba(255, 255, 255, 0.3); + box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.6); } + .events-button:hover { + color: #5c616c; + background-color: white; + border-color: #d1d1d1; + box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1); + text-shadow: 0 1px rgba(255, 255, 255, 0.3); + icon-shadow: 0 1px rgba(255, 255, 255, 0.3); } + .events-button:active { + color: #5c616c; + background-color: #f7f7f7; + border-color: #d1d1d1; + text-shadow: none; + icon-shadow: none; + box-shadow: none; } + .events-button .events-box { + spacing: 6px; } + .events-button .events-list { + spacing: 12px; } + .events-button .events-title { + color: black; + font-weight: bold; + margin-bottom: 4px; } + .events-button .event-time { + color: #2d3035; + font-feature-settings: "tnum"; + font-size: 10pt; } + /* World clocks */ .world-clocks-button { border-width: 1px; @@ -807,7 +851,7 @@ StScrollBar { .candidate-page-button-icon { icon-size: 1em; } -/* Notifications & Mesage Tray */ +/* Notifications & Message Tray */ .notification-banner { min-height: 64px; width: 34em; } @@ -890,7 +934,7 @@ StScrollBar { text-align: center; font-size: 18pt; font-weight: 800; } - .message-dialog-content .message-dialog-title.leightweight { + .message-dialog-content .message-dialog-title.lightweight { font-size: 13pt; font-weight: 800; } .message-dialog-content .message-dialog-description { @@ -1233,8 +1277,7 @@ StScrollBar { /* Window Picker */ .window-picker { - -horizontal-spacing: 12px; - -vertical-spacing: 12px; + spacing: 6px; padding: 12px; } .window-picker.external-monitor { padding: 12px; } @@ -1263,8 +1306,7 @@ StScrollBar { padding: 3px; height: 24px; width: 24px; - box-shadow: -1px 1px 5px 0px rgba(0, 0, 0, 0.5); - -shell-close-overlap: 12px; } + box-shadow: -1px 1px 5px 0px rgba(0, 0, 0, 0.5); } .window-close:hover { background-color: #4187ff; } .window-close:active { @@ -1325,6 +1367,9 @@ StScrollBar { .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked { background-color: rgba(26, 28, 35, 0.9); } +.grid-search-results { + spacing: 36px; } + .search-provider-icon .list-search-provider-content { spacing: 12px; } .search-provider-icon .list-search-provider-content .list-search-provider-details { @@ -1830,6 +1875,13 @@ StScrollBar { .lg-dialog .shell-link:active { color: #0047c0; } +.lg-dialog .actor-link { + color: #ccc; } + .lg-dialog .actor-link:hover { + color: white; } + .lg-dialog .actor-link:active { + color: #999999; } + .lg-completions-text { font-size: .9em; font-style: italic; } diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/_drawing.scss b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/_drawing.scss index 4ca723bc..54ff9d4a 100644 --- a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/_drawing.scss +++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/_drawing.scss @@ -79,7 +79,7 @@ @function draw_button_hilight_color($c) { // -// calculate the right top hilight color for buttons +// calculate the right top highlight color for buttons // // $c: base color; // 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 950d25e2..d20e82fc 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 @@ -170,13 +170,38 @@ height: 1.8em; width: 2.3em; border-radius: 2px; - padding: 0.5em 0 0; margin: 6px; background-color: darken($bg_color, 2%); color: lighten($fg_color, 5%); } } +/* Events */ +.events-button { + @include notification_bubble; + padding: $base_padding * 2; + + .events-box { + spacing: $base_spacing; + } + + .events-list { + spacing: 2 * $base_spacing; + } + + .events-title { + color: desaturate(darken($fg_color,40%), 10%); + font-weight: bold; + margin-bottom: $base_margin; + } + + .event-time { + color: darken($fg_color,20%); + font-feature-settings: "tnum"; + @include fontsize($base_font_size - 1); + } +} + /* World clocks */ .world-clocks-button { @include notification_bubble; diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_dialogs.scss b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_dialogs.scss index 5ad99f87..fc779202 100644 --- a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_dialogs.scss +++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_dialogs.scss @@ -38,7 +38,7 @@ font-size: 18pt; font-weight: 800; - &.leightweight { + &.lightweight { font-size: 13pt; font-weight: 800; } diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_looking-glass.scss b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_looking-glass.scss index 9c38e636..006c2ef9 100644 --- a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_looking-glass.scss +++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_looking-glass.scss @@ -1,5 +1,7 @@ /* Looking Glass */ +$text_fg_color: #ccc; + // Dialog #LookingGlassDialog { background-color: $osd_bg_color; @@ -52,6 +54,11 @@ &:hover { color: lighten($link_color, 10%); } &:active { color: darken($link_color, 10%); } } + .actor-link { + color: $text_fg_color; + &:hover { color: lighten($text_fg_color, 20%); } + &:active { color: darken($text_fg_color, 20%); } + } } .lg-completions-text { diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_notifications.scss b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_notifications.scss index 7d0cda2b..5ff46a05 100644 --- a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_notifications.scss +++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_notifications.scss @@ -1,4 +1,4 @@ -/* Notifications & Mesage Tray */ +/* Notifications & Message Tray */ $notification_banner_height: 64px; $notification_banner_width: 34em; diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_search-results.scss b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_search-results.scss index 9836724b..0d81c974 100644 --- a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_search-results.scss +++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_search-results.scss @@ -54,6 +54,10 @@ @extend %status_text; } +.grid-search-results { + spacing: $base_spacing * 6; +} + // Search results with icons .grid-search-result { @extend %app-well-app; diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_slider.scss b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_slider.scss index c0fdbb08..f21d62e6 100644 --- a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_slider.scss +++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_slider.scss @@ -16,7 +16,7 @@ $slider_size: 15px; -barlevel-overdrive-color: $destructive_color; -barlevel-overdrive-border-color: if($variant == 'light', darken($destructive_color, 4%), lighten($destructive_color, 2%)); //trough border when red; -barlevel-overdrive-separator-width:1px; - // slider hander + // slider handler -slider-handle-radius: $slider_size * 0.5; // half the size of the size -slider-handle-border-width: 1px; -slider-handle-border-color: if($variant == 'light', $borders_color, $fg_color); diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_window-picker.scss b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_window-picker.scss index 466b5008..1b932185 100644 --- a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_window-picker.scss +++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_window-picker.scss @@ -1,19 +1,20 @@ /* Window Picker */ -$window_picker_spacing: $base_spacing * 2; // 16px -$window_picker_padding: $base_padding * 2; // 16px +$window_picker_spacing: $base_spacing; // 6px +$window_picker_padding: $base_padding * 2; // 12px $window_thumbnail_border_color:transparentize($selected_fg_color, 0.65); $window_close_button_size: 24px; $window_close_button_padding: 3px; +$window_clone_border_size: 6px; // Window picker .window-picker { // Space between window thumbnails - -horizontal-spacing: $window_picker_spacing; - -vertical-spacing: $window_picker_spacing; + spacing: $window_picker_spacing; + // Padding for container around window thumbnails padding: $window_picker_padding; @@ -22,7 +23,7 @@ $window_close_button_padding: 3px; // Borders on window thumbnails .window-clone-border { - border-width: 6px; + border-width: $window_clone_border_size; border-style: solid; border-color: $window_thumbnail_border_color; border-radius: $base_border_radius + 2; @@ -54,8 +55,6 @@ $window_close_button_padding: 3px; width: $window_close_button_size; box-shadow: -1px 1px 5px 0px rgba(0,0,0,0.5); - -shell-close-overlap: $window_close_button_size * 0.5; - &:hover { background-color: lighten($selected_bg_color, 5%); } 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 deef4a99..567ff491 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.5 +VERSION=3.37.92 echo echo -e " $YELLOW[ i ]$RESET Upstream version $VERSION"