From 9eb675f8b461ae91534d469a99bc918a05bbe56b Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Sat, 12 Nov 2022 23:11:11 +0800
Subject: [PATCH] update

---
 install.sh                         |  6 +++---
 lib-install.sh                     |  2 +-
 src/sass/gtk/apps/_gnome-3.22.scss | 31 ++++++------------------------
 3 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/install.sh b/install.sh
index 2d5960cf..537ab612 100755
--- a/install.sh
+++ b/install.sh
@@ -158,11 +158,11 @@ else
     show_needed_dialogs
   fi
 
-  prompt -w "Removing the old '${name}${colorscheme}' themes..."
+  prompt -w "Removing the old '${name}${colorscheme}' themes...\n"
 
-  remove_themes; customize_theme; avoid_variant_duplicates; echo
+  remove_themes; customize_theme; avoid_variant_duplicates;
 
-  prompt -w "Installing '${name}${colorscheme}' themes in '${dest}'..."; echo
+  prompt -w "Installing '${name}${colorscheme}' themes in '${dest}'...\n";
 
   prompt -t "--->>> GTK | GNOME Shell | Cinnamon | Metacity | XFWM | Plank <<<---"
   prompt -i "Color variants   : $( IFS=';'; echo "${colors[*]}" )"
diff --git a/lib-install.sh b/lib-install.sh
index d70313a0..a0abd969 100755
--- a/lib-install.sh
+++ b/lib-install.sh
@@ -884,7 +884,7 @@ customize_theme() {
 
   # Change Nautilus sidarbar size
   if [[ "${sidebar_size}" != 'default' ]]; then
-    prompt -s "Changing Nautilus sidebar size ... \n"
+    prompt -s "Changing Nautilus sidebar size ...\n"
     sed $SED_OPT "/\$sidebar_size/s/200px/${sidebar_size}px/"                   "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
   fi
 
diff --git a/src/sass/gtk/apps/_gnome-3.22.scss b/src/sass/gtk/apps/_gnome-3.22.scss
index b0d8a08b..6416d129 100644
--- a/src/sass/gtk/apps/_gnome-3.22.scss
+++ b/src/sass/gtk/apps/_gnome-3.22.scss
@@ -88,21 +88,9 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
 
         > .linked > button.disclosure-button { margin-left: $container_padding / 2; }
 
-        > box.horizontal:first-child { // move the search button to right side
-          margin-right: -74px;
-
-          @if $nautilus_style == 'normal' or $nautilus_style == 'stable' {
-            entry.search { margin-left: if($placement == 'left', $container_padding, $nautilus_sidebar_size - 74px); }
-          }
-        }
-      }
-
-      @if $nautilus_style == 'normal' or $nautilus_style == 'stable' {
-        &.maximized {
-          > deck > box.vertical > headerbar.titlebar {
-            > box.horizontal:first-child { // move the search button to right side
-              entry.search { margin-left: 0; }
-            }
+        @if $placement == 'left' {
+          .nautilus-path-bar {
+            margin-left: 22px;
           }
         }
       }
@@ -131,12 +119,7 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
 
       @if $nautilus_style == 'normal' or $nautilus_style == 'stable' {
         @if $placement == 'left' {
-          > .linked.raised > button:first-child { margin-left: $nautilus_sidebar_size - (32px + $container_padding * 6); }
-        }
-
-        @else {
-          .path-bar-box { margin-left: $nautilus_sidebar_size - (68px + $container_padding * 2); }
-          entry.search { margin-left: if($placement == 'left', $container_padding * 1.5, $nautilus_sidebar_size - 74px); }
+          > .linked.raised > button:first-child { margin-left: $nautilus_sidebar_size - (48px + $container_padding * 6); }
         }
       }
     }
@@ -164,10 +147,8 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
 
       @if $nautilus_style == 'stable' {
         background-image: if($trans == 'true', none, $nautilus_sidebar_image);
-      }
-
-      @else {
-        &.frame { border-right: 1px solid $nautilus_borders_color; }
+      } @else {
+        &.frame { border-right: 1px solid $header_border; }
       }
 
       list { margin-bottom: 6px; }