update

README.md

@@ -94,9 +94,6 @@ Usage:  `./install.sh [OPTIONS...]`
   -m, --monterey
  Set to MacOS Monterey style.
 
-  -l, --libadwaita 
- Install gtk-4.0 theme into config for libadwaita. 
-
   -N, --nautilus-style [stable|normal|mojave|glassy]
  Set Nautilus style. Default is BigSur-like style (stabled sidebar)
 
@@ -222,6 +219,9 @@ Usage:  `./tweaks.sh [OPTIONS...]`
   -n, --no-blur
  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]
  Set 'WhiteSur' GDM theme background image. Default is BigSur-like wallpaper
 

install.sh

@@ -35,7 +35,6 @@ usage() {
   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 "-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 "-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"
@@ -165,15 +164,6 @@ else
 
   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
     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

lib-install.sh

@@ -477,12 +477,8 @@ install_theemy() {
 
 remove_packy() {
   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}-xhdpi"
-
-  # Backward compatibility
-  # rm -rf "${dest}/${name}$(destify ${1})-mdpi"
 }
 
 remove_old_packy() {
@@ -493,7 +489,9 @@ remove_old_packy() {
 
 config_gtk4() {
   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"
 
@@ -535,8 +533,12 @@ install_themes() {
 }
 
 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() {
@@ -805,6 +807,7 @@ disconnect_snap() {
 #########################################################################
 
 gtk_base() {
+  rm -rf "${THEME_SRC_DIR}/sass/_gtk-base-temp.scss"
   cp -rf "${THEME_SRC_DIR}/sass/_gtk-base"{".scss","-temp.scss"}
 
   # Theme base options
@@ -826,6 +829,7 @@ gtk_base() {
 ###############################################################################
 
 customize_theme() {
+  rm -rf "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
   cp -rf "${THEME_SRC_DIR}/sass/_theme-options"{".scss","-temp.scss"}
 
   # Darker dark colors

src/sass/gtk/_common-4.0.scss

@@ -4256,7 +4256,7 @@ window.dialog.message { // Message Dialog styling
       padding: ($container_padding - 2px) ($container_padding + 2px);
       box-shadow: none;
       border-radius: $bt_radius;
-      margin: 0 3px 3px 3px;
+      margin: $container_padding / 2;
       border: none;
 
       &: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 {
   -gtk-icon-size: 128px;
 }
@@ -4439,7 +4472,7 @@ placessidebar {
     // Using margins/padding directly in the SidebarRow
     // will make the animation of the new bookmark row jump
     > revealer {
-      padding: 0 $container_padding + 4px;
+      padding: 0;
     }
 
     image.sidebar-icon {

src/sass/gtk/apps/_gnome-40.0.scss

@@ -3,8 +3,20 @@
  * Nautilus *
  ************/
 
- .nautilus-window {
+.nautilus-window {
+  &.background.csd {
+    background-color: transparent;
+  }
+
   flap.unfolded {
+    > placessidebar.background {
+      background: none;
+
+      list.navigation-sidebar {
+        background-color: $dark_sidebar_bg;
+      }
+    }
+
     > separator.horizontal {
       background-color: $header_border;
     }

tweaks.sh

@@ -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-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 "-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 "--silent-mode"       ""                                                  "Meant for developers: ignore any confirm prompt and params become more strict" ""
   helpify "-h, --help"          ""                                                  "Show this help"                                                              ""
@@ -153,6 +154,8 @@ while [[ $# -gt 0 ]]; do
       no_darken="true"; shift ;;
     -n|--no-blur)
       no_blur="true"; shift ;;
+    -l|--libadwaita)
+      libadwaita="true"; shift ;;
       # Parameters that require value, single use
     -b|--background)
       check_param "${1}" "${1}" "${2}" "must" "must" "must" "false" && shift 2 || shift ;;
@@ -210,6 +213,15 @@ if [[ "${uninstall}" == 'true' ]]; then
     remove_firefox_theme
     prompt -s "Done! '${name}' Firefox theme has been removed."; echo
   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
   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."
     echo
   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
 
-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 -i "HINT: Don't forget to define which component to tweak, e.g. '--gdm'"
   prompt -i "HINT: Run ./tweaks.sh -h for help!..."; echo