Fixed ubuntu gdm theme

This commit is contained in:
Vince 2021-05-16 09:31:41 +08:00
parent 64f72fed8f
commit ba3718531d
5 changed files with 138 additions and 106 deletions

View File

@ -409,11 +409,11 @@ install_gdm_theme() {
local TARGET=
# Let's go!
rm -rf "${WHITESUR_GS_DIR}"; install_beggy
rm -rf "${WHITESUR_GS_DIR}"; install_beggy; install_beggy_blur
if check_theme_file "${COMMON_CSS_FILE}"; then # CSS-based theme
install_beggy_blur
gtk_base & install_shelly "${colors[0]}" "${opacities[0]}" "${alts[0]}" "${themes[0]}" "${icon}" "${WHITESUR_GS_DIR}"
gtk_base "${colors[0]}" "${opacities[0]}" "${themes[0]}" &
install_shelly "${colors[0]}" "${opacities[0]}" "${alts[0]}" "${themes[0]}" "${icon}" "${WHITESUR_GS_DIR}"
sed $SED_OPT "s|assets|${WHITESUR_GS_DIR}/assets|" "${WHITESUR_GS_DIR}/gnome-shell.css"
if check_theme_file "${UBUNTU_CSS_FILE}"; then
@ -429,8 +429,8 @@ install_gdm_theme() {
# Fix previously installed WhiteSur
restore_file "${ETC_CSS_FILE}"
else # GR-based theme
install_beggy_blur
gtk_base & install_shelly "${colors[0]}" "${opacities[0]}" "${alts[0]}" "${themes[0]}" "${icon}" "${WHITESUR_TMP_DIR}/shelly"
gtk_base "${colors[0]}" "${opacities[0]}" "${themes[0]}" &
install_shelly "${colors[0]}" "${opacities[0]}" "${alts[0]}" "${themes[0]}" "${icon}" "${WHITESUR_TMP_DIR}/shelly"
sed $SED_OPT "s|assets|resource:///org/gnome/shell/theme/assets|" "${WHITESUR_TMP_DIR}/shelly/gnome-shell.css"
if check_theme_file "$POP_OS_GR_F & ILE"; then

View File

@ -28,104 +28,3 @@ stage {
@include font(body-1);
color: $fg_color;
}
$popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($base_color, 8%), 0.95));
%popover_bubble {
color: $alt_fg_color;
background-color: $popover_bubble_bg;
border-radius: $mn_radius;
border: none;
box-shadow: none;
text-shadow: none;
&:hover, &:focus {
color: $fg_color;
background-color: if($variant == 'light', rgba($popover_bubble_bg, 1), rgba(lighten($popover_bubble_bg, 5%), 1));
box-shadow: 0 3px 5px rgba(black, 0.1);
}
&:active {
color: $fg_color;
background-color: if($variant == 'light', darken($popover_bubble_bg, 1%), lighten($popover_bubble_bg, 3%));
box-shadow: none;
}
}
%show_apps_bigsur {
.show-apps-icon {
color: transparent;
background-image: url("assets/view-app-grid.svg");
background-size: contain;
}
.overview-icon { color: transparent; }
&:hover,
&:active,
&:checked,
&:focus {
.show-apps-icon { color: transparent; }
}
}
%osd_panel {
color: $fg_color;
background-color: $base_color;
border: 1px solid if($variant=='light', rgba(black, 0), rgba(black, 0.75));
box-shadow: 0 3px 8px 0 rgba(black, 0.25);
border-radius: $bt_radius;
padding: 12px;
}
%search-section-content-item {
border-radius: $bt_radius;
padding: $base_padding;
transition-duration: 100ms;
text-align: center;
&:focus,
&:hover,
&:selected {
background-color: $light_divider_color;
transition-duration: 200ms;
}
&:active,
&:checked {
background-color: $light_track_color;
}
}
@import 'common/a11y';
@import 'common/app-grid';
@import 'common/base';
@import 'common/buttons';
@import 'common/calendar';
@import 'common/check-box';
@import 'common/corner-ripple';
@import 'common/dash';
@import 'common/dialogs';
@import 'common/entries';
@import 'common/hotplug';
@import 'common/ibus-popup';
@import 'common/keyboard';
@import 'common/login-dialog';
@import 'common/looking-glass';
@import 'common/message-list';
@import 'common/misc';
@import 'common/network-dialog';
@import 'common/notifications';
@import 'common/osd';
@import 'common/overview';
@import 'common/panel';
@import 'common/popovers';
@import 'common/screen-shield';
@import 'common/scrollbars';
@import 'common/search-entry';
@import 'common/search-results';
@import 'common/slider';
@import 'common/switcher-popup';
@import 'common/switches';
@import 'common/tiled-previews';
@import 'common/workspace-switcher';

View File

@ -1,3 +1,35 @@
@import 'common/a11y';
@import 'common/app-grid';
@import 'common/base';
@import 'common/buttons';
@import 'common/calendar';
@import 'common/check-box';
@import 'common/corner-ripple';
@import 'common/dash';
@import 'common/dialogs';
@import 'common/entries';
@import 'common/hotplug';
@import 'common/ibus-popup';
@import 'common/keyboard';
@import 'common/login-dialog';
@import 'common/looking-glass';
@import 'common/message-list';
@import 'common/misc';
@import 'common/network-dialog';
@import 'common/notifications';
@import 'common/osd';
@import 'common/overview';
@import 'common/panel';
@import 'common/popovers';
@import 'common/screen-shield';
@import 'common/scrollbars';
@import 'common/search-entry';
@import 'common/search-results';
@import 'common/slider';
@import 'common/switcher-popup';
@import 'common/switches';
@import 'common/tiled-previews';
@import 'common/workspace-switcher';
@import 'widgets-3-28/app-grid';
@import 'widgets-3-28/dash';
@import 'widgets-3-28/login-dialog';

View File

@ -1,3 +1,35 @@
@import 'common/a11y';
@import 'common/app-grid';
@import 'common/base';
@import 'common/buttons';
@import 'common/calendar';
@import 'common/check-box';
@import 'common/corner-ripple';
@import 'common/dash';
@import 'common/dialogs';
@import 'common/entries';
@import 'common/hotplug';
@import 'common/ibus-popup';
@import 'common/keyboard';
@import 'common/login-dialog';
@import 'common/looking-glass';
@import 'common/message-list';
@import 'common/misc';
@import 'common/network-dialog';
@import 'common/notifications';
@import 'common/osd';
@import 'common/overview';
@import 'common/panel';
@import 'common/popovers';
@import 'common/screen-shield';
@import 'common/scrollbars';
@import 'common/search-entry';
@import 'common/search-results';
@import 'common/slider';
@import 'common/switcher-popup';
@import 'common/switches';
@import 'common/tiled-previews';
@import 'common/workspace-switcher';
@import 'widgets-40-0/app-grid';
@import 'widgets-40-0/dash';
@import 'widgets-40-0/misc';

View File

@ -1,3 +1,72 @@
$popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($base_color, 8%), 0.95));
%popover_bubble {
color: $alt_fg_color;
background-color: $popover_bubble_bg;
border-radius: $mn_radius;
border: none;
box-shadow: none;
text-shadow: none;
&:hover, &:focus {
color: $fg_color;
background-color: if($variant == 'light', rgba($popover_bubble_bg, 1), rgba(lighten($popover_bubble_bg, 5%), 1));
box-shadow: 0 3px 5px rgba(black, 0.1);
}
&:active {
color: $fg_color;
background-color: if($variant == 'light', darken($popover_bubble_bg, 1%), lighten($popover_bubble_bg, 3%));
box-shadow: none;
}
}
%show_apps_bigsur {
.show-apps-icon {
color: transparent;
background-image: url("assets/view-app-grid.svg");
background-size: contain;
}
.overview-icon { color: transparent; }
&:hover,
&:active,
&:checked,
&:focus {
.show-apps-icon { color: transparent; }
}
}
%osd_panel {
color: $fg_color;
background-color: $base_color;
border: 1px solid if($variant=='light', rgba(black, 0), rgba(black, 0.75));
box-shadow: 0 3px 8px 0 rgba(black, 0.25);
border-radius: $bt_radius;
padding: 12px;
}
%search-section-content-item {
border-radius: $bt_radius;
padding: $base_padding;
transition-duration: 100ms;
text-align: center;
&:focus,
&:hover,
&:selected {
background-color: $light_divider_color;
transition-duration: 200ms;
}
&:active,
&:checked {
background-color: $light_track_color;
}
}
// links
.shell-link {
border-radius: $bt_radius;