Modified title bar and updated the version of code

lib-core.sh

@@ -84,7 +84,7 @@ OPACITY_VARIANTS=('normal' 'solid')
 ALT_VARIANTS=('normal' 'alt')
 THEME_VARIANTS=('default' 'blue' 'purple' 'pink' 'red' 'orange' 'yellow' 'green' 'grey')
 ICON_VARIANTS=('standard' 'simple' 'gnome' 'ubuntu' 'arch' 'manjaro' 'fedora' 'debian' 'void')
-SIDEBAR_SIZE_VARIANTS=('default' '220' '240' '260' '280')
+SIDEBAR_SIZE_VARIANTS=('default' '180' '220' '240' '260' '280')
 PANEL_OPACITY_VARIANTS=('default' '30' '45' '60' '75')
 NAUTILUS_STYLE_VARIANTS=('stable' 'normal' 'mojave' 'glassy')
 
@@ -500,7 +500,7 @@ check_param() {
       -n)
         name="${value}"; variant_found="skip" ;;
       -s)
-        for i in {0..4}; do
+        for i in {0..5}; do
           if [[ "${value}" == "${SIDEBAR_SIZE_VARIANTS[i]}" ]]; then
             sidebar_size="${value}"; variant_found="true"; break
           fi

lib-install.sh

@@ -288,7 +288,6 @@ install_darky() {
   local opacity="$(destify ${1})"
   local theme="$(destify ${2})"
 
-  install_theme_deps
   sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-3.0/gtk-dark.scss"                            "${WHITESUR_TMP_DIR}/darky-3.css"
   sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-4.0/gtk-dark.scss"                            "${WHITESUR_TMP_DIR}/darky-4.css"
 }
@@ -327,7 +326,6 @@ install_shelly() {
     TARGET_DIR="${6}"
   fi
 
-  install_theme_deps
 
   mkdir -p                                                                                    "${TARGET_DIR}"
   mkdir -p                                                                                    "${TARGET_DIR}/assets"
@@ -397,8 +395,6 @@ install_theemy() {
 
   echo -e "${desktop_entry}" >                                                                "${TARGET_DIR}/index.theme"
 
-  install_theme_deps
-
   #--------------------GTK-3.0--------------------#
 
   mkdir -p                                                                                    "${TMP_DIR_T}"

src/assets/gtk/common-assets/sidebar-assets.txt

@@ -1,3 +1,9 @@
+sidebar-view-hover-180px
+sidebar-view-active-180px
+sidebar-view-checked-180px
+sidebar-view-hover-180px-dark
+sidebar-view-active-180px-dark
+sidebar-view-checked-180px-dark
 sidebar-view-hover-200px
 sidebar-view-active-200px
 sidebar-view-checked-200px

src/main/gtk-3.0/gtk.gresource.xml

@@ -121,6 +121,18 @@
     <file>assets/[email protected]</file>
     <file>assets/paned-separator-dark.png</file>
     <file>assets/[email protected]</file>
+    <file>assets/sidebar-view-hover-180px.png</file>
+    <file>assets/[email protected]</file>
+    <file>assets/sidebar-view-active-180px.png</file>
+    <file>assets/[email protected]</file>
+    <file>assets/sidebar-view-checked-180px.png</file>
+    <file>assets/[email protected]</file>
+    <file>assets/sidebar-view-hover-180px-dark.png</file>
+    <file>assets/[email protected]</file>
+    <file>assets/sidebar-view-active-180px-dark.png</file>
+    <file>assets/[email protected]</file>
+    <file>assets/sidebar-view-checked-180px-dark.png</file>
+    <file>assets/[email protected]</file>
     <file>assets/sidebar-view-hover-200px.png</file>
     <file>assets/[email protected]</file>
     <file>assets/sidebar-view-active-200px.png</file>

src/main/gtk-3.0/make_gresource_xml.sh

@@ -1,8 +1,8 @@
 #! /bin/bash
 
-INDEX="../../assets/gtk-3.0/common-assets/assets.txt"
-SINDEX="../../assets/gtk-3.0/common-assets/sidebar-assets.txt"
-WINDEX="../../assets/gtk-3.0/windows-assets/assets.txt"
+INDEX="../../assets/gtk/common-assets/assets.txt"
+SINDEX="../../assets/gtk/common-assets/sidebar-assets.txt"
+WINDEX="../../assets/gtk/windows-assets/assets.txt"
 
 if [ -f gtk.gresource.xml ]; then
   rm -rf gtk.gresource.xml

src/main/gtk-4.0/gtk.gresource.xml

@@ -121,6 +121,18 @@
     <file>assets/[email protected]</file>
     <file>assets/paned-separator-dark.png</file>
     <file>assets/[email protected]</file>
+    <file>assets/sidebar-view-hover-180px.png</file>
+    <file>assets/[email protected]</file>
+    <file>assets/sidebar-view-active-180px.png</file>
+    <file>assets/[email protected]</file>
+    <file>assets/sidebar-view-checked-180px.png</file>
+    <file>assets/[email protected]</file>
+    <file>assets/sidebar-view-hover-180px-dark.png</file>
+    <file>assets/[email protected]</file>
+    <file>assets/sidebar-view-active-180px-dark.png</file>
+    <file>assets/[email protected]</file>
+    <file>assets/sidebar-view-checked-180px-dark.png</file>
+    <file>assets/[email protected]</file>
     <file>assets/sidebar-view-hover-200px.png</file>
     <file>assets/[email protected]</file>
     <file>assets/sidebar-view-active-200px.png</file>

src/main/gtk-4.0/make_gresource_xml.sh

@@ -1,8 +1,8 @@
 #! /bin/bash
 
-INDEX="../../assets/gtk-3.0/common-assets/assets.txt"
-SINDEX="../../assets/gtk-3.0/common-assets/sidebar-assets.txt"
-WINDEX="../../assets/gtk-3.0/windows-assets/assets.txt"
+INDEX="../../assets/gtk/common-assets/assets.txt"
+SINDEX="../../assets/gtk/common-assets/sidebar-assets.txt"
+WINDEX="../../assets/gtk/windows-assets/assets.txt"
 
 if [ -f gtk.gresource.xml ]; then
   rm -rf gtk.gresource.xml

src/sass/_colors.scss

@@ -11,9 +11,9 @@
 
 // Base colors
 $base_color:                        if($variant == 'light', #ffffff, #161925);
-$text_color:                        if($variant == 'light', #c4c4c4, #e7e7e7);
+$text_color:                        if($variant == 'light', #363636, #dadada);
 $bg_color:                          if($variant == 'light', #f5f5f5, #303643);
-$fg_color:                          if($variant == 'light', #161925, #dedede);
+$fg_color:                          if($variant == 'light', #242424, #dedede);
 $alt_fg_color:                      if($variant == 'light', #424242, #afafaf);
 $hint_fg_color:                     if($variant == 'light', #565656, #999999);
 
@@ -72,13 +72,13 @@ $light_borders_color:               if($variant == 'light', rgba(black, 0.08), r
 $dark_borders_color:                if($variant == 'light', rgba(black, 0.08), rgba(black, 0.15));
 $solid_borders_color:               if($variant == 'light', darken($bg_color, 12%), lighten($bg_color, 8%));
 $dark_solid_borders_color:          if($variant == 'light', darken($bg_color, 12%), darken($bg_color, 5%));
-$highlight_color:                   if($variant == 'light', rgba(white, 0.65), rgba(white, 0.1));
+$highlight_color:                   if($variant == 'light', rgba(white, 0.15), rgba(white, 0.1));
 
 // Background colors
 $dark_bg_color:                     rgba(black, 0.6);
 $alt_dark_bg_color:                 rgba(black, 0.3);
 $solid_bg_color:                    if($variant == 'light', #eeeeee, #555555); // for gnome-shell keyboard
-$alt_solid_bg_color:                if($variant == 'light', #c0c0c0, #161925); // for gnome-shell keyboard
+$alt_solid_bg_color:                if($variant == 'light', #c0c0c0, #242424); // for gnome-shell keyboard
 
 // Link colors
 $link_color:                        #3484e2;
@@ -102,6 +102,15 @@ $disabled_bg_color:                 if($variant == 'light', mix($bg_color, $base
 
 // Headerbar colors
 $header_bg:                         if($variant == 'light', #ffffff, #0c0e14);
+@if $trans=='true' and $variant=='light' {
+  $header_bg:                       transparentize(#ffffff, 0.1);
+} @else if $trans=='true' and $variant=='dark' {
+  $header_bg:                       transparentize(#0c0e14, 0.1);
+} @else if $trans=='false' and $variant=='light' {
+  $header_bg:                       #ffffff;
+} @else if $trans=='false' and $variant=='dark' {
+  $header_bg:                       #0c0e14;
+}
 $dark_header_bg:                    if($trans == 'true', rgba($base_color, 0.95), $base_color);
 $header_highlight:                  if($variant == 'dark', #252525, #f5f5f5);
 
@@ -163,7 +172,7 @@ $panel_fg:                          if($trans == 'true', white, $text_color);
 @if $trans == 'true' { $panel_bg:   if($variant == 'light', rgba(white, $panel_opacity/2 + 0.08), rgba(black, $panel_opacity)); }
 @if $black == 'true' { $panel_fg:   $text_color; }
 
-$dash_bg: if($variant == 'light', rgba(#f1f1f1, $panel_opacity + 0.2), rgba(#222222, $panel_opacity/2 + 0.6));
+$dash_bg: if($variant == 'light', rgba(#d1d1d1, $panel_opacity + 0.33), rgba(#222222, $panel_opacity/2 + 0.6));
 $dash_fg: if($variant == 'light', black, white);
 
 // Entry colors

src/sass/cinnamon/_common.scss

@@ -601,8 +601,8 @@ $menu_border: if($variant=='light', darken($menu_bg, 18%), darken($menu_bg, 12%)
 }
 
 .workspace-thumbnail-indicator {
-  outline: 2px solid red;
-  border: 1px solid green;
+  outline: 2px solid $borders_color;
+  border: 1px solid $highlight_color;
 }
 
 .window-close:rtl {

src/sass/gnome-shell/common/_panel.scss

@@ -157,7 +157,7 @@
   }
 
   Gjs_ui_panel_AppMenuButton.panel-button,
-  .menubar-button, // For Fildem global menu
+  // .menubar-button, // For Fildem global menu
   .desktop-name-label { // For Unite
     font-weight: bold !important;
   }