This commit is contained in:
vinceliuice 2020-12-27 11:49:29 +08:00
parent 77a3986d44
commit 2dd30ff784
10 changed files with 33 additions and 24 deletions

View File

@ -223,16 +223,16 @@ install_gdm() {
fi fi
# > Ubuntu 20.04 # > Ubuntu 20.04
if [[ -f "$UBUNTU_YARU_THEME_FILE" && -f "$GS_THEME_FILE.bak" ]]; then # if [[ -f "$UBUNTU_YARU_THEME_FILE" && -f "$GS_THEME_FILE.bak" ]]; then
prompt -i "Installing Ubuntu GDM theme..." # prompt -i "Installing Ubuntu GDM theme..."
cp -an "$UBUNTU_YARU_THEME_FILE" "$UBUNTU_YARU_THEME_FILE.bak" # cp -an "$UBUNTU_YARU_THEME_FILE" "$UBUNTU_YARU_THEME_FILE.bak"
cp -af "$GS_THEME_FILE" "$UBUNTU_YARU_THEME_FILE" # cp -af "$GS_THEME_FILE" "$UBUNTU_YARU_THEME_FILE"
# cp -an "$ETC_NEW_THEME_FILE" "$ETC_NEW_THEME_FILE.bak" # # 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" # # [[ -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" # # cp -r "$GS_THEME_FILE" "$SHELL_THEME_FOLDER/$THEME_NAME"
# cd "$ETC_THEME_FOLDER" # # cd "$ETC_THEME_FOLDER"
# [[ -f "$ETC_NEW_THEME_FILE.bak" ]] && ln -sf "$SHELL_THEME_FOLDER/$THEME_NAME/gnome-shell-theme.gresource" gdm3-theme.gresource # # [[ -f "$ETC_NEW_THEME_FILE.bak" ]] && ln -sf "$SHELL_THEME_FOLDER/$THEME_NAME/gnome-shell-theme.gresource" gdm3-theme.gresource
fi # fi
} }
remove_theme() { remove_theme() {
@ -281,11 +281,11 @@ revert_gdm() {
# mv "$ETC_NEW_THEME_FILE.bak" "$ETC_NEW_THEME_FILE" # mv "$ETC_NEW_THEME_FILE.bak" "$ETC_NEW_THEME_FILE"
# [[ -d $SHELL_THEME_FOLDER/$THEME_NAME ]] && rm -rf $SHELL_THEME_FOLDER/$THEME_NAME # [[ -d $SHELL_THEME_FOLDER/$THEME_NAME ]] && rm -rf $SHELL_THEME_FOLDER/$THEME_NAME
# fi # fi
if [[ -f "$UBUNTU_YARU_THEME_FILE.bak" ]]; then # if [[ -f "$UBUNTU_YARU_THEME_FILE.bak" ]]; then
prompt -w "reverting Ubuntu GDM theme..." # prompt -w "reverting Ubuntu GDM theme..."
rm -rf "$UBUNTU_YARU_THEME_FILE" # rm -rf "$UBUNTU_YARU_THEME_FILE"
mv "$UBUNTU_YARU_THEME_FILE.bak" "$UBUNTU_YARU_THEME_FILE" # mv "$UBUNTU_YARU_THEME_FILE.bak" "$UBUNTU_YARU_THEME_FILE"
fi # fi
} }
install_dialog() { install_dialog() {

View File

@ -964,10 +964,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
border-radius: 8px 8px 0 0; border-radius: 8px 8px 0 0;
border: none; border: none;
box-shadow: none; box-shadow: none;
color: #afafaf;
background-color: rgba(255, 255, 255, 0.15); 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; color: white;
background-color: #0860f2; background-color: #0860f2;
} }

View File

@ -964,10 +964,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
border-radius: 8px 8px 0 0; border-radius: 8px 8px 0 0;
border: none; border: none;
box-shadow: none; box-shadow: none;
color: #afafaf;
background-color: rgba(255, 255, 255, 0.15); 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; color: white;
background-color: #0860f2; background-color: #0860f2;
} }

View File

@ -964,10 +964,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
border-radius: 8px 8px 0 0; border-radius: 8px 8px 0 0;
border: none; border: none;
box-shadow: none; box-shadow: none;
color: #afafaf;
background-color: rgba(255, 255, 255, 0.15); 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; color: white;
background-color: #0860f2; background-color: #0860f2;
} }

View File

@ -964,10 +964,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
border-radius: 8px 8px 0 0; border-radius: 8px 8px 0 0;
border: none; border: none;
box-shadow: none; box-shadow: none;
color: #afafaf;
background-color: rgba(255, 255, 255, 0.15); 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; color: white;
background-color: #0860f2; background-color: #0860f2;
} }

View File

@ -964,10 +964,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
border-radius: 8px 8px 0 0; border-radius: 8px 8px 0 0;
border: none; border: none;
box-shadow: none; box-shadow: none;
color: #424242;
background-color: rgba(255, 255, 255, 0.75); 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; color: white;
background-color: #0860f2; background-color: #0860f2;
} }

View File

@ -964,10 +964,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
border-radius: 8px 8px 0 0; border-radius: 8px 8px 0 0;
border: none; border: none;
box-shadow: none; box-shadow: none;
color: #424242;
background-color: rgba(255, 255, 255, 0.75); 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; color: white;
background-color: #0860f2; background-color: #0860f2;
} }

View File

@ -964,10 +964,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
border-radius: 8px 8px 0 0; border-radius: 8px 8px 0 0;
border: none; border: none;
box-shadow: none; box-shadow: none;
color: #424242;
background-color: rgba(255, 255, 255, 0.75); 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; color: white;
background-color: #0860f2; background-color: #0860f2;
} }

View File

@ -964,10 +964,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
border-radius: 8px 8px 0 0; border-radius: 8px 8px 0 0;
border: none; border: none;
box-shadow: none; box-shadow: none;
color: #424242;
background-color: rgba(255, 255, 255, 0.75); 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; color: white;
background-color: #0860f2; background-color: #0860f2;
} }

View File

@ -805,9 +805,10 @@ $popop_menuitem_radius: $wm_radius - 4px;
border-radius: $popop_menuitem_radius $popop_menuitem_radius 0 0; border-radius: $popop_menuitem_radius $popop_menuitem_radius 0 0;
border: none; border: none;
box-shadow: none; box-shadow: none;
color: $alt_fg_color;
background-color: if($variant == 'light', rgba(white, 0.75), rgba(white, 0.15)); background-color: if($variant == 'light', rgba(white, 0.75), rgba(white, 0.15));
&.selected { &.hover, &.selected {
color: $selected_fg_color; color: $selected_fg_color;
background-color: $selected_bg_color; background-color: $selected_bg_color;
} }