This commit is contained in:
Vince 2021-05-09 11:05:51 +08:00
parent 4c574b1d6b
commit 6de213b984
2 changed files with 37 additions and 25 deletions

View file

@ -122,12 +122,19 @@ install_beggy() {
default) default)
if [[ "${no_blur}" == "false" || "${darken}" == "true" ]]; then if [[ "${no_blur}" == "false" || "${darken}" == "true" ]]; then
install_beggy_deps && convert "${THEME_SRC_DIR}/assets/gnome-shell/common-assets/background-default.png" ${CONVERT_OPT} "${WHITESUR_TMP_DIR}/beggy.png" install_beggy_deps && convert "${THEME_SRC_DIR}/assets/gnome-shell/common-assets/background-default.png" ${CONVERT_OPT} "${WHITESUR_TMP_DIR}/beggy.png"
elif [[ "${no_blur}" == "false" && "${darken}" == "true" ]]; then
cp -r "${THEME_SRC_DIR}/assets/gnome-shell/common-assets/background-blur.png" "${WHITESUR_TMP_DIR}/beggy.png"
else else
cp -r "${THEME_SRC_DIR}/assets/gnome-shell/common-assets/background-blur.png" "${WHITESUR_TMP_DIR}/beggy.png" cp -r "${THEME_SRC_DIR}/assets/gnome-shell/common-assets/background-default.png" "${WHITESUR_TMP_DIR}/beggy.png"
fi fi
;; ;;
*) *)
install_beggy_deps && convert "${background}" ${CONVERT_OPT} "${WHITESUR_TMP_DIR}/beggy.png" ;; if [[ "${no_blur}" == "false" || "${darken}" == "true" ]]; then
install_beggy_deps && convert "${background}" ${CONVERT_OPT} "${WHITESUR_TMP_DIR}/beggy.png"
else
cp -r "${background}" "${WHITESUR_TMP_DIR}/beggy.png"
fi
;;
esac esac
} }
@ -203,13 +210,7 @@ install_shelly() {
cp -r "${THEME_SRC_DIR}/assets/gnome-shell/assets${color}/"*".svg" "${TARGET_DIR}/assets" cp -r "${THEME_SRC_DIR}/assets/gnome-shell/assets${color}/"*".svg" "${TARGET_DIR}/assets"
cp -r "${THEME_SRC_DIR}/assets/gnome-shell/activities/activities${icon}.svg" "${TARGET_DIR}/assets/activities.svg" cp -r "${THEME_SRC_DIR}/assets/gnome-shell/activities/activities${icon}.svg" "${TARGET_DIR}/assets/activities.svg"
cp -r "${WHITESUR_TMP_DIR}/beggy.png" "${TARGET_DIR}/assets/background.png"
if [[ "${gdm}" == 'true' && "${no_blur}" == "false" ]]; then
cp -r "${WHITESUR_TMP_DIR}/beggy.png" "${TARGET_DIR}/assets/background.png"
else
cp -r "${THEME_SRC_DIR}/assets/gnome-shell/common-assets/background-default.png" "${TARGET_DIR}/assets/background.png"
fi
cp -r "${WHITESUR_TMP_DIR}/beggy-blur.png" "${TARGET_DIR}/assets/background-blur.png" cp -r "${WHITESUR_TMP_DIR}/beggy-blur.png" "${TARGET_DIR}/assets/background-blur.png"
( (

View file

@ -3059,8 +3059,8 @@ window.thunar {
// //
// Geary // Geary
// //
.geary-main-window.background.csd, .geary-main-window.background.csd, // <= 3.38
window#GearyMainWindow.background.csd { window#GearyMainWindow.background.csd { // <= 3.32
> overlay > box.vertical { > overlay > box.vertical {
> paned { > paned {
> separator { @extend %side_separator; } > separator { @extend %side_separator; }
@ -3134,6 +3134,29 @@ window#GearyMainWindow.background.csd {
} }
} }
stack#conversation_viewer { // 3.28
background-color: $base_color;
border-bottom-right-radius: $wm_radius + 1px;
scrolledwindow.geary-conversation-scroller {
viewport.frame {
background-color: $base_color;
border-bottom-right-radius: $wm_radius;
list.conversation-listbox {
background-color: transparent;
}
}
}
searchbar {
> revealer > box {
background-color: $base_color;
border-color: $dark_sidebar_border;
}
}
}
&.maximized, &.tiled, &.fullscreen { &.maximized, &.tiled, &.fullscreen {
> overlay > box.vertical { > overlay > box.vertical {
> paned { > paned {
@ -3161,6 +3184,7 @@ window#GearyMainWindow.background.csd {
} }
} }
// >= 40.0
.geary-main-window { .geary-main-window {
&.background.csd.unified { background: none; } &.background.csd.unified { background: none; }
@ -3260,21 +3284,8 @@ window#GearyMainWindow.background.csd {
separator.geary-sidebar-pane-separator { background-color: $dark_sidebar_border; } separator.geary-sidebar-pane-separator { background-color: $dark_sidebar_border; }
geary-conversation-viewer#conversation_viewer, // 40.0 right side geary-conversation-viewer#conversation_viewer { // right side
stack#conversation_viewer { // 3.28
background-color: $base_color; background-color: $base_color;
border-bottom-right-radius: $wm_radius + 1px;
scrolledwindow.geary-conversation-scroller {
viewport.frame {
background-color: $base_color;
border-bottom-right-radius: $wm_radius;
list.conversation-listbox {
background-color: transparent;
}
}
}
searchbar { searchbar {
> revealer > box { > revealer > box {