diff --git a/install.sh b/install.sh
index d873c04..74763ec 100755
--- a/install.sh
+++ b/install.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
# WARNING: Please make this shell not working-directory dependant, for example
# instead of using 'cd blabla', use 'cd "${REPO_DIR}/blabla"'
diff --git a/lib-core.sh b/lib-core.sh
old mode 100644
new mode 100755
index 9842105..900d8c9
--- a/lib-core.sh
+++ b/lib-core.sh
@@ -74,12 +74,12 @@ THEME_VARIANTS=('default' 'blue' 'purple' 'pink' 'red' 'orange' 'yellow' 'green'
ICON_VARIANTS=('standard' 'simple' 'gnome' 'ubuntu' 'arch' 'manjaro' 'fedora' 'debian' 'void')
SIDEBAR_SIZE_VARIANTS=('default' '220' '240' '260' '280')
PANEL_OPACITY_VARIANTS=('default' '30' '45' '60' '75')
-NAUTILUS_STYLE_VARIANTS=('default' 'mojave' 'glassy')
+NAUTILUS_STYLE_VARIANTS=('default' 'stable' 'mojave' 'glassy')
# Customization, default values
dest="${THEME_DIR}"
name="${THEME_NAME}"
-colors=("${COLOR_VARIANTS[0]}")
+colors=("${COLOR_VARIANTS}")
opacities=("${OPACITY_VARIANTS[0]}")
alts=("${ALT_VARIANTS[0]}")
themes=("${THEME_VARIANTS[0]}")
diff --git a/lib-install.sh b/lib-install.sh
old mode 100644
new mode 100755
index 2671c25..526d1cc
--- a/lib-install.sh
+++ b/lib-install.sh
@@ -144,6 +144,7 @@ install_theemy() {
mkdir -p "${TMP_DIR}"
cp -r "${THEME_SRC_DIR}/assets/gtk-3.0/common-assets/assets" "${TMP_DIR}"
+ cp -r "${THEME_SRC_DIR}/assets/gtk-3.0/common-assets/sidebar-assets/"*".png" "${TMP_DIR}/assets"
cp -r "${THEME_SRC_DIR}/assets/gtk-3.0/windows-assets/titlebutton${alt}" "${TMP_DIR}/windows-assets"
if [[ "${theme}" != '' ]]; then
@@ -486,12 +487,14 @@ show_nautilus_style_dialog() {
tui=$(dialog --backtitle "${THEME_NAME} gtk theme installer" \
--radiolist "Choose your Nautilus style (default is BigSur-like style):" 15 40 5 \
0 "${NAUTILUS_STYLE_VARIANTS[0]}" on \
- 1 "${NAUTILUS_STYLE_VARIANTS[1]}" on \
- 2 "${NAUTILUS_STYLE_VARIANTS[2]}" off --output-fd 1 )
+ 1 "${NAUTILUS_STYLE_VARIANTS[1]}" off \
+ 1 "${NAUTILUS_STYLE_VARIANTS[2]}" off \
+ 2 "${NAUTILUS_STYLE_VARIANTS[3]}" off --output-fd 1 )
case "$tui" in
0) nautilus_style="${NAUTILUS_STYLE_VARIANTS[0]}" ;;
1) nautilus_style="${NAUTILUS_STYLE_VARIANTS[1]}" ;;
2) nautilus_style="${NAUTILUS_STYLE_VARIANTS[2]}" ;;
+ 3) nautilus_style="${NAUTILUS_STYLE_VARIANTS[3]}" ;;
*) operation_canceled ;;
esac
fi
diff --git a/src/assets/gtk-3.0/common-assets/render-sidebar-assets.sh b/src/assets/gtk-3.0/common-assets/render-sidebar-assets.sh
new file mode 100755
index 0000000..307abcc
--- /dev/null
+++ b/src/assets/gtk-3.0/common-assets/render-sidebar-assets.sh
@@ -0,0 +1,37 @@
+#! /bin/bash
+
+INKSCAPE="/usr/bin/inkscape"
+OPTIPNG="/usr/bin/optipng"
+
+SRC_FILE="sidebar-assets.svg"
+ASSETS_DIR="sidebar-assets"
+INDEX="sidebar-assets.txt"
+
+[[ -d $ASSETS_DIR ]] && rm -rf $ASSETS_DIR
+mkdir -p $ASSETS_DIR
+
+for i in `cat $INDEX`
+do
+if [ -f $ASSETS_DIR/$i.png ]; then
+ echo $ASSETS_DIR/$i.png exists.
+else
+ echo
+ echo Rendering $ASSETS_DIR/$i.png
+ $INKSCAPE --export-id=$i \
+ --export-id-only \
+ --export-filename=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null
+ $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png
+fi
+if [ -f $ASSETS_DIR/$i@2.png ]; then
+ echo $ASSETS_DIR/$i@2.png exists.
+else
+ echo
+ echo Rendering $ASSETS_DIR/$i@2.png
+ $INKSCAPE --export-id=$i \
+ --export-dpi=192 \
+ --export-id-only \
+ --export-filename=$ASSETS_DIR/$i@2.png $SRC_FILE >/dev/null
+ $OPTIPNG -o7 --quiet $ASSETS_DIR/$i@2.png
+fi
+done
+exit 0
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets.svg b/src/assets/gtk-3.0/common-assets/sidebar-assets.svg
new file mode 100644
index 0000000..ff4e4f7
--- /dev/null
+++ b/src/assets/gtk-3.0/common-assets/sidebar-assets.svg
@@ -0,0 +1,123 @@
+
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets.txt b/src/assets/gtk-3.0/common-assets/sidebar-assets.txt
new file mode 100644
index 0000000..328650d
--- /dev/null
+++ b/src/assets/gtk-3.0/common-assets/sidebar-assets.txt
@@ -0,0 +1,30 @@
+sidebar-view-hover-200px
+sidebar-view-active-200px
+sidebar-view-checked-200px
+sidebar-view-hover-200px-dark
+sidebar-view-active-200px-dark
+sidebar-view-checked-200px-dark
+sidebar-view-hover-220px
+sidebar-view-active-220px
+sidebar-view-checked-220px
+sidebar-view-hover-220px-dark
+sidebar-view-active-220px-dark
+sidebar-view-checked-220px-dark
+sidebar-view-hover-240px
+sidebar-view-active-240px
+sidebar-view-checked-240px
+sidebar-view-hover-240px-dark
+sidebar-view-active-240px-dark
+sidebar-view-checked-240px-dark
+sidebar-view-hover-260px
+sidebar-view-active-260px
+sidebar-view-checked-260px
+sidebar-view-hover-260px-dark
+sidebar-view-active-260px-dark
+sidebar-view-checked-260px-dark
+sidebar-view-hover-280px
+sidebar-view-active-280px
+sidebar-view-checked-280px
+sidebar-view-hover-280px-dark
+sidebar-view-active-280px-dark
+sidebar-view-checked-280px-dark
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-200px-dark.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-200px-dark.png
new file mode 100644
index 0000000..edd52d9
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-200px-dark.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-200px-dark@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-200px-dark@2.png
new file mode 100644
index 0000000..5796ca8
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-200px-dark@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-200px.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-200px.png
new file mode 100644
index 0000000..c20283d
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-200px.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-200px@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-200px@2.png
new file mode 100644
index 0000000..fbb51ac
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-200px@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-220px-dark.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-220px-dark.png
new file mode 100644
index 0000000..341820a
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-220px-dark.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-220px-dark@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-220px-dark@2.png
new file mode 100644
index 0000000..bac508a
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-220px-dark@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-220px.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-220px.png
new file mode 100644
index 0000000..01ee8af
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-220px.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-220px@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-220px@2.png
new file mode 100644
index 0000000..b31366f
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-220px@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-240px-dark.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-240px-dark.png
new file mode 100644
index 0000000..e8a9dcd
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-240px-dark.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-240px-dark@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-240px-dark@2.png
new file mode 100644
index 0000000..35ea54b
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-240px-dark@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-240px.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-240px.png
new file mode 100644
index 0000000..a36938a
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-240px.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-240px@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-240px@2.png
new file mode 100644
index 0000000..ab38351
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-240px@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-260px-dark.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-260px-dark.png
new file mode 100644
index 0000000..d21965f
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-260px-dark.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-260px-dark@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-260px-dark@2.png
new file mode 100644
index 0000000..aca4d2e
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-260px-dark@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-260px.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-260px.png
new file mode 100644
index 0000000..c45be2e
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-260px.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-260px@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-260px@2.png
new file mode 100644
index 0000000..6b8945d
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-260px@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-280px-dark.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-280px-dark.png
new file mode 100644
index 0000000..e13af3a
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-280px-dark.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-280px-dark@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-280px-dark@2.png
new file mode 100644
index 0000000..b112e23
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-280px-dark@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-280px.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-280px.png
new file mode 100644
index 0000000..91b968c
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-280px.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-280px@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-280px@2.png
new file mode 100644
index 0000000..c15804b
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-280px@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-200px-dark.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-200px-dark.png
new file mode 100644
index 0000000..348eae7
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-200px-dark.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-200px-dark@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-200px-dark@2.png
new file mode 100644
index 0000000..164f44f
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-200px-dark@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-200px.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-200px.png
new file mode 100644
index 0000000..e37b397
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-200px.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-200px@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-200px@2.png
new file mode 100644
index 0000000..73e7bac
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-200px@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-220px-dark.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-220px-dark.png
new file mode 100644
index 0000000..1615692
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-220px-dark.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-220px-dark@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-220px-dark@2.png
new file mode 100644
index 0000000..3f7709d
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-220px-dark@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-220px.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-220px.png
new file mode 100644
index 0000000..2330bfc
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-220px.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-220px@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-220px@2.png
new file mode 100644
index 0000000..ada0908
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-220px@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-240px-dark.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-240px-dark.png
new file mode 100644
index 0000000..229bc61
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-240px-dark.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-240px-dark@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-240px-dark@2.png
new file mode 100644
index 0000000..0ac3268
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-240px-dark@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-240px.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-240px.png
new file mode 100644
index 0000000..b79b643
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-240px.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-240px@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-240px@2.png
new file mode 100644
index 0000000..4a8833e
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-240px@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-260px-dark.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-260px-dark.png
new file mode 100644
index 0000000..2341114
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-260px-dark.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-260px-dark@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-260px-dark@2.png
new file mode 100644
index 0000000..5390468
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-260px-dark@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-260px.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-260px.png
new file mode 100644
index 0000000..a986d5a
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-260px.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-260px@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-260px@2.png
new file mode 100644
index 0000000..b909ebe
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-260px@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-280px-dark.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-280px-dark.png
new file mode 100644
index 0000000..b15e5de
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-280px-dark.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-280px-dark@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-280px-dark@2.png
new file mode 100644
index 0000000..5999912
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-280px-dark@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-280px.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-280px.png
new file mode 100644
index 0000000..b64e8ff
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-280px.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-280px@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-280px@2.png
new file mode 100644
index 0000000..1934cd0
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-280px@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-200px-dark.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-200px-dark.png
new file mode 100644
index 0000000..ab77744
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-200px-dark.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-200px-dark@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-200px-dark@2.png
new file mode 100644
index 0000000..abbef5d
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-200px-dark@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-200px.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-200px.png
new file mode 100644
index 0000000..d4df15a
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-200px.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-200px@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-200px@2.png
new file mode 100644
index 0000000..943e796
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-200px@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-220px-dark.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-220px-dark.png
new file mode 100644
index 0000000..1ab6817
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-220px-dark.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-220px-dark@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-220px-dark@2.png
new file mode 100644
index 0000000..5fc0713
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-220px-dark@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-220px.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-220px.png
new file mode 100644
index 0000000..3ad3862
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-220px.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-220px@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-220px@2.png
new file mode 100644
index 0000000..473915a
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-220px@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-240px-dark.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-240px-dark.png
new file mode 100644
index 0000000..1bfcda2
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-240px-dark.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-240px-dark@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-240px-dark@2.png
new file mode 100644
index 0000000..fcaed6b
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-240px-dark@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-240px.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-240px.png
new file mode 100644
index 0000000..d3818a2
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-240px.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-240px@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-240px@2.png
new file mode 100644
index 0000000..f966901
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-240px@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-260px-dark.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-260px-dark.png
new file mode 100644
index 0000000..c29f00e
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-260px-dark.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-260px-dark@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-260px-dark@2.png
new file mode 100644
index 0000000..d133ab0
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-260px-dark@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-260px.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-260px.png
new file mode 100644
index 0000000..ecd3bc0
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-260px.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-260px@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-260px@2.png
new file mode 100644
index 0000000..223b684
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-260px@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-280px-dark.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-280px-dark.png
new file mode 100644
index 0000000..1fd1482
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-280px-dark.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-280px-dark@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-280px-dark@2.png
new file mode 100644
index 0000000..e1aa51d
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-280px-dark@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-280px.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-280px.png
new file mode 100644
index 0000000..4f76257
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-280px.png differ
diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-280px@2.png b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-280px@2.png
new file mode 100644
index 0000000..44f64da
Binary files /dev/null and b/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-280px@2.png differ
diff --git a/src/main/gtk-3.0/gtk.gresource.xml b/src/main/gtk-3.0/gtk.gresource.xml
index 23b453d..fc02016 100644
--- a/src/main/gtk-3.0/gtk.gresource.xml
+++ b/src/main/gtk-3.0/gtk.gresource.xml
@@ -121,6 +121,66 @@
assets/paned-separator@2.png
assets/paned-separator-dark.png
assets/paned-separator-dark@2.png
+ assets/sidebar-view-hover-200px.png
+ assets/sidebar-view-hover-200px@2.png
+ assets/sidebar-view-active-200px.png
+ assets/sidebar-view-active-200px@2.png
+ assets/sidebar-view-checked-200px.png
+ assets/sidebar-view-checked-200px@2.png
+ assets/sidebar-view-hover-200px-dark.png
+ assets/sidebar-view-hover-200px-dark@2.png
+ assets/sidebar-view-active-200px-dark.png
+ assets/sidebar-view-active-200px-dark@2.png
+ assets/sidebar-view-checked-200px-dark.png
+ assets/sidebar-view-checked-200px-dark@2.png
+ assets/sidebar-view-hover-220px.png
+ assets/sidebar-view-hover-220px@2.png
+ assets/sidebar-view-active-220px.png
+ assets/sidebar-view-active-220px@2.png
+ assets/sidebar-view-checked-220px.png
+ assets/sidebar-view-checked-220px@2.png
+ assets/sidebar-view-hover-220px-dark.png
+ assets/sidebar-view-hover-220px-dark@2.png
+ assets/sidebar-view-active-220px-dark.png
+ assets/sidebar-view-active-220px-dark@2.png
+ assets/sidebar-view-checked-220px-dark.png
+ assets/sidebar-view-checked-220px-dark@2.png
+ assets/sidebar-view-hover-240px.png
+ assets/sidebar-view-hover-240px@2.png
+ assets/sidebar-view-active-240px.png
+ assets/sidebar-view-active-240px@2.png
+ assets/sidebar-view-checked-240px.png
+ assets/sidebar-view-checked-240px@2.png
+ assets/sidebar-view-hover-240px-dark.png
+ assets/sidebar-view-hover-240px-dark@2.png
+ assets/sidebar-view-active-240px-dark.png
+ assets/sidebar-view-active-240px-dark@2.png
+ assets/sidebar-view-checked-240px-dark.png
+ assets/sidebar-view-checked-240px-dark@2.png
+ assets/sidebar-view-hover-260px.png
+ assets/sidebar-view-hover-260px@2.png
+ assets/sidebar-view-active-260px.png
+ assets/sidebar-view-active-260px@2.png
+ assets/sidebar-view-checked-260px.png
+ assets/sidebar-view-checked-260px@2.png
+ assets/sidebar-view-hover-260px-dark.png
+ assets/sidebar-view-hover-260px-dark@2.png
+ assets/sidebar-view-active-260px-dark.png
+ assets/sidebar-view-active-260px-dark@2.png
+ assets/sidebar-view-checked-260px-dark.png
+ assets/sidebar-view-checked-260px-dark@2.png
+ assets/sidebar-view-hover-280px.png
+ assets/sidebar-view-hover-280px@2.png
+ assets/sidebar-view-active-280px.png
+ assets/sidebar-view-active-280px@2.png
+ assets/sidebar-view-checked-280px.png
+ assets/sidebar-view-checked-280px@2.png
+ assets/sidebar-view-hover-280px-dark.png
+ assets/sidebar-view-hover-280px-dark@2.png
+ assets/sidebar-view-active-280px-dark.png
+ assets/sidebar-view-active-280px-dark@2.png
+ assets/sidebar-view-checked-280px-dark.png
+ assets/sidebar-view-checked-280px-dark@2.png
windows-assets/titlebutton-close.png
windows-assets/titlebutton-close@2.png
windows-assets/titlebutton-close-dark.png
diff --git a/src/main/gtk-3.0/make_gresource_xml.sh b/src/main/gtk-3.0/make_gresource_xml.sh
index 4a92870..0aa3774 100755
--- a/src/main/gtk-3.0/make_gresource_xml.sh
+++ b/src/main/gtk-3.0/make_gresource_xml.sh
@@ -1,6 +1,7 @@
#! /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"
if [ -f gtk.gresource.xml ]; then
@@ -17,6 +18,12 @@ do
echo " assets/$i@2.png" >> gtk.gresource.xml
done
+for i in `cat $SINDEX`
+do
+ echo " assets/$i.png" >> gtk.gresource.xml
+ echo " assets/$i@2.png" >> gtk.gresource.xml
+done
+
for i in `cat $WINDEX`
do
echo " windows-assets/$i.png" >> gtk.gresource.xml
diff --git a/src/sass/_theme-options.scss b/src/sass/_theme-options.scss
index 698a9a1..87940a4 100644
--- a/src/sass/_theme-options.scss
+++ b/src/sass/_theme-options.scss
@@ -12,7 +12,7 @@ $nautilus_use_colors: false;
$sidebar_size: 200px;
// Nautilus style
-$nautilus_style: default;
+$nautilus_style: stable;
// Gnome-shell panel opacity
$panel_opacity: 0.15;
diff --git a/src/sass/gtk/_applications.scss b/src/sass/gtk/_applications.scss
index 3d0ae9e..4996c14 100644
--- a/src/sass/gtk/_applications.scss
+++ b/src/sass/gtk/_applications.scss
@@ -56,18 +56,12 @@ window.background.csd { // gnome-terminal 3.32 setting
}
}
-window.background.csd, dialog.background.csd {
- actionbar {
- border-radius: 0 0 $wm_radius $wm_radius;
- }
-}
-
//
// Filechooser, Dialog, and Nautilus
//
$nautilus_radius: $wm_radius + 2px;
$nautilus_sidebar_size: $sidebar_size;
-$nautilus_borders_color: darken(rgba($dark_sidebar_bg, 1), 12%);
+$nautilus_borders_color: if($variant=='light', darken(rgba($dark_sidebar_bg, 1), 12%), $header_border);
$nautilus_header_image: image($header_bg);
$nautilus_header_borders_image: image($header_border);
@@ -76,24 +70,55 @@ $nautilus_actionbar_borders_image: image($header_border);
$dialog_header_image: image($dark_header_bg);
$dialog_header_borders_image: image($header_border);
$nautilus_bg_image: image($dark_sidebar_bg);
+$nautilus_sidebar_image: image($dark_sidebar_bg);
-@if $gnome_version == 'new' {
+@if $gnome_version == 'new' and $nautilus_style != 'stable' {
$nautilus_bg_image: linear-gradient(180deg, rgba($dark_sidebar_bg, 0) ($nautilus_headerbar_size + 1),
$dark_sidebar_bg ($nautilus_headerbar_size + 1));
}
+@if $nautilus_style == 'stable' {
+ @if $gnome_version == 'new' {
+ $nautilus_header_image: linear-gradient(90deg, transparent 0%,
+ transparent $nautilus_sidebar_size,
+ darken($dark_sidebar_bg, 12%) $nautilus_sidebar_size,
+ darken($dark_sidebar_bg, 12%) ($nautilus_sidebar_size + 1px),
+ $base_color ($nautilus_sidebar_size + 1px),
+ $base_color 100%);
+ } @else {
+ $nautilus_header_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
+ $dark_sidebar_bg $nautilus_sidebar_size,
+ darken($dark_sidebar_bg, 12%) $nautilus_sidebar_size,
+ darken($dark_sidebar_bg, 12%) ($nautilus_sidebar_size + 1px),
+ $base_color ($nautilus_sidebar_size + 1px),
+ $base_color 100%);
+ }
+
+ $nautilus_sidebar_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
+ $dark_sidebar_bg $nautilus_sidebar_size,
+ transparent $nautilus_sidebar_size,
+ transparent 100%);
+
+ $nautilus_bg_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
+ $dark_sidebar_bg $nautilus_sidebar_size,
+ darken($dark_sidebar_bg, 12%) $nautilus_sidebar_size,
+ darken($dark_sidebar_bg, 12%) ($nautilus_sidebar_size + 1px),
+ $base_color ($nautilus_sidebar_size + 1px),
+ $base_color 100%);
+}
+
@if $nautilus_style == 'default' or $nautilus_style == 'glassy' {
$dialog_header_image: linear-gradient(90deg, $dialog_bg_color 5%,
- $dark_header_bg 40%);
+ $dark_header_bg 40%);
$dialog_header_borders_image: linear-gradient(90deg, $dialog_bg_color 0px,
- $header_border 25%);
+ $header_border 25%);
$nautilus_actionbar_image: linear-gradient(90deg, rgba($dark_header_bg, 0) 5%,
- transparentize($dark_header_bg, 0.2) 40%);
+ transparentize($dark_header_bg, 0.2) 40%);
$nautilus_actionbar_borders_image: linear-gradient(90deg, rgba($header_border, 0) 0px,
- $header_border 25%);
+ $header_border 25%);
}
@if $nautilus_style == 'default' {
@@ -102,32 +127,20 @@ $nautilus_bg_image: image($dark_sidebar_bg);
$nautilus_borders_color ($nautilus_sidebar_size + 1px),
$base_color ($nautilus_sidebar_size + 1px));
- $nautilus_header_borders_image: linear-gradient(90deg, $dark_sidebar_bg $nautilus_sidebar_size,
- $header_border $nautilus_sidebar_size);
+ $nautilus_header_borders_image: linear-gradient(90deg, transparent $nautilus_sidebar_size,
+ $header_border $nautilus_sidebar_size);
} @else if $nautilus_style == 'glassy' {
$nautilus_header_image: linear-gradient(90deg, $dark_sidebar_bg ($nautilus_sidebar_size/2),
- $dark_header_bg 40%);
+ $dark_header_bg 40%);
- $nautilus_header_borders_image: linear-gradient(90deg, $dark_sidebar_bg (($nautilus_sidebar_size/2) - 40px),
- $header_border 40%);
+ $nautilus_header_borders_image: linear-gradient(90deg, transparent (($nautilus_sidebar_size/2) - 40px),
+ $header_border 40%);
}
@mixin color_sidebar() {
- > grid.horizontal > paned.horizontal > separator,
- > box.vertical > paned.horizontal > separator,
- > deck > box.vertical > paned.horizontal > separator { // Use paned separator to hide stack border-bottom-left-radius
- border-left: none;
- background-color: transparent;
- background-image: image($nautilus_borders_color);
- background-size: 1px 100%;
- background-repeat: no-repeat;
- background-position: center;
- }
-
placessidebar.sidebar {
background-color: transparent;
min-width: $nautilus_sidebar_size;
- margin-bottom: $wm_radius;
border: none;
row.sidebar-row {
@@ -145,28 +158,66 @@ $nautilus_bg_image: image($dark_sidebar_bg);
&:backdrop { opacity: 0.85; }
// row style
- border-radius: $bt_radius;
- margin: 0 6px;
- padding: 2px 4px;
-
- &:hover {
- background-color: rgba($fg_color, 0.1);
- }
-
- &:active, &:active:hover {
- transition: background-color ease-out 200ms;
- background-color: rgba($fg_color, 0.2);
- }
-
- &:selected.has-open-popup,
- &:selected, &:selected:hover {
- color: $fg_color;
- transition: background-color ease-out 200ms;
- background-color: rgba($fg_color, 0.15);
-
- &, label { color: $fg_color; }
+ @if $nautilus_style == 'stable' {
+ &:hover {
+ transition: background-image 0;
+ background-repeat: no-repeat;
+ background-color: transparent;
+ background-position: left center;
+ background-size: $nautilus_sidebar_size 28px;
+ background-image: -gtk-scaled(url("assets/sidebar-view-hover-#{$nautilus_sidebar_size}#{$asset_suffix}.png"),
+ url("assets/sidebar-view-hover-#{$nautilus_sidebar_size}#{$asset_suffix}@2.png"));
}
+ &:active, &:active:hover {
+ transition: background-image ease-out 200ms;
+ background-repeat: no-repeat;
+ background-color: transparent;
+ background-position: left center;
+ background-size: $nautilus_sidebar_size 28px;
+ background-image: -gtk-scaled(url("assets/sidebar-view-active-#{$nautilus_sidebar_size}#{$asset_suffix}.png"),
+ url("assets/sidebar-view-active-#{$nautilus_sidebar_size}#{$asset_suffix}@2.png"));
+ }
+
+ &:selected.has-open-popup,
+ &:selected, &:selected:hover {
+ color: $fg_color;
+ transition: background-image ease-out 200ms;
+ background-repeat: no-repeat;
+ background-position: left center;
+ background-size: $nautilus_sidebar_size 28px;
+ background-color: transparent;
+ background-image: -gtk-scaled(url("assets/sidebar-view-checked-#{$nautilus_sidebar_size}#{$asset_suffix}.png"),
+ url("assets/sidebar-view-checked-#{$nautilus_sidebar_size}#{$asset_suffix}@2.png"));
+
+ &, label { color: $fg_color; }
+ }
+ }
+
+ @else {
+ border-radius: $bt_radius;
+ margin: 0 6px;
+ padding: 2px 4px;
+
+ &:hover {
+ background-color: rgba($fg_color, 0.1);
+ }
+
+ &:active, &:active:hover {
+ transition: background-color ease-out 200ms;
+ background-color: rgba($fg_color, 0.2);
+ }
+
+ &:selected.has-open-popup,
+ &:selected, &:selected:hover {
+ color: $fg_color;
+ transition: background-color ease-out 200ms;
+ background-color: rgba($fg_color, 0.15);
+
+ &, label { color: $fg_color; }
+ }
+ }
+
// other
&.sidebar-new-bookmark-row {
color: $selected_bg_color;
@@ -236,17 +287,17 @@ dialog.background.csd {
> headerbar {
&.titlebar {
- border-image: image($header_border) 0 0 1 / 0px 0px 1px stretch;
+ // border-image: image($header_border) 0 0 1 / 0px 0px 1px stretch;
> label:not(.title):not(.subtitle) { // wallpaper set dialog
font-weight: 700;
}
- &:not(.default-decoration) {
- border-image: $dialog_header_borders_image 0 0 1 / 0px 0px 1px stretch;
- background-image: $dialog_header_image;
- background-color: transparent;
- }
+ // &:not(.default-decoration) {
+ // border-image: $dialog_header_borders_image 0 0 1 / 0px 0px 1px stretch;
+ // background-image: $dialog_header_image;
+ // background-color: transparent;
+ // }
}
}
@@ -375,6 +426,8 @@ dialog.background.csd {
background-image: $nautilus_actionbar_image;
border-image: $nautilus_actionbar_borders_image 1 0 0 / 1px 0px 0px stretch;
color: $dark_sidebar_fg;
+ border-radius: 0 0 $wm_radius 0;
+
label, combobox { color: $dark_sidebar_fg; }
}
@@ -412,23 +465,37 @@ dialog.background.csd {
background-color: transparent;
box-shadow: inset 0 1px rgba(white, 0.1);
background-image: $nautilus_header_image;
- border-image: $nautilus_header_borders_image 0 0 1 / 0px 0px 1px stretch;
+ border: none;
- > box.left.horizontal {
- background-image: transparent;
+ @if $nautilus_style != 'stable' { border-image: $nautilus_header_borders_image 0 0 1 / 0px 0px 1px stretch; }
+
+ @if $nautilus_style == 'stable' and $trans == 'false' {
+ > box.left.horizontal {
+ background-image: linear-gradient(0deg, $dark_sidebar_bg 0%, $dark_sidebar_bg 95%, transparent 95%, transparent 100%);
+ }
}
- @if $nautilus_style == 'default' {
+ @if $nautilus_style == 'default' or $nautilus_style == 'stable' {
> .linked.raised > button:first-child { margin-left: $nautilus_sidebar_size - 80px; }
- } @else {
- > .linked.raised > button:first-child { margin-left: 0px }
- > .linked.raised > button:last-child { margin-right: 0px }
- //> .linked.raised > button:last-child { margin-right: $nautilus_sidebar_size - 80px }
}
+
+ // @else {
+ // > .linked.raised > button:first-child { margin-left: 0px }
+ // > .linked.raised > button:last-child { margin-right: 0px }
+ // }
}
placessidebar.sidebar {
border-bottom-left-radius: $wm_radius;
+
+ @if $nautilus_style == 'stable' {
+ // margin-bottom: $wm_radius;
+ background-image: if($trans == 'true', none, $nautilus_sidebar_image);
+ }
+
+ @else {
+ &.frame { border-right: 1px solid $nautilus_borders_color; }
+ }
}
}
@@ -474,8 +541,8 @@ dialog.background.csd {
> stack {
background-color: $base_color;
- &:dir(ltr) { border-radius: 0 0 ($wm_radius+2) 0 }
- &:dir(rtl) { border-radius: 0 0 0 ($wm_radius+2) }
+ // &:dir(ltr) { border-radius: 0 0 ($wm_radius+2) 0 }
+ // &:dir(rtl) { border-radius: 0 0 0 ($wm_radius+2) }
}
> stack:not(:only-child) {
@@ -519,6 +586,33 @@ dialog.background.csd {
placessidebar { border-bottom-left-radius: $maximized_radius; }
}
+ > grid.horizontal > paned.horizontal > separator,
+ > deck > box.vertical > paned.horizontal > separator { // Use paned separator to hide stack border-bottom-left-radius
+ border: none;
+ min-width: 2px;
+ min-height: 2px;
+ background-color: $base_color;
+ background-image: image($base_color);
+ background-size: $wm_radius $wm_radius;
+ background-position: bottom left;
+ background-repeat: no-repeat;
+
+ &:dir(ltr) { margin-left: -1px; }
+ &:dir(rtl) { margin-right: -1px; }
+
+ @if $nautilus_style == 'stable' {
+ &:dir(ltr) { margin-left: 2px; }
+ &:dir(rtl) { margin-right: 2px; }
+
+ &:hover {
+ background-image: image($solid_borders_color);
+ background-size: 2px 100px;
+ background-position: center center;
+ background-repeat: no-repeat;
+ }
+ }
+ }
+
@include color_sidebar();
}
diff --git a/src/sass/gtk/_common.scss b/src/sass/gtk/_common.scss
index 97d2c6c..0ced654 100644
--- a/src/sass/gtk/_common.scss
+++ b/src/sass/gtk/_common.scss
@@ -1313,6 +1313,10 @@ actionbar {
padding: 6px;
border-top: 1px solid $borders_color;
background-color: darken($bg_color, 3%);
+
+ .background.csd revealer > & {
+ border-radius: 0 0 $wm_radius $wm_radius;
+ }
}
//
@@ -3355,10 +3359,48 @@ messagedialog { // Message Dialog styling
}
}
+//
+// Filechooser
+//
+filechooser {
+ .csd & {
+ background-color: $base_color;
+ border-radius: 0 0 $wm_radius $wm_radius;
+
+ placessidebar.sidebar { background-color: transparent; }
+
+ stack.view {
+ background-color: transparent;
+
+ scrolledwindow {
+ background-color: transparent;
+ border-radius: 0 0 $wm_radius $wm_radius;
+
+ list { background-color: transparent; }
+
+ treeview.view {
+ @extend %view;
+ background-color: transparent;
+ }
+ }
+ }
+ }
+
+ > box.vertical > paned.horizontal > separator {
+ border: none;
+ min-width: 1px;
+ background-image: image(if($variant=='light', $solid_borders_color, $header_border));
+
+ &:dir(ltr) { margin-left: -1px; }
+ &:dir(rtl) { margin-right: -1px; }
+ }
+
+ #pathbarbox { border-bottom: 1px solid transparentize($borders_color, 0.5); }
+}
+
//
// Sidebar
//
-
%sidebar_left {
border-right: 1px solid $borders_color;
border-left-style: none;
@@ -3396,7 +3438,7 @@ messagedialog { // Message Dialog styling
}
}
- paned & { &.left, &.right, &.left:dir(rtl), &:dir(rtl), &:dir(ltr), & { border-style: none; }}
+ paned & { &.left, &.right, &.left:dir(rtl), &:dir(rtl), &:dir(ltr), & { border: none; }}
}
stacksidebar {