This commit is contained in:
vinceliuice 2022-10-19 13:13:06 +08:00
parent 32a8006f2e
commit 163cf67f08
6 changed files with 127 additions and 67 deletions

View file

@ -91,47 +91,44 @@ Usage: `./install.sh [OPTIONS...]`
-b, --background [default|blank|IMAGE_PATH] -b, --background [default|blank|IMAGE_PATH]
Set gnome-shell background image. Default is BigSur-like wallpaper Set gnome-shell background image. Default is BigSur-like wallpaper
-m, --monterey -m, --monterey
Set to MacOS Monterey style. Set to MacOS Monterey style.
-l, --libadwaita
Install gtk-4.0 theme into config for libadwaita.
-N, --nautilus-style [stable|normal|mojave|glassy] -N, --nautilus-style [stable|normal|mojave|glassy]
Set Nautilus style. Default is BigSur-like style (stabled sidebar) Set Nautilus style. Default is BigSur-like style (stabled sidebar)
-HD, --highdefinition -HD, --highdefinition
Set to High Definition size. Default is laptop size Set to High Definition size. Default is laptop size
--normal, --normalshowapps --normal, --normalshowapps
Set gnome-shell show apps button style to normal. Default is bigsur Set gnome-shell show apps button style to normal. Default is bigsur
--round, --roundedmaxwindow --round, --roundedmaxwindow
Set maximized window to rounded. Default is square Set maximized window to rounded. Default is square
--right, --rightplacement --right, --rightplacement
Set Nautilus titlebutton placement to right. Default is left Set Nautilus titlebutton placement to right. Default is left
--black, --blackfont --black, --blackfont
Set panel font color to black. Default is white Set panel font color to black. Default is white
--darker, --darkercolor --darker, --darkercolor
Install darker 'WhiteSur' dark themes. Install darker 'WhiteSur' dark themes.
--nord, --nordcolor --nord, --nordcolor
Install 'WhiteSur' Nord ColorScheme themes. Install 'WhiteSur' Nord ColorScheme themes.
--dialog, --interactive --dialog, --interactive
Run this installer interactively, with dialogs. Run this installer interactively, with dialogs.
--silent-mode --silent-mode
Meant for developers: ignore any confirm prompt and params become more strict. Meant for developers: ignore any confirm prompt and params become more strict.
-r, --remove, -u, --uninstall -r, --remove, -u, --uninstall
Remove all installed WhiteSur themes. Remove all installed WhiteSur themes.
-h, --help -h, --help
Show this help. Show this help.
``` ```
</details> </details>
@ -201,26 +198,29 @@ Usage: `./tweaks.sh [OPTIONS...]`
-f, --firefox [default|monterey] -f, --firefox [default|monterey]
Install 'WhiteSur|Monterey' theme for Firefox and connect it to the current Firefox profiles. Default is WhiteSur Install 'WhiteSur|Monterey' theme for Firefox and connect it to the current Firefox profiles. Default is WhiteSur
-e, --edit-firefox -e, --edit-firefox
Edit 'WhiteSur' theme for Firefox settings and also connect the theme to the current Firefox profiles. Edit 'WhiteSur' theme for Firefox settings and also connect the theme to the current Firefox profiles.
-F, --flatpak -F, --flatpak
Connect 'WhiteSur' theme to Flatpak. Connect 'WhiteSur' theme to Flatpak.
-s, --snap -s, --snap
Connect 'WhiteSur' theme the currently installed snap apps. Connect 'WhiteSur' theme the currently installed snap apps.
-g, --gdm [default|x2] -g, --gdm [default|x2]
Install 'WhiteSur' theme for GDM (scaling: 100%/200%, default is 100%). Requires to run this shell as root Install 'WhiteSur' theme for GDM (scaling: 100%/200%, default is 100%). Requires to run this shell as root
-d, --dash-to-dock -d, --dash-to-dock
Fixed Dash to Dock theme issue. Fixed Dash to Dock theme issue.
-N, --no-darken -N, --no-darken
Don't darken 'WhiteSur' GDM theme background image. Don't darken 'WhiteSur' GDM theme background image.
-n, --no-blur -n, --no-blur
Don't blur 'WhiteSur' GDM theme background image. Don't blur 'WhiteSur' GDM theme background image.
-l, --libadwaita
Install gtk-4.0 theme into config for libadwaita. Do not run this option with sudo !
-b, --background [default|blank|IMAGE_PATH] -b, --background [default|blank|IMAGE_PATH]
Set 'WhiteSur' GDM theme background image. Default is BigSur-like wallpaper Set 'WhiteSur' GDM theme background image. Default is BigSur-like wallpaper
@ -244,12 +244,12 @@ Usage: `./tweaks.sh [OPTIONS...]`
Set 'WhiteSur' GDM (GNOME Shell) 'Activities' icon. Default is 'standard' Set 'WhiteSur' GDM (GNOME Shell) 'Activities' icon. Default is 'standard'
-r, --remove, --revert -r, --remove, --revert
Revert to the original themes, do the opposite things of install and connect. Revert to the original themes, do the opposite things of install and connect.
--silent-mode --silent-mode
Meant for developers: ignore any confirm prompt and params become more strict. Meant for developers: ignore any confirm prompt and params become more strict.
-h, --help -h, --help
Show this help. Show this help.
``` ```

View file

@ -35,7 +35,6 @@ usage() {
helpify "-i, --icon" "[$(IFS='|'; echo "${ICON_VARIANTS[*]}")]" "Set 'Activities' icon" "Default is 'standard'" helpify "-i, --icon" "[$(IFS='|'; echo "${ICON_VARIANTS[*]}")]" "Set 'Activities' icon" "Default is 'standard'"
helpify "-b, --background" "[default|blank|IMAGE_PATH]" "Set gnome-shell background image" "Default is BigSur-like wallpaper" helpify "-b, --background" "[default|blank|IMAGE_PATH]" "Set gnome-shell background image" "Default is BigSur-like wallpaper"
helpify "-m, --monterey" "" "Set to MacOS Monterey style" "" helpify "-m, --monterey" "" "Set to MacOS Monterey style" ""
helpify "-l, --libadwaita" "" "Install gtk-4.0 files to gtk4.0 config folder for libadwaita" "Do not run this option with sudo !"
helpify "-N, --nautilus-style" "[$(IFS='|'; echo "${NAUTILUS_STYLE_VARIANTS[*]}")]" "Set Nautilus style" "Default is BigSur-like style (stabled sidebar)" helpify "-N, --nautilus-style" "[$(IFS='|'; echo "${NAUTILUS_STYLE_VARIANTS[*]}")]" "Set Nautilus style" "Default is BigSur-like style (stabled sidebar)"
helpify "-HD, --highdefinition" "" "Set to High Definition size" "Default is laptop size" helpify "-HD, --highdefinition" "" "Set to High Definition size" "Default is laptop size"
helpify "--normal, --normalshowapps" "" "Set gnome-shell show apps button style to normal" "Default is bigsur" helpify "--normal, --normalshowapps" "" "Set gnome-shell show apps button style to normal" "Default is bigsur"
@ -165,15 +164,6 @@ else
echo; install_themes; echo; prompt -s "Done!" echo; install_themes; echo; prompt -s "Done!"
if [[ "${libadwaita}" == 'true' ]]; then
if [[ "$UID" != '0' ]]; then
install_libadwaita
echo; prompt -w "Installed gtk-4.0 into config for libadwaita!"
else
echo; prompt -e "Do not run '--libadwaita' option with sudo!"
fi
fi
if (is_running "xfce4-session"); then if (is_running "xfce4-session"); then
msg="XFCE: you may need to run 'xfce4-panel -r' after changing your theme to fix your panel opacity." msg="XFCE: you may need to run 'xfce4-panel -r' after changing your theme to fix your panel opacity."
elif (is_my_distro "solus") && (is_running "gnome-session"); then elif (is_my_distro "solus") && (is_running "gnome-session"); then

View file

@ -477,12 +477,8 @@ install_theemy() {
remove_packy() { remove_packy() {
rm -rf "${dest}/${name}$(destify ${1})$(destify ${2})$(destify ${3})$(destify ${4})${colorscheme}" rm -rf "${dest}/${name}$(destify ${1})$(destify ${2})$(destify ${3})$(destify ${4})${colorscheme}"
rm -rf "${HOME}/.config/gtk-4.0/"{gtk.css,gtk-dark.css,assets,windows-assets}
rm -rf "${dest}/${name}$(destify ${1})${colorscheme}-hdpi" rm -rf "${dest}/${name}$(destify ${1})${colorscheme}-hdpi"
rm -rf "${dest}/${name}$(destify ${1})${colorscheme}-xhdpi" rm -rf "${dest}/${name}$(destify ${1})${colorscheme}-xhdpi"
# Backward compatibility
# rm -rf "${dest}/${name}$(destify ${1})-mdpi"
} }
remove_old_packy() { remove_old_packy() {
@ -493,7 +489,9 @@ remove_old_packy() {
config_gtk4() { config_gtk4() {
local color="$(destify ${1})" local color="$(destify ${1})"
local alt="$(destify ${2})" local opacity="$(destify ${2})"
local alt="$(destify ${3})"
local theme="$(destify ${4})"
local TARGET_DIR="${HOME}/.config/gtk-4.0" local TARGET_DIR="${HOME}/.config/gtk-4.0"
@ -535,8 +533,12 @@ install_themes() {
} }
install_libadwaita() { install_libadwaita() {
gtk_base "${colors[0]}" "${opacities[0]}" "${themes[0]}" "${compact[0]}" gtk_base "${colors[1]}" "${opacities[0]}" "${themes[0]}"
config_gtk4 "${colors[0]}" "${alt[0]}" config_gtk4 "${colors[0]}" "${opacities[0]}" "${alts[0]}" "${themes[0]}"
}
remove_libadwaita() {
rm -rf "${HOME}/.config/gtk-4.0/"{gtk.css,gtk-dark.css,assets,windows-assets}
} }
remove_themes() { remove_themes() {
@ -805,6 +807,7 @@ disconnect_snap() {
######################################################################### #########################################################################
gtk_base() { gtk_base() {
rm -rf "${THEME_SRC_DIR}/sass/_gtk-base-temp.scss"
cp -rf "${THEME_SRC_DIR}/sass/_gtk-base"{".scss","-temp.scss"} cp -rf "${THEME_SRC_DIR}/sass/_gtk-base"{".scss","-temp.scss"}
# Theme base options # Theme base options
@ -826,6 +829,7 @@ gtk_base() {
############################################################################### ###############################################################################
customize_theme() { customize_theme() {
rm -rf "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
cp -rf "${THEME_SRC_DIR}/sass/_theme-options"{".scss","-temp.scss"} cp -rf "${THEME_SRC_DIR}/sass/_theme-options"{".scss","-temp.scss"}
# Darker dark colors # Darker dark colors

View file

@ -4256,7 +4256,7 @@ window.dialog.message { // Message Dialog styling
padding: ($container_padding - 2px) ($container_padding + 2px); padding: ($container_padding - 2px) ($container_padding + 2px);
box-shadow: none; box-shadow: none;
border-radius: $bt_radius; border-radius: $bt_radius;
margin: 0 3px 3px 3px; margin: $container_padding / 2;
border: none; border: none;
&:not(.suggested-action):not(.destructive-action) { &:not(.suggested-action):not(.destructive-action) {
@ -4290,6 +4290,39 @@ window.dialog.message { // Message Dialog styling
} }
} }
window.background.messagedialog {
.response-area {
padding: $container_padding;
button {
min-height: 20px;
padding: ($container_padding - 2px) ($container_padding + 2px);
box-shadow: none;
border-radius: $bt_radius;
margin: $container_padding / 2;
border: none;
&:not(.suggested-action):not(.destructive-action) {
border-radius: $bt_radius;
background-color: transparent;
&:hover {
@include button(flat-hover);
transition: $button_transition;
}
&:active {
@include button(active);
}
}
&.suggested-action, &.destructive-action {
border-radius: $bt_radius;
}
}
}
}
window.aboutdialog image.large-icons { window.aboutdialog image.large-icons {
-gtk-icon-size: 128px; -gtk-icon-size: 128px;
} }
@ -4439,7 +4472,7 @@ placessidebar {
// Using margins/padding directly in the SidebarRow // Using margins/padding directly in the SidebarRow
// will make the animation of the new bookmark row jump // will make the animation of the new bookmark row jump
> revealer { > revealer {
padding: 0 $container_padding + 4px; padding: 0;
} }
image.sidebar-icon { image.sidebar-icon {

View file

@ -3,8 +3,20 @@
* Nautilus * * Nautilus *
************/ ************/
.nautilus-window { .nautilus-window {
&.background.csd {
background-color: transparent;
}
flap.unfolded { flap.unfolded {
> placessidebar.background {
background: none;
list.navigation-sidebar {
background-color: $dark_sidebar_bg;
}
}
> separator.horizontal { > separator.horizontal {
background-color: $header_border; background-color: $header_border;
} }
@ -78,7 +90,7 @@
&.current-dir { &.current-dir {
color: $header_fg; color: $header_fg;
&:hover, &:active { &:hover, &:active {
background: none; background: none;
box-shadow: none; box-shadow: none;
@ -148,7 +160,7 @@ window.background {
> contents > toastoverlay > leaflet { > contents > toastoverlay > leaflet {
> box { > box {
background-color: $base_color; background-color: $base_color;
> headerbar { > headerbar {
&, &:backdrop { &, &:backdrop {
background: none; background: none;
@ -158,7 +170,7 @@ window.background {
+ separator { + separator {
@extend %side_separator; @extend %side_separator;
+ box { + box {
background-color: $dark_sidebar_bg; background-color: $dark_sidebar_bg;
} }
@ -171,17 +183,17 @@ window.background {
list > row textview { list > row textview {
padding: $container_padding; padding: $container_padding;
border-left: 1px solid $borders_color; border-left: 1px solid $borders_color;
&, & > text { &, & > text {
background: none; background: none;
} }
} }
} }
.current-week { .current-week {
background-color: $fill_color; background-color: $fill_color;
} }
button.circular.day { button.circular.day {
border: none; border: none;
box-shadow: none; box-shadow: none;
@ -266,13 +278,13 @@ menubutton.flat.popup.sources-button {
.small & { .small & {
border-radius: 0; border-radius: 0;
&.forecast-card { &.forecast-card {
border-width: 1px 0; border-width: 1px 0;
} }
&.display-container { &.display-container {
border-width: 0 0 1px 0; border-width: 0 0 1px 0;
} }
} }
} }

View file

@ -38,6 +38,7 @@ usage() {
helpify "-p, --panel-opacity" "[$(IFS='|'; echo "${PANEL_OPACITY_VARIANTS[*]}")]" "Set '${THEME_NAME}' GDM (GNOME Shell) theme panel transparency" "Default is 15%" helpify "-p, --panel-opacity" "[$(IFS='|'; echo "${PANEL_OPACITY_VARIANTS[*]}")]" "Set '${THEME_NAME}' GDM (GNOME Shell) theme panel transparency" "Default is 15%"
helpify "-P, --panel-size" "[$(IFS='|'; echo "${PANEL_SIZE_VARIANTS[*]}")]" "Set '${THEME_NAME}' Gnome shell panel height size" "Default is 32px" helpify "-P, --panel-size" "[$(IFS='|'; echo "${PANEL_SIZE_VARIANTS[*]}")]" "Set '${THEME_NAME}' Gnome shell panel height size" "Default is 32px"
helpify "-i, --icon" "[$(IFS='|'; echo "${ICON_VARIANTS[*]}")]" "Set '${THEME_NAME}' GDM (GNOME Shell) 'Activities' icon" "Default is 'standard'" helpify "-i, --icon" "[$(IFS='|'; echo "${ICON_VARIANTS[*]}")]" "Set '${THEME_NAME}' GDM (GNOME Shell) 'Activities' icon" "Default is 'standard'"
helpify "-l, --libadwaita" "" "Install gtk-4.0 files to gtk4.0 config folder for libadwaita" "Do not run this option with sudo !"
helpify "-r, --remove, --revert" "" "Revert to the original themes, do the opposite things of install and connect" "" helpify "-r, --remove, --revert" "" "Revert to the original themes, do the opposite things of install and connect" ""
helpify "--silent-mode" "" "Meant for developers: ignore any confirm prompt and params become more strict" "" helpify "--silent-mode" "" "Meant for developers: ignore any confirm prompt and params become more strict" ""
helpify "-h, --help" "" "Show this help" "" helpify "-h, --help" "" "Show this help" ""
@ -153,6 +154,8 @@ while [[ $# -gt 0 ]]; do
no_darken="true"; shift ;; no_darken="true"; shift ;;
-n|--no-blur) -n|--no-blur)
no_blur="true"; shift ;; no_blur="true"; shift ;;
-l|--libadwaita)
libadwaita="true"; shift ;;
# Parameters that require value, single use # Parameters that require value, single use
-b|--background) -b|--background)
check_param "${1}" "${1}" "${2}" "must" "must" "must" "false" && shift 2 || shift ;; check_param "${1}" "${1}" "${2}" "must" "must" "must" "false" && shift 2 || shift ;;
@ -210,6 +213,15 @@ if [[ "${uninstall}" == 'true' ]]; then
remove_firefox_theme remove_firefox_theme
prompt -s "Done! '${name}' Firefox theme has been removed."; echo prompt -s "Done! '${name}' Firefox theme has been removed."; echo
fi fi
if [[ "${libadwaita}" == 'true' ]]; then
if [[ "$UID" != '0' ]]; then
remove_libadwaita
prompt -s "Removed gtk-4.0 theme files in '${HOME}/.config/gtk-4.0/' !"; echo
else
prompt -e "Do not run '--libadwaita' option with sudo!"; echo
fi
fi
else else
show_needed_dialogs; customize_theme show_needed_dialogs; customize_theme
@ -255,9 +267,18 @@ else
prompt -i "FIREFOX: Anyways, you can also edit 'userChrome.css' and 'customChrome.css' later in your Firefox profile directory." prompt -i "FIREFOX: Anyways, you can also edit 'userChrome.css' and 'customChrome.css' later in your Firefox profile directory."
echo echo
fi fi
if [[ "${libadwaita}" == 'true' ]]; then
if [[ "$UID" != '0' ]]; then
install_libadwaita
prompt -w "Installed ${name} ${opacities} ${colors} gtk-4.0 into config for libadwaita!"; echo
else
prompt -e "Do not run '--libadwaita' option with sudo!"; echo
fi
fi
fi fi
if [[ "${firefox}" == "false" && "${edit_firefox}" == "false" && "${flatpak}" == "false" && "${snap}" == "false" && "${gdm}" == "false" && "${dash_to_dock}" == "false" ]]; then if [[ "${firefox}" == "false" && "${edit_firefox}" == "false" && "${flatpak}" == "false" && "${snap}" == "false" && "${gdm}" == "false" && "${dash_to_dock}" == "false" && "${libadwaita}" == "false" ]]; then
prompt -e "Oops... there's nothing to tweak..." prompt -e "Oops... there's nothing to tweak..."
prompt -i "HINT: Don't forget to define which component to tweak, e.g. '--gdm'" prompt -i "HINT: Don't forget to define which component to tweak, e.g. '--gdm'"
prompt -i "HINT: Run ./tweaks.sh -h for help!..."; echo prompt -i "HINT: Run ./tweaks.sh -h for help!..."; echo