From 2dd30ff784890d835b08c8c43679ef9457a27ef9 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Sun, 27 Dec 2020 11:49:29 +0800 Subject: [PATCH] update --- install.sh | 30 +++++++++---------- src/main/gnome-shell/gnome-shell-dark-alt.css | 3 +- .../gnome-shell-dark-solid-alt.css | 3 +- .../gnome-shell/gnome-shell-dark-solid.css | 3 +- src/main/gnome-shell/gnome-shell-dark.css | 3 +- .../gnome-shell/gnome-shell-light-alt.css | 3 +- .../gnome-shell-light-solid-alt.css | 3 +- .../gnome-shell/gnome-shell-light-solid.css | 3 +- src/main/gnome-shell/gnome-shell-light.css | 3 +- src/sass/gnome-shell/_common.scss | 3 +- 10 files changed, 33 insertions(+), 24 deletions(-) diff --git a/install.sh b/install.sh index e854035..9b5568f 100755 --- a/install.sh +++ b/install.sh @@ -223,16 +223,16 @@ install_gdm() { fi # > Ubuntu 20.04 - if [[ -f "$UBUNTU_YARU_THEME_FILE" && -f "$GS_THEME_FILE.bak" ]]; then - prompt -i "Installing Ubuntu GDM theme..." - cp -an "$UBUNTU_YARU_THEME_FILE" "$UBUNTU_YARU_THEME_FILE.bak" - cp -af "$GS_THEME_FILE" "$UBUNTU_YARU_THEME_FILE" - # cp -an "$ETC_NEW_THEME_FILE" "$ETC_NEW_THEME_FILE.bak" - # [[ -d "$SHELL_THEME_FOLDER/$THEME_NAME" ]] && rm -rf "$SHELL_THEME_FOLDER/$THEME_NAME" && mkdir -p "$SHELL_THEME_FOLDER/$THEME_NAME" - # cp -r "$GS_THEME_FILE" "$SHELL_THEME_FOLDER/$THEME_NAME" - # cd "$ETC_THEME_FOLDER" - # [[ -f "$ETC_NEW_THEME_FILE.bak" ]] && ln -sf "$SHELL_THEME_FOLDER/$THEME_NAME/gnome-shell-theme.gresource" gdm3-theme.gresource - fi + # if [[ -f "$UBUNTU_YARU_THEME_FILE" && -f "$GS_THEME_FILE.bak" ]]; then + # prompt -i "Installing Ubuntu GDM theme..." + # cp -an "$UBUNTU_YARU_THEME_FILE" "$UBUNTU_YARU_THEME_FILE.bak" + # cp -af "$GS_THEME_FILE" "$UBUNTU_YARU_THEME_FILE" + # # cp -an "$ETC_NEW_THEME_FILE" "$ETC_NEW_THEME_FILE.bak" + # # [[ -d "$SHELL_THEME_FOLDER/$THEME_NAME" ]] && rm -rf "$SHELL_THEME_FOLDER/$THEME_NAME" && mkdir -p "$SHELL_THEME_FOLDER/$THEME_NAME" + # # cp -r "$GS_THEME_FILE" "$SHELL_THEME_FOLDER/$THEME_NAME" + # # cd "$ETC_THEME_FOLDER" + # # [[ -f "$ETC_NEW_THEME_FILE.bak" ]] && ln -sf "$SHELL_THEME_FOLDER/$THEME_NAME/gnome-shell-theme.gresource" gdm3-theme.gresource + # fi } remove_theme() { @@ -281,11 +281,11 @@ revert_gdm() { # mv "$ETC_NEW_THEME_FILE.bak" "$ETC_NEW_THEME_FILE" # [[ -d $SHELL_THEME_FOLDER/$THEME_NAME ]] && rm -rf $SHELL_THEME_FOLDER/$THEME_NAME # fi - if [[ -f "$UBUNTU_YARU_THEME_FILE.bak" ]]; then - prompt -w "reverting Ubuntu GDM theme..." - rm -rf "$UBUNTU_YARU_THEME_FILE" - mv "$UBUNTU_YARU_THEME_FILE.bak" "$UBUNTU_YARU_THEME_FILE" - fi + # if [[ -f "$UBUNTU_YARU_THEME_FILE.bak" ]]; then + # prompt -w "reverting Ubuntu GDM theme..." + # rm -rf "$UBUNTU_YARU_THEME_FILE" + # mv "$UBUNTU_YARU_THEME_FILE.bak" "$UBUNTU_YARU_THEME_FILE" + # fi } install_dialog() { diff --git a/src/main/gnome-shell/gnome-shell-dark-alt.css b/src/main/gnome-shell/gnome-shell-dark-alt.css index 82b8fd0..b0aef7c 100644 --- a/src/main/gnome-shell/gnome-shell-dark-alt.css +++ b/src/main/gnome-shell/gnome-shell-dark-alt.css @@ -964,10 +964,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { border-radius: 8px 8px 0 0; border: none; box-shadow: none; + color: #afafaf; background-color: rgba(255, 255, 255, 0.15); } -.popup-menu .popup-menu-item.selected:checked { +.popup-menu .popup-menu-item.hover:checked, .popup-menu .popup-menu-item.selected:checked { color: white; background-color: #0860f2; } diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css index 5665e7f..88cfbb4 100644 --- a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css +++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css @@ -964,10 +964,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { border-radius: 8px 8px 0 0; border: none; box-shadow: none; + color: #afafaf; background-color: rgba(255, 255, 255, 0.15); } -.popup-menu .popup-menu-item.selected:checked { +.popup-menu .popup-menu-item.hover:checked, .popup-menu .popup-menu-item.selected:checked { color: white; background-color: #0860f2; } diff --git a/src/main/gnome-shell/gnome-shell-dark-solid.css b/src/main/gnome-shell/gnome-shell-dark-solid.css index 5665e7f..88cfbb4 100644 --- a/src/main/gnome-shell/gnome-shell-dark-solid.css +++ b/src/main/gnome-shell/gnome-shell-dark-solid.css @@ -964,10 +964,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { border-radius: 8px 8px 0 0; border: none; box-shadow: none; + color: #afafaf; background-color: rgba(255, 255, 255, 0.15); } -.popup-menu .popup-menu-item.selected:checked { +.popup-menu .popup-menu-item.hover:checked, .popup-menu .popup-menu-item.selected:checked { color: white; background-color: #0860f2; } diff --git a/src/main/gnome-shell/gnome-shell-dark.css b/src/main/gnome-shell/gnome-shell-dark.css index 82b8fd0..b0aef7c 100644 --- a/src/main/gnome-shell/gnome-shell-dark.css +++ b/src/main/gnome-shell/gnome-shell-dark.css @@ -964,10 +964,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { border-radius: 8px 8px 0 0; border: none; box-shadow: none; + color: #afafaf; background-color: rgba(255, 255, 255, 0.15); } -.popup-menu .popup-menu-item.selected:checked { +.popup-menu .popup-menu-item.hover:checked, .popup-menu .popup-menu-item.selected:checked { color: white; background-color: #0860f2; } diff --git a/src/main/gnome-shell/gnome-shell-light-alt.css b/src/main/gnome-shell/gnome-shell-light-alt.css index 884f9f6..2545067 100644 --- a/src/main/gnome-shell/gnome-shell-light-alt.css +++ b/src/main/gnome-shell/gnome-shell-light-alt.css @@ -964,10 +964,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { border-radius: 8px 8px 0 0; border: none; box-shadow: none; + color: #424242; background-color: rgba(255, 255, 255, 0.75); } -.popup-menu .popup-menu-item.selected:checked { +.popup-menu .popup-menu-item.hover:checked, .popup-menu .popup-menu-item.selected:checked { color: white; background-color: #0860f2; } diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt.css b/src/main/gnome-shell/gnome-shell-light-solid-alt.css index 7166978..2db3a40 100644 --- a/src/main/gnome-shell/gnome-shell-light-solid-alt.css +++ b/src/main/gnome-shell/gnome-shell-light-solid-alt.css @@ -964,10 +964,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { border-radius: 8px 8px 0 0; border: none; box-shadow: none; + color: #424242; background-color: rgba(255, 255, 255, 0.75); } -.popup-menu .popup-menu-item.selected:checked { +.popup-menu .popup-menu-item.hover:checked, .popup-menu .popup-menu-item.selected:checked { color: white; background-color: #0860f2; } diff --git a/src/main/gnome-shell/gnome-shell-light-solid.css b/src/main/gnome-shell/gnome-shell-light-solid.css index 7166978..2db3a40 100644 --- a/src/main/gnome-shell/gnome-shell-light-solid.css +++ b/src/main/gnome-shell/gnome-shell-light-solid.css @@ -964,10 +964,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { border-radius: 8px 8px 0 0; border: none; box-shadow: none; + color: #424242; background-color: rgba(255, 255, 255, 0.75); } -.popup-menu .popup-menu-item.selected:checked { +.popup-menu .popup-menu-item.hover:checked, .popup-menu .popup-menu-item.selected:checked { color: white; background-color: #0860f2; } diff --git a/src/main/gnome-shell/gnome-shell-light.css b/src/main/gnome-shell/gnome-shell-light.css index 7530890..b31fc8e 100644 --- a/src/main/gnome-shell/gnome-shell-light.css +++ b/src/main/gnome-shell/gnome-shell-light.css @@ -964,10 +964,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { border-radius: 8px 8px 0 0; border: none; box-shadow: none; + color: #424242; background-color: rgba(255, 255, 255, 0.75); } -.popup-menu .popup-menu-item.selected:checked { +.popup-menu .popup-menu-item.hover:checked, .popup-menu .popup-menu-item.selected:checked { color: white; background-color: #0860f2; } diff --git a/src/sass/gnome-shell/_common.scss b/src/sass/gnome-shell/_common.scss index a7634a3..5a111cd 100644 --- a/src/sass/gnome-shell/_common.scss +++ b/src/sass/gnome-shell/_common.scss @@ -805,9 +805,10 @@ $popop_menuitem_radius: $wm_radius - 4px; border-radius: $popop_menuitem_radius $popop_menuitem_radius 0 0; border: none; box-shadow: none; + color: $alt_fg_color; background-color: if($variant == 'light', rgba(white, 0.75), rgba(white, 0.15)); - &.selected { + &.hover, &.selected { color: $selected_fg_color; background-color: $selected_bg_color; }