diff --git a/README.md b/README.md index 8d7ac72..aa2ec0a 100644 --- a/README.md +++ b/README.md @@ -40,8 +40,9 @@ Run the following commands in the terminal: -d, --dest DIR Specify destination directory (Default: $HOME/.themes) -n, --name NAME Specify theme name (Default: Lavanda) -t, --theme VARIANT Specify theme variant [standard|sea] (Default: all variants) --c, --color VARIANT... Specify color variant(s) [standard|light|dark] (Default: All variants) --s, --size VARIANT... Specify size variant [standard|compact] (Default: standard variant) +-c, --color VARIANT Specify color variant(s) [standard|light|dark] (Default: All variants) +-s, --size VARIANT Specify size variant [standard|compact] (Default: standard variant) +-i, --icon VARIANT Specify logo icon on nautilus [default|apple|manjaro|ubuntu|fedora|debian|arch|gnome|budgie|popos|gentoo|void|zorin|mxlinux|opensuse|tux] (Default: dot icon) -l, --libadwaita Link installed gtk-4.0 theme to config folder for all libadwaita app use this theme diff --git a/install.sh b/install.sh index 5b73995..9fd32d9 100755 --- a/install.sh +++ b/install.sh @@ -20,6 +20,8 @@ COLOR_VARIANTS=('' '-Light' '-Dark') SIZE_VARIANTS=('' '-Compact') THEME_VARIANTS=('' '-Sea') +icon='default' + if [[ "$(command -v gnome-shell)" ]]; then gnome-shell --version SHELL_VERSION="$(gnome-shell --version | cut -d ' ' -f 3 | cut -d . -f -1)" @@ -52,6 +54,8 @@ OPTIONS: -s, --size VARIANT Specify size variant [standard|compact] (Default: standard variant) + -i, --icon VARIANT Specify logo icon on nautilus [default|apple|manjaro|ubuntu|fedora|debian|arch|gnome|budgie|popos|gentoo|void|zorin|mxlinux|opensuse|tux] (Default: dot icon) + -l, --libadwaita Link installed gtk-4.0 theme to config folder for all libadwaita app use this theme -r, --remove, @@ -67,6 +71,7 @@ install() { local theme="${3}" local color="${4}" local size="${5}" + local icon="${6}" [[ "${color}" == '-Light' ]] && local ELSE_LIGHT="${color}" [[ "${color}" == '-Dark' ]] && local ELSE_DARK="${color}" @@ -100,6 +105,14 @@ install() { cp -r "${SRC_DIR}/assets/gnome-shell/assets${ELSE_DARK:-}/"*.svg "${THEME_DIR}/gnome-shell/assets" cp -r "${SRC_DIR}/assets/gnome-shell/theme-assets${theme}/"*.svg "${THEME_DIR}/gnome-shell/assets" + if [[ -f "${SRC_DIR}/assets/gnome-shell/activities${ELSE_DARK:-}/activities-${icon}.svg" ]] ; then + cp -r "${SRC_DIR}/assets/gnome-shell/activities${ELSE_DARK:-}/activities-${icon}.svg" "${THEME_DIR}/gnome-shell/assets/activities.svg" + cp -r "${SRC_DIR}/assets/gnome-shell/activities-Dark/activities-${icon}.svg" "${THEME_DIR}/gnome-shell/assets/activities-white.svg" + else + echo "${icon} icon not supported, default icon will install..." + cp -r "${SRC_DIR}/assets/gnome-shell/activities${ELSE_DARK:-}/activities-default.svg" "${THEME_DIR}/gnome-shell/assets/activities.svg" + fi + cd "${THEME_DIR}/gnome-shell" ln -s assets/no-events.svg no-events.svg ln -s assets/process-working.svg process-working.svg @@ -177,6 +190,11 @@ while [[ $# -gt 0 ]]; do name="${2}" shift 2 ;; + -i|--icon) + icon="${2}" + echo "Installing ${icon} icon on panel..." + shift 2 + ;; -r|--remove|-u|--uninstall) uninstall="true" shift @@ -359,7 +377,7 @@ install_theme() { for theme in "${themes[@]}"; do for color in "${colors[@]}"; do for size in "${sizes[@]}"; do - install "${dest:-$DEST_DIR}" "${_name:-$THEME_NAME}" "$theme" "$color" "$size" + install "${dest:-$DEST_DIR}" "${_name:-$THEME_NAME}" "$theme" "$color" "$size" "$icon" done done done diff --git a/src/assets/gnome-shell/activities-Dark/activities-apple.svg b/src/assets/gnome-shell/activities-Dark/activities-apple.svg new file mode 100644 index 0000000..4b0434a --- /dev/null +++ b/src/assets/gnome-shell/activities-Dark/activities-apple.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities-Dark/activities-arch.svg b/src/assets/gnome-shell/activities-Dark/activities-arch.svg new file mode 100644 index 0000000..13a90fa --- /dev/null +++ b/src/assets/gnome-shell/activities-Dark/activities-arch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities-Dark/activities-budgie.svg b/src/assets/gnome-shell/activities-Dark/activities-budgie.svg new file mode 100644 index 0000000..4607a11 --- /dev/null +++ b/src/assets/gnome-shell/activities-Dark/activities-budgie.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities-Dark/activities-debian.svg b/src/assets/gnome-shell/activities-Dark/activities-debian.svg new file mode 100644 index 0000000..4e71b89 --- /dev/null +++ b/src/assets/gnome-shell/activities-Dark/activities-debian.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities-Dark/activities-default.svg b/src/assets/gnome-shell/activities-Dark/activities-default.svg new file mode 100644 index 0000000..5544050 --- /dev/null +++ b/src/assets/gnome-shell/activities-Dark/activities-default.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities-Dark/activities-fedora.svg b/src/assets/gnome-shell/activities-Dark/activities-fedora.svg new file mode 100644 index 0000000..56db4ab --- /dev/null +++ b/src/assets/gnome-shell/activities-Dark/activities-fedora.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities-Dark/activities-gentoo.svg b/src/assets/gnome-shell/activities-Dark/activities-gentoo.svg new file mode 100644 index 0000000..054953b --- /dev/null +++ b/src/assets/gnome-shell/activities-Dark/activities-gentoo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities-Dark/activities-gnome.svg b/src/assets/gnome-shell/activities-Dark/activities-gnome.svg new file mode 100644 index 0000000..432f699 --- /dev/null +++ b/src/assets/gnome-shell/activities-Dark/activities-gnome.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities-Dark/activities-manjaro.svg b/src/assets/gnome-shell/activities-Dark/activities-manjaro.svg new file mode 100644 index 0000000..7abb1c6 --- /dev/null +++ b/src/assets/gnome-shell/activities-Dark/activities-manjaro.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities-Dark/activities-mxlinux.svg b/src/assets/gnome-shell/activities-Dark/activities-mxlinux.svg new file mode 100644 index 0000000..e2d4325 --- /dev/null +++ b/src/assets/gnome-shell/activities-Dark/activities-mxlinux.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities-Dark/activities-opensuse.svg b/src/assets/gnome-shell/activities-Dark/activities-opensuse.svg new file mode 100644 index 0000000..9d23176 --- /dev/null +++ b/src/assets/gnome-shell/activities-Dark/activities-opensuse.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities-Dark/activities-popos.svg b/src/assets/gnome-shell/activities-Dark/activities-popos.svg new file mode 100644 index 0000000..fbd7583 --- /dev/null +++ b/src/assets/gnome-shell/activities-Dark/activities-popos.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities-Dark/activities-tux.svg b/src/assets/gnome-shell/activities-Dark/activities-tux.svg new file mode 100644 index 0000000..93a5063 --- /dev/null +++ b/src/assets/gnome-shell/activities-Dark/activities-tux.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities-Dark/activities-ubuntu.svg b/src/assets/gnome-shell/activities-Dark/activities-ubuntu.svg new file mode 100644 index 0000000..3dbf455 --- /dev/null +++ b/src/assets/gnome-shell/activities-Dark/activities-ubuntu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities-Dark/activities-void.svg b/src/assets/gnome-shell/activities-Dark/activities-void.svg new file mode 100644 index 0000000..5f21009 --- /dev/null +++ b/src/assets/gnome-shell/activities-Dark/activities-void.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities-Dark/activities-zorin.svg b/src/assets/gnome-shell/activities-Dark/activities-zorin.svg new file mode 100644 index 0000000..938288b --- /dev/null +++ b/src/assets/gnome-shell/activities-Dark/activities-zorin.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities/activities-apple.svg b/src/assets/gnome-shell/activities/activities-apple.svg new file mode 100644 index 0000000..5744cbe --- /dev/null +++ b/src/assets/gnome-shell/activities/activities-apple.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities/activities-arch.svg b/src/assets/gnome-shell/activities/activities-arch.svg new file mode 100644 index 0000000..d72057e --- /dev/null +++ b/src/assets/gnome-shell/activities/activities-arch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities/activities-budgie.svg b/src/assets/gnome-shell/activities/activities-budgie.svg new file mode 100644 index 0000000..be802b1 --- /dev/null +++ b/src/assets/gnome-shell/activities/activities-budgie.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities/activities-debian.svg b/src/assets/gnome-shell/activities/activities-debian.svg new file mode 100644 index 0000000..0ca92c2 --- /dev/null +++ b/src/assets/gnome-shell/activities/activities-debian.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities/activities-default.svg b/src/assets/gnome-shell/activities/activities-default.svg new file mode 100644 index 0000000..fe71393 --- /dev/null +++ b/src/assets/gnome-shell/activities/activities-default.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities/activities-fedora.svg b/src/assets/gnome-shell/activities/activities-fedora.svg new file mode 100644 index 0000000..892fa39 --- /dev/null +++ b/src/assets/gnome-shell/activities/activities-fedora.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities/activities-gentoo.svg b/src/assets/gnome-shell/activities/activities-gentoo.svg new file mode 100644 index 0000000..44f01c0 --- /dev/null +++ b/src/assets/gnome-shell/activities/activities-gentoo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities/activities-gnome.svg b/src/assets/gnome-shell/activities/activities-gnome.svg new file mode 100644 index 0000000..6db5783 --- /dev/null +++ b/src/assets/gnome-shell/activities/activities-gnome.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities/activities-manjaro.svg b/src/assets/gnome-shell/activities/activities-manjaro.svg new file mode 100644 index 0000000..08768c7 --- /dev/null +++ b/src/assets/gnome-shell/activities/activities-manjaro.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities/activities-mxlinux.svg b/src/assets/gnome-shell/activities/activities-mxlinux.svg new file mode 100644 index 0000000..d8181f5 --- /dev/null +++ b/src/assets/gnome-shell/activities/activities-mxlinux.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities/activities-opensuse.svg b/src/assets/gnome-shell/activities/activities-opensuse.svg new file mode 100644 index 0000000..0c57983 --- /dev/null +++ b/src/assets/gnome-shell/activities/activities-opensuse.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities/activities-popos.svg b/src/assets/gnome-shell/activities/activities-popos.svg new file mode 100644 index 0000000..6950acb --- /dev/null +++ b/src/assets/gnome-shell/activities/activities-popos.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities/activities-tux.svg b/src/assets/gnome-shell/activities/activities-tux.svg new file mode 100644 index 0000000..5f07b5b --- /dev/null +++ b/src/assets/gnome-shell/activities/activities-tux.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities/activities-ubuntu.svg b/src/assets/gnome-shell/activities/activities-ubuntu.svg new file mode 100644 index 0000000..36bfa05 --- /dev/null +++ b/src/assets/gnome-shell/activities/activities-ubuntu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities/activities-void.svg b/src/assets/gnome-shell/activities/activities-void.svg new file mode 100644 index 0000000..4cca2a2 --- /dev/null +++ b/src/assets/gnome-shell/activities/activities-void.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/gnome-shell/activities/activities-zorin.svg b/src/assets/gnome-shell/activities/activities-zorin.svg new file mode 100644 index 0000000..64114fa --- /dev/null +++ b/src/assets/gnome-shell/activities/activities-zorin.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/sass/gnome-shell/common/_panel.scss b/src/sass/gnome-shell/common/_panel.scss index 3cb5c44..f6134f6 100644 --- a/src/sass/gnome-shell/common/_panel.scss +++ b/src/sass/gnome-shell/common/_panel.scss @@ -132,9 +132,32 @@ // dimensions of the icon are hardcoded } - // &#panelActivities { - // -natural-hpadding: $base_padding * 3; - // } + &#panelActivities { // Activities button + -natural-hpadding: $base_padding * 3; + background-image: url("assets/activities.svg"); + background-position: center center; + background-size: 24px 24px; + width: 24px; + height: 24px; + background-gradient-direction: none; + font-size: 0; + + > * { width: 24px; } + + &, &:active, &:overview, &:focus, &:checked { + color: transparent; + } + + &:overview { + background-color: transparent; + } + + @if $variant == 'light' { + &:overview { + background-image: url("assets/activities-white.svg"); + } + } + } } // transparent panel on lock & login screens