Fixed Zorin issues

This commit is contained in:
Vince 2021-08-29 00:27:35 +08:00
parent 9735e27bad
commit 847cc8d4b4
5 changed files with 15 additions and 1 deletions

View File

@ -75,6 +75,7 @@ ETC_CSS_FILE="/etc/alternatives/gdm3.css"
ETC_GR_FILE="/etc/alternatives/gdm3-theme.gresource" ETC_GR_FILE="/etc/alternatives/gdm3-theme.gresource"
YARU_GR_FILE="/usr/share/gnome-shell/theme/Yaru/gnome-shell-theme.gresource" YARU_GR_FILE="/usr/share/gnome-shell/theme/Yaru/gnome-shell-theme.gresource"
POP_OS_GR_FILE="/usr/share/gnome-shell/theme/Pop/gnome-shell-theme.gresource" POP_OS_GR_FILE="/usr/share/gnome-shell/theme/Pop/gnome-shell-theme.gresource"
ZORIN_GR_FILE="/usr/share/gnome-shell/theme/ZorinBlue-Light/gnome-shell-theme.gresource"
MISC_GR_FILE="/usr/share/gnome-shell/gnome-shell-theme.gresource" MISC_GR_FILE="/usr/share/gnome-shell/gnome-shell-theme.gresource"
GS_GR_XML_FILE="${THEME_SRC_DIR}/main/gnome-shell/gnome-shell-theme.gresource.xml" GS_GR_XML_FILE="${THEME_SRC_DIR}/main/gnome-shell/gnome-shell-theme.gresource.xml"

View File

@ -583,6 +583,8 @@ install_gdm_theme() {
TARGET="${POP_OS_GR_FILE}" TARGET="${POP_OS_GR_FILE}"
elif check_theme_file "$YARU_GR_FILE"; then elif check_theme_file "$YARU_GR_FILE"; then
TARGET="${YARU_GR_FILE}" TARGET="${YARU_GR_FILE}"
elif check_theme_file "$ZORIN_GR_FILE"; then
TARGET="${ZORIN_GR_FILE}"
elif check_theme_file "$MISC_GR_FILE"; then elif check_theme_file "$MISC_GR_FILE"; then
TARGET="${MISC_GR_FILE}" TARGET="${MISC_GR_FILE}"
fi fi
@ -601,6 +603,7 @@ revert_gdm_theme() {
restore_file "${ZORIN_CSS_FILE}"; restore_file "${ETC_CSS_FILE}" restore_file "${ZORIN_CSS_FILE}"; restore_file "${ETC_CSS_FILE}"
restore_file "${POP_OS_GR_FILE}"; restore_file "${YARU_GR_FILE}" restore_file "${POP_OS_GR_FILE}"; restore_file "${YARU_GR_FILE}"
restore_file "${MISC_GR_FILE}"; restore_file "${ETC_GR_FILE}" restore_file "${MISC_GR_FILE}"; restore_file "${ETC_GR_FILE}"
restore_file "${ZORIN_GR_FILE}"
} }
############################################################################### ###############################################################################

View File

@ -184,20 +184,24 @@
color: $alt_fg_color !important; color: $alt_fg_color !important;
background-color: rgba($fg_color, 0.1); background-color: rgba($fg_color, 0.1);
border: none; border: none;
background-gradient-direction: none !important;
&:hover, &:focus { &:hover, &:focus {
background-color: rgba($fg_color, 0.15); background-color: rgba($fg_color, 0.15);
color: $fg_color !important; color: $fg_color !important;
background-gradient-direction: none !important;
} }
&:active { &:active {
background-color: darken($primary_color, 5%); background-color: darken($primary_color, 5%);
color: $light_fg_color !important; color: $light_fg_color !important;
background-gradient-direction: none !important;
} }
&:selected { &:selected {
background-color: $primary_color; background-color: $primary_color;
color: $light_fg_color !important; color: $light_fg_color !important;
background-gradient-direction: none !important;
&:hover, &:focus { &:hover, &:focus {
background-color: lighten($primary_color, 8%); background-color: lighten($primary_color, 8%);

View File

@ -12,20 +12,24 @@
color: white !important; color: white !important;
background-color: $primary_color; background-color: $primary_color;
box-shadow: inset 0 1px 0 0 rgba(white,0.1); box-shadow: inset 0 1px 0 0 rgba(white,0.1);
background-gradient-direction: none !important;
&:hover { &:hover {
color: white !important; color: white !important;
background-color: lighten($primary_color, 9%); background-color: lighten($primary_color, 9%);
background-gradient-direction: none !important;
} }
&:active { &:active {
color: white !important; color: white !important;
background-color: darken($primary_color, 5%); background-color: darken($primary_color, 5%);
background-gradient-direction: none !important;
} }
&:insensitive { &:insensitive {
background-color: rgba($primary_color, 0.05); background-color: rgba($primary_color, 0.05);
color: rgba($primary_color, 0.35) !important; color: rgba($primary_color, 0.35) !important;
background-gradient-direction: none !important;
} }
} }

View File

@ -98,10 +98,12 @@ $popop_menuitem_radius: $wm_radius - 4px;
box-shadow: none; box-shadow: none;
color: $alt_fg_color; color: $alt_fg_color;
background-color: $submenu_bg_color; background-color: $submenu_bg_color;
background-gradient-direction: none !important;
&.hover, &.selected { &:hover, &.selected {
color: $selected_fg_color; color: $selected_fg_color;
background-color: $selected_bg_color; background-color: $selected_bg_color;
background-gradient-direction: none !important;
} }
&:active { &:active {