diff --git a/lib-core.sh b/lib-core.sh index 93dc6b08..ff5877d1 100755 --- a/lib-core.sh +++ b/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 diff --git a/src/assets/gtk/common-assets/sidebar-assets.svg b/src/assets/gtk/common-assets/sidebar-assets.svg index ff4e4f7e..ce0ab7b9 100644 --- a/src/assets/gtk/common-assets/sidebar-assets.svg +++ b/src/assets/gtk/common-assets/sidebar-assets.svg @@ -1,123 +1,826 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/gtk/common-assets/sidebar-assets.txt b/src/assets/gtk/common-assets/sidebar-assets.txt index 328650d8..124802cd 100644 --- a/src/assets/gtk/common-assets/sidebar-assets.txt +++ b/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 diff --git a/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-180px-dark.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-180px-dark.png new file mode 100644 index 00000000..b48ecbd6 Binary files /dev/null and b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-180px-dark.png differ diff --git a/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-180px-dark@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-180px-dark@2.png new file mode 100644 index 00000000..3660cf43 Binary files /dev/null and b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-180px-dark@2.png differ diff --git a/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-180px.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-180px.png new file mode 100644 index 00000000..219a997b Binary files /dev/null and b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-180px.png differ diff --git a/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-180px@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-180px@2.png new file mode 100644 index 00000000..a486a67b Binary files /dev/null and b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-180px@2.png differ diff --git a/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-180px-dark.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-180px-dark.png new file mode 100644 index 00000000..8fd196a8 Binary files /dev/null and b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-180px-dark.png differ diff --git a/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-180px-dark@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-180px-dark@2.png new file mode 100644 index 00000000..c14de82e Binary files /dev/null and b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-180px-dark@2.png differ diff --git a/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-180px.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-180px.png new file mode 100644 index 00000000..60e291de Binary files /dev/null and b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-180px.png differ diff --git a/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-180px@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-180px@2.png new file mode 100644 index 00000000..f9b87e1b Binary files /dev/null and b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-180px@2.png differ diff --git a/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-180px-dark.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-180px-dark.png new file mode 100644 index 00000000..904174a8 Binary files /dev/null and b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-180px-dark.png differ diff --git a/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-180px-dark@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-180px-dark@2.png new file mode 100644 index 00000000..4c727f2b Binary files /dev/null and b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-180px-dark@2.png differ diff --git a/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-180px.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-180px.png new file mode 100644 index 00000000..4e92a305 Binary files /dev/null and b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-180px.png differ diff --git a/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-180px@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-180px@2.png new file mode 100644 index 00000000..a4292436 Binary files /dev/null and b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-180px@2.png differ diff --git a/src/main/gtk-3.0/gtk.gresource.xml b/src/main/gtk-3.0/gtk.gresource.xml index fc02016d..559f526e 100644 --- a/src/main/gtk-3.0/gtk.gresource.xml +++ b/src/main/gtk-3.0/gtk.gresource.xml @@ -121,6 +121,18 @@ assets/paned-separator@2.png assets/paned-separator-dark.png assets/paned-separator-dark@2.png + assets/sidebar-view-hover-180px.png + assets/sidebar-view-hover-180px@2.png + assets/sidebar-view-active-180px.png + assets/sidebar-view-active-180px@2.png + assets/sidebar-view-checked-180px.png + assets/sidebar-view-checked-180px@2.png + assets/sidebar-view-hover-180px-dark.png + assets/sidebar-view-hover-180px-dark@2.png + assets/sidebar-view-active-180px-dark.png + assets/sidebar-view-active-180px-dark@2.png + assets/sidebar-view-checked-180px-dark.png + assets/sidebar-view-checked-180px-dark@2.png assets/sidebar-view-hover-200px.png assets/sidebar-view-hover-200px@2.png assets/sidebar-view-active-200px.png diff --git a/src/main/gtk-3.0/make_gresource_xml.sh b/src/main/gtk-3.0/make_gresource_xml.sh index 0aa37744..d9a944b1 100755 --- a/src/main/gtk-3.0/make_gresource_xml.sh +++ b/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 diff --git a/src/main/gtk-4.0/gtk.gresource.xml b/src/main/gtk-4.0/gtk.gresource.xml index fc02016d..559f526e 100644 --- a/src/main/gtk-4.0/gtk.gresource.xml +++ b/src/main/gtk-4.0/gtk.gresource.xml @@ -121,6 +121,18 @@ assets/paned-separator@2.png assets/paned-separator-dark.png assets/paned-separator-dark@2.png + assets/sidebar-view-hover-180px.png + assets/sidebar-view-hover-180px@2.png + assets/sidebar-view-active-180px.png + assets/sidebar-view-active-180px@2.png + assets/sidebar-view-checked-180px.png + assets/sidebar-view-checked-180px@2.png + assets/sidebar-view-hover-180px-dark.png + assets/sidebar-view-hover-180px-dark@2.png + assets/sidebar-view-active-180px-dark.png + assets/sidebar-view-active-180px-dark@2.png + assets/sidebar-view-checked-180px-dark.png + assets/sidebar-view-checked-180px-dark@2.png assets/sidebar-view-hover-200px.png assets/sidebar-view-hover-200px@2.png assets/sidebar-view-active-200px.png diff --git a/src/main/gtk-4.0/make_gresource_xml.sh b/src/main/gtk-4.0/make_gresource_xml.sh index 0aa37744..d9a944b1 100755 --- a/src/main/gtk-4.0/make_gresource_xml.sh +++ b/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 diff --git a/src/sass/gnome-shell/common/_panel.scss b/src/sass/gnome-shell/common/_panel.scss index 28b91a9e..7c05bee3 100644 --- a/src/sass/gnome-shell/common/_panel.scss +++ b/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; }