diff --git a/README.md b/README.md index 16642ce..6fca6f1 100644 --- a/README.md +++ b/README.md @@ -91,41 +91,47 @@ Usage: `./install.sh [OPTIONS...]` -b, --background [default|blank|IMAGE_PATH] Set gnome-shell background image. Default is BigSur-like wallpaper - -m, --monterey - Set to MacOS Monterey style. + -m, --monterey + Set to MacOS Monterey style. + + -l, --libadwaita + Install gtk-4.0 theme into config for libadwaita. -N, --nautilus-style [stable|normal|mojave|glassy] Set Nautilus style. Default is BigSur-like style (stabled sidebar) - -HD, --highdefinition + -HD, --highdefinition Set to High Definition size. Default is laptop size - --normal, --normalshowapps + --normal, --normalshowapps Set gnome-shell show apps button style to normal. Default is bigsur - --round, --roundedmaxwindow + --round, --roundedmaxwindow Set maximized window to rounded. Default is square - --right, --rightplacement + --right, --rightplacement Set Nautilus titlebutton placement to right. Default is left - --black, --blackfont + --black, --blackfont Set panel font color to black. Default is white - --darker, --darkercolor - Install darker 'WhiteSur' dark themes. + --darker, --darkercolor + Install darker 'WhiteSur' dark themes. - --dialog, --interactive - Run this installer interactively, with dialogs. + --nord, --nordcolor + Install 'WhiteSur' Nord ColorScheme themes. - --silent-mode - Meant for developers: ignore any confirm prompt and params become more strict. + --dialog, --interactive + Run this installer interactively, with dialogs. - -r, --remove, -u, --uninstall - Remove all installed WhiteSur themes. + --silent-mode + Meant for developers: ignore any confirm prompt and params become more strict. - -h, --help - Show this help. + -r, --remove, -u, --uninstall + Remove all installed WhiteSur themes. + + -h, --help + Show this help. ``` @@ -168,7 +174,7 @@ Example: `./install.sh -s 220` Parameter: `--icon` `-i` Example: `./install.sh -i fedora` - + Note that you will need to enable the GNOME user-themes extension to change the shell theme (not to confuse with the application theme). @@ -249,19 +255,19 @@ Usage: `./tweaks.sh [OPTIONS...]` --darker, --darkercolor Install darker 'WhiteSur' dark themes. - --nord, --nordcolor + --nord, --nordcolor Install 'WhiteSur' Nord ColorScheme themes. - --dialog, --interactive + --dialog, --interactive Run this installer interactively, with dialogs. - --silent-mode + --silent-mode Meant for developers: ignore any confirm prompt and params become more strict. -r, --remove, -u, --uninstall Remove all installed WhiteSur themes. - -h, --help + -h, --help Show this help. ``` diff --git a/install.sh b/install.sh index 881773c..1dc5340 100755 --- a/install.sh +++ b/install.sh @@ -34,7 +34,8 @@ usage() { helpify "-s, --size" "[$(IFS='|'; echo "${SIDEBAR_SIZE_VARIANTS[*]}")]" "Set Nautilus sidebar minimum width" "Default is 200px" helpify "-i, --icon" "[$(IFS='|'; echo "${ICON_VARIANTS[*]}")]" "Set 'Activities' icon" "Default is 'standard'" helpify "-b, --background" "[default|blank|IMAGE_PATH]" "Set gnome-shell background image" "Default is BigSur-like wallpaper" - helpify "-m, --monterey" "" "Set to MacOS Monterey style" + helpify "-m, --monterey" "" "Set to MacOS Monterey style" "" + helpify "-l, --libadwaita" "" "Install gtk-4.0 theme into config for libadwaita" "" helpify "-N, --nautilus-style" "[$(IFS='|'; echo "${NAUTILUS_STYLE_VARIANTS[*]}")]" "Set Nautilus style" "Default is BigSur-like style (stabled sidebar)" helpify "-HD, --highdefinition" "" "Set to High Definition size" "Default is laptop size" helpify "--normal, --normalshowapps" "" "Set gnome-shell show apps button style to normal" "Default is bigsur" @@ -91,6 +92,8 @@ while [[ $# -gt 0 ]]; do compact="false"; shift ;; -m|--monterey) monterey="true"; shift ;; + -l|--libadwaita) + libadwaita="true"; shift ;; # Parameters that require value, single use -b|--background) check_param "${1}" "${1}" "${2}" "must" "must" "must" "false" && shift 2 || shift ;; @@ -146,12 +149,13 @@ else show_needed_dialogs fi - prompt -w "Removing the old '${name}${colorscheme}' themes... \n" + prompt -w "Removing the old '${name}${colorscheme}' themes..." remove_themes; customize_theme; avoid_variant_duplicates; echo - prompt -i "Installing '${name}${colorscheme}' themes in '${dest}'..." - prompt -i "--->>> GTK | GNOME Shell | Cinnamon | Metacity | XFWM | Plank <<<---" + prompt -w "Installing '${name}${colorscheme}' themes in '${dest}'..."; echo + + prompt -t "--->>> GTK | GNOME Shell | Cinnamon | Metacity | XFWM | Plank <<<---" prompt -i "Color variants : $( IFS=';'; echo "${colors[*]}" )" prompt -i "Theme variants : $( IFS=';'; echo "${themes[*]}" )" prompt -i "Opacity variants : $( IFS=';'; echo "${opacities[*]}" )" @@ -161,14 +165,17 @@ else echo; install_themes; echo; prompt -s "Done!" - # rm -rf "${THEME_SRC_DIR}/sass/_gtk-base-temp.scss" + if [[ "${libadwaita}" == 'true' ]]; then + install_libadwaita + echo; prompt -w "Installed gtk-4.0 into config for libadwaita!" + fi if (is_running "xfce4-session"); then msg="XFCE: you may need to run 'xfce4-panel -r' after changing your theme to fix your panel opacity." elif (is_my_distro "solus") && (is_running "gnome-session"); then msg="GNOME: you may need to disable 'User Themes' extension to fix your dock." -# elif (is_running "gnome-session") && [[ "${GNOME_VERSION}" == "old" ]]; then -# msg="GNOME: you may need to disable 'User Themes' extension to fix your logout and authentication dialog." + # elif (is_running "gnome-session") && [[ "${GNOME_VERSION}" == "3-28" ]]; then + # msg="GNOME: you may need to disable 'User Themes' extension to fix your logout and authentication dialog." fi if [[ "${msg}" ]]; then diff --git a/lib-core.sh b/lib-core.sh index eef745b..1a9ecaf 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -25,10 +25,13 @@ MY_USERNAME="${SUDO_USER:-$(logname 2> /dev/null || echo "${USER}")}" MY_HOME=$(getent passwd "${MY_USERNAME}" | cut -d: -f6) if command -v gnome-shell &> /dev/null; then - if (( $(gnome-shell --version | cut -d ' ' -f 3 | cut -d . -f 1) >= 4 )); then - GNOME_VERSION="new" + SHELL_VERSION="$(gnome-shell --version | cut -d ' ' -f 3 | cut -d . -f -1)" + if [[ "${SHELL_VERSION:-}" -ge "42" ]]; then + GNOME_VERSION="42-0" + elif [[ "${SHELL_VERSION:-}" -ge "40" ]]; then + GNOME_VERSION="40-0" else - GNOME_VERSION="old" + GNOME_VERSION="3-28" fi else GNOME_VERSION="none" @@ -228,6 +231,8 @@ prompt() { echo -e " ${c_yellow}${2}${c_default}" ;; # print warning message "-i") echo -e " ${c_cyan}${2}${c_default}" ;; # print info message + "-t") + echo -e " ${c_magenta}${2}${c_default}" ;; # print title message esac } @@ -312,6 +317,10 @@ signal_error() { prompt -e "GNOME : ${GNOME_VERSION}" prompt -e "REPO : ${repo_ver}\n" + if [[ $(grep -ril "repository" "${WHITESUR_TMP_DIR}/error_log.txt") = "error_log.txt" ]]; then + prompt -i "HINT: You can run: 'sudo apt install sassc libglib2.0-dev libxml2-utils' on ubuntu 18.04 or 'sudo apt install sassc libglib2.0-dev-bin' on ubuntu >= 20.04 \n" + fi + prompt -i "HINT: You can google or report to us the info above \n" prompt -i "https://github.com/vinceliuice/WhiteSur-gtk-theme/issues \n" diff --git a/lib-install.sh b/lib-install.sh index 19e8d16..edcc4fb 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -356,12 +356,7 @@ install_shelly() { mkdir -p "${TARGET_DIR}/assets" cp -r "${THEME_SRC_DIR}/assets/gnome-shell/icons" "${TARGET_DIR}" cp -r "${THEME_SRC_DIR}/main/gnome-shell/pad-osd.css" "${TARGET_DIR}" - - if [[ "${GNOME_VERSION}" == 'new' ]]; then - sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gnome-shell/shell-40-0/gnome-shell${color}.scss" "${TARGET_DIR}/gnome-shell.css" - else - sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gnome-shell/shell-3-28/gnome-shell${color}.scss" "${TARGET_DIR}/gnome-shell.css" - fi + sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gnome-shell/shell-${GNOME_VERSION}/gnome-shell${color}.scss" "${TARGET_DIR}/gnome-shell.css" cp -r "${THEME_SRC_DIR}/assets/gnome-shell/common-assets/"*".svg" "${TARGET_DIR}/assets" cp -r "${THEME_SRC_DIR}/assets/gnome-shell/assets${color}/"*".svg" "${TARGET_DIR}/assets" @@ -387,7 +382,6 @@ install_theemy() { local opacity="$(destify ${2})" local alt="$(destify ${3})" local theme="$(destify ${4})" - local icon="$(destify ${5})" if [[ "${color}" == '-light' ]]; then local iconcolor='' @@ -428,7 +422,7 @@ install_theemy() { sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-3.0/gtk-dark.scss" "${TMP_DIR_T}/gtk-dark.css" mkdir -p "${TARGET_DIR}/gtk-3.0" - cp -r "${THEME_SRC_DIR}/assets/gtk/thumbnails/thumbnail${color}${theme}.png" "${TARGET_DIR}/gtk-3.0/thumbnail.png" + cp -r "${THEME_SRC_DIR}/assets/gtk/thumbnails/thumbnail${color}${theme}${colorscheme}.png" "${TARGET_DIR}/gtk-3.0/thumbnail.png" echo '@import url("resource:///org/gnome/theme/gtk.css");' > "${TARGET_DIR}/gtk-3.0/gtk.css" echo '@import url("resource:///org/gnome/theme/gtk-dark.css");' > "${TARGET_DIR}/gtk-3.0/gtk-dark.css" glib-compile-resources --sourcedir="${TMP_DIR_T}" --target="${TARGET_DIR}/gtk-3.0/gtk.gresource" "${THEME_SRC_DIR}/main/gtk-3.0/gtk.gresource.xml" @@ -443,20 +437,11 @@ install_theemy() { sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-4.0/gtk-dark.scss" "${TMP_DIR_F}/gtk-dark.css" mkdir -p "${TARGET_DIR}/gtk-4.0" - cp -r "${THEME_SRC_DIR}/assets/gtk/thumbnails/thumbnail${color}${theme}.png" "${TARGET_DIR}/gtk-4.0/thumbnail.png" + cp -r "${THEME_SRC_DIR}/assets/gtk/thumbnails/thumbnail${color}${theme}${colorscheme}.png" "${TARGET_DIR}/gtk-4.0/thumbnail.png" echo '@import url("resource:///org/gnome/theme/gtk.css");' > "${TARGET_DIR}/gtk-4.0/gtk.css" echo '@import url("resource:///org/gnome/theme/gtk-dark.css");' > "${TARGET_DIR}/gtk-4.0/gtk-dark.css" glib-compile-resources --sourcedir="${TMP_DIR_F}" --target="${TARGET_DIR}/gtk-4.0/gtk.gresource" "${THEME_SRC_DIR}/main/gtk-4.0/gtk.gresource.xml" - # link gtk4.0 for libadwaita - mkdir -p "${HOME}/.config/gtk-4.0" - rm -rf "${HOME}/.config/gtk-4.0/"{gtk.css,gtk-dark.css,assets,windows-assets} - cp -rf "${TMP_DIR_T}/assets" "${HOME}/.config/gtk-4.0" - cp -rf "${TMP_DIR_T}/windows-assets" "${HOME}/.config/gtk-4.0" - - sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-4.0/gtk${color}.scss" "${HOME}/.config/gtk-4.0/gtk.css" - sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-4.0/gtk-dark.scss" "${HOME}/.config/gtk-4.0/gtk-dark.css" - #----------------Cinnamon-----------------# mkdir -p "${TARGET_DIR}/cinnamon" @@ -464,7 +449,7 @@ install_theemy() { cp -r "${THEME_SRC_DIR}/assets/cinnamon/common-assets" "${TARGET_DIR}/cinnamon/assets" cp -r "${THEME_SRC_DIR}/assets/cinnamon/assets${color}${colorscheme}/"*".svg" "${TARGET_DIR}/cinnamon/assets" cp -r "${THEME_SRC_DIR}/assets/cinnamon/theme${theme}${colorscheme}/"*".svg" "${TARGET_DIR}/cinnamon/assets" - cp -r "${THEME_SRC_DIR}/assets/cinnamon/thumbnails/thumbnail${color}${theme}.png" "${TARGET_DIR}/cinnamon/thumbnail.png" + cp -r "${THEME_SRC_DIR}/assets/cinnamon/thumbnails/thumbnail${color}${theme}${colorscheme}.png" "${TARGET_DIR}/cinnamon/thumbnail.png" #----------------Misc------------------# @@ -478,8 +463,8 @@ install_theemy() { mkdir -p "${TARGET_DIR}/metacity-1" cp -r "${THEME_SRC_DIR}/main/metacity-1/metacity-theme${color}.xml" "${TARGET_DIR}/metacity-1/metacity-theme-1.xml" cp -r "${THEME_SRC_DIR}/main/metacity-1/metacity-theme-3.xml" "${TARGET_DIR}/metacity-1" - cp -r "${THEME_SRC_DIR}/assets/metacity-1/titlebuttons${color}" "${TARGET_DIR}/metacity-1/titlebuttons" - cp -r "${THEME_SRC_DIR}/assets/metacity-1/thumbnail${color}.png" "${TARGET_DIR}/metacity-1/thumbnail.png" + cp -r "${THEME_SRC_DIR}/assets/metacity-1/titlebuttons${color}${colorscheme}" "${TARGET_DIR}/metacity-1/titlebuttons" + cp -r "${THEME_SRC_DIR}/assets/metacity-1/thumbnail${color}${colorscheme}.png" "${TARGET_DIR}/metacity-1/thumbnail.png" ( cd "${TARGET_DIR}/metacity-1" && ln -s "metacity-theme-1.xml" "metacity-theme-2.xml" ) mkdir -p "${TARGET_DIR}/plank" @@ -497,6 +482,23 @@ remove_packy() { # rm -rf "${dest}/${name}$(destify ${1})-mdpi" } +config_gtk4() { + local color="$(destify ${1})" + local alt="$(destify ${2})" + + local TARGET_DIR="${HOME}/.config/gtk-4.0" + + # Install gtk4.0 into config for libadwaita + mkdir -p "${TARGET_DIR}" + rm -rf "${TARGET_DIR}/"{gtk.css,gtk-dark.css,assets,windows-assets} + sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-4.0/gtk${color}.scss" "${TARGET_DIR}/gtk.css" + sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-4.0/gtk-dark.scss" "${TARGET_DIR}/gtk-dark.css" + cp -r "${THEME_SRC_DIR}/assets/gtk/common-assets/assets" "${TARGET_DIR}" + cp -r "${THEME_SRC_DIR}/assets/gtk/common-assets/sidebar-assets/"*".png" "${TARGET_DIR}/assets" + cp -r "${THEME_SRC_DIR}/assets/gtk/scalable" "${TARGET_DIR}/assets" + cp -r "${THEME_SRC_DIR}/assets/gtk/windows-assets/titlebutton${alt}${colorscheme}" "${TARGET_DIR}/windows-assets" +} + ############################################################################### # THEMES # ############################################################################### @@ -512,7 +514,7 @@ install_themes() { for theme in "${themes[@]}"; do for color in "${colors[@]}"; do gtk_base "${color}" "${opacity}" "${theme}" "${compact}" - install_theemy "${color}" "${opacity}" "${alt}" "${theme}" "${icon}" + install_theemy "${color}" "${opacity}" "${alt}" "${theme}" install_shelly "${color}" "${opacity}" "${alt}" "${theme}" "${icon}" install_xfwmy "${color}" done @@ -523,6 +525,11 @@ install_themes() { stop_animation } +install_libadwaita() { + gtk_base "${colors[0]}" "${opacities[0]}" "${themes[0]}" "${compact[0]}" + config_gtk4 "${colors[0]}" "${alt[0]}" +} + remove_themes() { process_ids=() @@ -701,7 +708,7 @@ install_dash_to_dock_theme() { udoify_file "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" if [[ "${GNOME_VERSION}" == 'new' ]]; then udo sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet-4.scss" "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" - else + else udo sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet-3.scss" "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" fi elif [[ -d "${DASH_TO_DOCK_DIR_ROOT}" ]]; then diff --git a/src/assets/cinnamon/thumbnails/make-thumbnails.sh b/src/assets/cinnamon/thumbnails/make-thumbnails.sh new file mode 100755 index 0000000..6fd7f8c --- /dev/null +++ b/src/assets/cinnamon/thumbnails/make-thumbnails.sh @@ -0,0 +1,88 @@ +#! /usr/bin/env bash + +for theme in '' '-blue' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-grey'; do + for type in '' '-nord'; do + case "$theme" in + '') + theme_color='#0860f2' + ;; + -blue) + theme_color='#2E7CF7' + ;; + -purple) + theme_color='#9A57A3' + ;; + -pink) + theme_color='#E55E9C' + ;; + -red) + theme_color='#ED5F5D' + ;; + -orange) + theme_color='#E9873A' + ;; + -yellow) + theme_color='#F3BA4B' + ;; + -green) + theme_color='#79B757' + ;; + -grey) + theme_color='#8C8C8C' + ;; + esac + + if [[ "$type" == '-nord' ]]; then + menu_light='#fbfcfd' + menu_dark='#2b303b' + + case "$theme" in + '') + theme_color='#5271ad' + ;; + -blue) + theme_color='#4c7bd9' + ;; + -purple) + theme_color='#b57daa' + ;; + -pink) + theme_color='#cd7092' + ;; + -red) + theme_color='#c35b65' + ;; + -orange) + theme_color='#d0846c' + ;; + -yellow) + theme_color='#e4b558' + ;; + -green) + theme_color='#82ac5d' + ;; + -grey) + theme_color='#8999a9' + ;; + esac + fi + + if [[ "$type" != '' ]]; then + rm -rf "thumbnail${theme}${type}.svg" + cp -rf "thumbnail.svg" "thumbnail${theme}${type}.svg" + sed -i "s/#0860f2/${theme_color}/g" "thumbnail${theme}${type}.svg" + sed -i "s/#ffffff/${menu_light}/g" "thumbnail${theme}${type}.svg" + sed -i "s/#333333/${menu_dark}/g" "thumbnail${theme}${type}.svg" + sed -i "s/thumbnail-light/thumbnail-light${theme}${type}/g" "thumbnail${theme}${type}.svg" + sed -i "s/thumbnail-dark/thumbnail-dark${theme}${type}/g" "thumbnail${theme}${type}.svg" + elif [[ "$theme" != '' ]]; then + rm -rf "thumbnail${theme}.svg" + cp -rf "thumbnail.svg" "thumbnail${theme}.svg" + sed -i "s/#0860f2/${theme_color}/g" "thumbnail${theme}.svg" + sed -i "s/thumbnail-light/thumbnail-light${theme}/g" "thumbnail${theme}.svg" + sed -i "s/thumbnail-dark/thumbnail-dark${theme}/g" "thumbnail${theme}.svg" + fi + done +done + +echo -e "DONE!" diff --git a/src/assets/cinnamon/thumbnails/render-thumbnails.sh b/src/assets/cinnamon/thumbnails/render-thumbnails.sh index d6aee08..79584b4 100755 --- a/src/assets/cinnamon/thumbnails/render-thumbnails.sh +++ b/src/assets/cinnamon/thumbnails/render-thumbnails.sh @@ -3,19 +3,31 @@ INKSCAPE="/usr/bin/inkscape" OPTIPNG="/usr/bin/optipng" -SRC_FILE="thumbnail.svg" +./make-thumbnails.sh for theme in '' '-blue' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-grey'; do - [[ -f thumbnail-light${theme}.png ]] && rm -rf thumbnail-light${theme}.png - echo Rendering thumbnail-light${theme}.png + for type in '' '-nord'; do + SRC_FILE="thumbnail${theme}${type}.svg" + for color in '-light' '-dark'; do + echo + echo Rendering thumbnail${color}${theme}${type}.png + $INKSCAPE --export-id=thumbnail${color}${theme}${type} \ + --export-id-only \ + --export-dpi=192 \ + --export-filename=thumbnail${color}${theme}${type}.png $SRC_FILE >/dev/null \ + && $OPTIPNG -o7 --quiet thumbnail${color}${theme}${type}.png + done + done + done - $INKSCAPE --export-id=thumbnail-light${theme} --export-id-only --export-filename=thumbnail-light${theme}.png $SRC_FILE >/dev/null - $OPTIPNG -o7 --quiet thumbnail-light${theme}.png - - [[ -f thumbnail-dark${theme}.png ]] && rm -rf thumbnail-dark${theme}.png - echo Rendering thumbnail-dark${theme}.png - $INKSCAPE --export-id=thumbnail-dark${theme} --export-id-only --export-filename=thumbnail-dark${theme}.png $SRC_FILE >/dev/null - $OPTIPNG -o7 --quiet thumbnail-dark${theme}.png +for theme in '' '-blue' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-grey'; do + for type in '' '-nord'; do + if [[ ${theme} == '' && ${type} == '' ]]; then + echo "keep thumbnail.svg" + else + rm -rf "thumbnail${theme}${type}.svg" + fi + done done exit 0 diff --git a/src/assets/cinnamon/thumbnails/thumbnail-dark-blue-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-dark-blue-nord.png new file mode 100644 index 0000000..b418651 Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-dark-blue-nord.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-dark-blue.png b/src/assets/cinnamon/thumbnails/thumbnail-dark-blue.png index e45d372..a83832f 100644 Binary files a/src/assets/cinnamon/thumbnails/thumbnail-dark-blue.png and b/src/assets/cinnamon/thumbnails/thumbnail-dark-blue.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-dark-green-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-dark-green-nord.png new file mode 100644 index 0000000..43aabec Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-dark-green-nord.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-dark-green.png b/src/assets/cinnamon/thumbnails/thumbnail-dark-green.png index afd1971..31e9efe 100644 Binary files a/src/assets/cinnamon/thumbnails/thumbnail-dark-green.png and b/src/assets/cinnamon/thumbnails/thumbnail-dark-green.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-dark-grey-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-dark-grey-nord.png new file mode 100644 index 0000000..3814e3f Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-dark-grey-nord.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-dark-grey.png b/src/assets/cinnamon/thumbnails/thumbnail-dark-grey.png index 2b13a01..fc30458 100644 Binary files a/src/assets/cinnamon/thumbnails/thumbnail-dark-grey.png and b/src/assets/cinnamon/thumbnails/thumbnail-dark-grey.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-dark-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-dark-nord.png new file mode 100644 index 0000000..2cb6441 Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-dark-nord.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-dark-orange-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-dark-orange-nord.png new file mode 100644 index 0000000..ada3031 Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-dark-orange-nord.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-dark-orange.png b/src/assets/cinnamon/thumbnails/thumbnail-dark-orange.png index 9dc33f9..fdf6985 100644 Binary files a/src/assets/cinnamon/thumbnails/thumbnail-dark-orange.png and b/src/assets/cinnamon/thumbnails/thumbnail-dark-orange.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-dark-pink-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-dark-pink-nord.png new file mode 100644 index 0000000..e0f87b1 Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-dark-pink-nord.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-dark-pink.png b/src/assets/cinnamon/thumbnails/thumbnail-dark-pink.png index c864066..c6315e4 100644 Binary files a/src/assets/cinnamon/thumbnails/thumbnail-dark-pink.png and b/src/assets/cinnamon/thumbnails/thumbnail-dark-pink.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-dark-purple-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-dark-purple-nord.png new file mode 100644 index 0000000..69bc35e Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-dark-purple-nord.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-dark-purple.png b/src/assets/cinnamon/thumbnails/thumbnail-dark-purple.png index f32f51b..5a4cced 100644 Binary files a/src/assets/cinnamon/thumbnails/thumbnail-dark-purple.png and b/src/assets/cinnamon/thumbnails/thumbnail-dark-purple.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-dark-red-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-dark-red-nord.png new file mode 100644 index 0000000..4dc9d9c Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-dark-red-nord.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-dark-red.png b/src/assets/cinnamon/thumbnails/thumbnail-dark-red.png index c264808..aea8b88 100644 Binary files a/src/assets/cinnamon/thumbnails/thumbnail-dark-red.png and b/src/assets/cinnamon/thumbnails/thumbnail-dark-red.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-dark-yellow-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-dark-yellow-nord.png new file mode 100644 index 0000000..8faddb3 Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-dark-yellow-nord.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-dark-yellow.png b/src/assets/cinnamon/thumbnails/thumbnail-dark-yellow.png index 11d6449..5fa1b6d 100644 Binary files a/src/assets/cinnamon/thumbnails/thumbnail-dark-yellow.png and b/src/assets/cinnamon/thumbnails/thumbnail-dark-yellow.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-dark.png index 4574fea..3e1b9c5 100644 Binary files a/src/assets/cinnamon/thumbnails/thumbnail-dark.png and b/src/assets/cinnamon/thumbnails/thumbnail-dark.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-light-blue-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-light-blue-nord.png new file mode 100644 index 0000000..fce94c8 Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-light-blue-nord.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-light-blue.png b/src/assets/cinnamon/thumbnails/thumbnail-light-blue.png index 61feb67..d1f1698 100644 Binary files a/src/assets/cinnamon/thumbnails/thumbnail-light-blue.png and b/src/assets/cinnamon/thumbnails/thumbnail-light-blue.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-light-green-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-light-green-nord.png new file mode 100644 index 0000000..51e15eb Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-light-green-nord.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-light-green.png b/src/assets/cinnamon/thumbnails/thumbnail-light-green.png index e11afb1..efce64f 100644 Binary files a/src/assets/cinnamon/thumbnails/thumbnail-light-green.png and b/src/assets/cinnamon/thumbnails/thumbnail-light-green.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-light-grey-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-light-grey-nord.png new file mode 100644 index 0000000..61b060a Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-light-grey-nord.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-light-grey.png b/src/assets/cinnamon/thumbnails/thumbnail-light-grey.png index 8c92986..a6c6796 100644 Binary files a/src/assets/cinnamon/thumbnails/thumbnail-light-grey.png and b/src/assets/cinnamon/thumbnails/thumbnail-light-grey.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-light-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-light-nord.png new file mode 100644 index 0000000..c4cc907 Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-light-nord.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-light-orange-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-light-orange-nord.png new file mode 100644 index 0000000..de80738 Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-light-orange-nord.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-light-orange.png b/src/assets/cinnamon/thumbnails/thumbnail-light-orange.png index e775b50..11bed34 100644 Binary files a/src/assets/cinnamon/thumbnails/thumbnail-light-orange.png and b/src/assets/cinnamon/thumbnails/thumbnail-light-orange.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-light-pink-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-light-pink-nord.png new file mode 100644 index 0000000..5dbf755 Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-light-pink-nord.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-light-pink.png b/src/assets/cinnamon/thumbnails/thumbnail-light-pink.png index 69e0773..122218c 100644 Binary files a/src/assets/cinnamon/thumbnails/thumbnail-light-pink.png and b/src/assets/cinnamon/thumbnails/thumbnail-light-pink.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-light-purple-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-light-purple-nord.png new file mode 100644 index 0000000..8103f1f Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-light-purple-nord.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-light-purple.png b/src/assets/cinnamon/thumbnails/thumbnail-light-purple.png index c868554..46e93e8 100644 Binary files a/src/assets/cinnamon/thumbnails/thumbnail-light-purple.png and b/src/assets/cinnamon/thumbnails/thumbnail-light-purple.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-light-red-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-light-red-nord.png new file mode 100644 index 0000000..16ce5b3 Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-light-red-nord.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-light-red.png b/src/assets/cinnamon/thumbnails/thumbnail-light-red.png index f74d9df..ec7361b 100644 Binary files a/src/assets/cinnamon/thumbnails/thumbnail-light-red.png and b/src/assets/cinnamon/thumbnails/thumbnail-light-red.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-light-yellow-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-light-yellow-nord.png new file mode 100644 index 0000000..877e764 Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-light-yellow-nord.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-light-yellow.png b/src/assets/cinnamon/thumbnails/thumbnail-light-yellow.png index e46a4da..bc3a14d 100644 Binary files a/src/assets/cinnamon/thumbnails/thumbnail-light-yellow.png and b/src/assets/cinnamon/thumbnails/thumbnail-light-yellow.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail-light.png b/src/assets/cinnamon/thumbnails/thumbnail-light.png index f7522b0..8fab367 100644 Binary files a/src/assets/cinnamon/thumbnails/thumbnail-light.png and b/src/assets/cinnamon/thumbnails/thumbnail-light.png differ diff --git a/src/assets/cinnamon/thumbnails/thumbnail.svg b/src/assets/cinnamon/thumbnails/thumbnail.svg index 09d1889..2cde38d 100644 --- a/src/assets/cinnamon/thumbnails/thumbnail.svg +++ b/src/assets/cinnamon/thumbnails/thumbnail.svg @@ -1,5266 +1,1915 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + + - - - - + + + - - - - + + + + - - - - + + + - - - - + + + - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/gtk/thumbnails/make-thumbnails.sh b/src/assets/gtk/thumbnails/make-thumbnails.sh new file mode 100755 index 0000000..e6fbadc --- /dev/null +++ b/src/assets/gtk/thumbnails/make-thumbnails.sh @@ -0,0 +1,91 @@ +#! /usr/bin/env bash + +for theme in '' '-blue' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-grey'; do + for type in '' '-nord'; do + case "$theme" in + '') + theme_color='#0860f2' + ;; + -blue) + theme_color='#2E7CF7' + ;; + -purple) + theme_color='#9A57A3' + ;; + -pink) + theme_color='#E55E9C' + ;; + -red) + theme_color='#ED5F5D' + ;; + -orange) + theme_color='#E9873A' + ;; + -yellow) + theme_color='#F3BA4B' + ;; + -green) + theme_color='#79B757' + ;; + -grey) + theme_color='#8C8C8C' + ;; + esac + + if [[ "$type" == '-nord' ]]; then + background_light='#f3f4f6' + background_dark='#2b303b' + button_bg_light='#fbfcfd' + button_bg_dark='#556075' + case "$theme" in + '') + theme_color='#5271ad' + ;; + -blue) + theme_color='#4c7bd9' + ;; + -purple) + theme_color='#b57daa' + ;; + -pink) + theme_color='#cd7092' + ;; + -red) + theme_color='#c35b65' + ;; + -orange) + theme_color='#d0846c' + ;; + -yellow) + theme_color='#e4b558' + ;; + -green) + theme_color='#82ac5d' + ;; + -grey) + theme_color='#8999a9' + ;; + esac + fi + + if [[ "$type" != '' ]]; then + rm -rf "thumbnail${theme}${type}.svg" + cp -rf "thumbnail.svg" "thumbnail${theme}${type}.svg" + sed -i "s/#0860f2/${theme_color}/g" "thumbnail${theme}${type}.svg" + sed -i "s/#f5f5f5/${background_light}/g" "thumbnail${theme}${type}.svg" + sed -i "s/#333333/${background_dark}/g" "thumbnail${theme}${type}.svg" + sed -i "s/#ffffff/${button_bg_light}/g" "thumbnail${theme}${type}.svg" + sed -i "s/#656565/${button_bg_dark}/g" "thumbnail${theme}${type}.svg" + sed -i "s/thumbnail-light/thumbnail-light${theme}${type}/g" "thumbnail${theme}${type}.svg" + sed -i "s/thumbnail-dark/thumbnail-dark${theme}${type}/g" "thumbnail${theme}${type}.svg" + elif [[ "$theme" != '' ]]; then + rm -rf "thumbnail${theme}.svg" + cp -rf "thumbnail.svg" "thumbnail${theme}.svg" + sed -i "s/#0860f2/${theme_color}/g" "thumbnail${theme}.svg" + sed -i "s/thumbnail-light/thumbnail-light${theme}/g" "thumbnail${theme}.svg" + sed -i "s/thumbnail-dark/thumbnail-dark${theme}/g" "thumbnail${theme}.svg" + fi + done +done + +echo -e "DONE!" diff --git a/src/assets/gtk/thumbnails/render-thumbnails.sh b/src/assets/gtk/thumbnails/render-thumbnails.sh index d6aee08..d2fc856 100755 --- a/src/assets/gtk/thumbnails/render-thumbnails.sh +++ b/src/assets/gtk/thumbnails/render-thumbnails.sh @@ -3,19 +3,31 @@ INKSCAPE="/usr/bin/inkscape" OPTIPNG="/usr/bin/optipng" -SRC_FILE="thumbnail.svg" +./make-thumbnails.sh for theme in '' '-blue' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-grey'; do - [[ -f thumbnail-light${theme}.png ]] && rm -rf thumbnail-light${theme}.png - echo Rendering thumbnail-light${theme}.png + for type in '' '-nord'; do + SRC_FILE="thumbnail${theme}${type}.svg" + for color in '-light' '-dark'; do + echo + echo Rendering thumbnail${color}${theme}${type}.png + $INKSCAPE --export-id=thumbnail${color}${theme}${type} \ + --export-id-only \ + --export-dpi=96 \ + --export-filename=thumbnail${color}${theme}${type}.png $SRC_FILE >/dev/null \ + && $OPTIPNG -o7 --quiet thumbnail${color}${theme}${type}.png + done + done + done - $INKSCAPE --export-id=thumbnail-light${theme} --export-id-only --export-filename=thumbnail-light${theme}.png $SRC_FILE >/dev/null - $OPTIPNG -o7 --quiet thumbnail-light${theme}.png - - [[ -f thumbnail-dark${theme}.png ]] && rm -rf thumbnail-dark${theme}.png - echo Rendering thumbnail-dark${theme}.png - $INKSCAPE --export-id=thumbnail-dark${theme} --export-id-only --export-filename=thumbnail-dark${theme}.png $SRC_FILE >/dev/null - $OPTIPNG -o7 --quiet thumbnail-dark${theme}.png +for theme in '' '-blue' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-grey'; do + for type in '' '-nord'; do + if [[ ${theme} == '' && ${type} == '' ]]; then + echo "keep thumbnail.svg" + else + rm -rf "thumbnail${theme}${type}.svg" + fi + done done exit 0 diff --git a/src/assets/gtk/thumbnails/thumbnail-dark-blue-nord.png b/src/assets/gtk/thumbnails/thumbnail-dark-blue-nord.png new file mode 100644 index 0000000..1b9ac13 Binary files /dev/null and b/src/assets/gtk/thumbnails/thumbnail-dark-blue-nord.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-dark-blue.png b/src/assets/gtk/thumbnails/thumbnail-dark-blue.png index b435e9a..712617b 100644 Binary files a/src/assets/gtk/thumbnails/thumbnail-dark-blue.png and b/src/assets/gtk/thumbnails/thumbnail-dark-blue.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-dark-green-nord.png b/src/assets/gtk/thumbnails/thumbnail-dark-green-nord.png new file mode 100644 index 0000000..e57239f Binary files /dev/null and b/src/assets/gtk/thumbnails/thumbnail-dark-green-nord.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-dark-green.png b/src/assets/gtk/thumbnails/thumbnail-dark-green.png index 132d729..3a7a81c 100644 Binary files a/src/assets/gtk/thumbnails/thumbnail-dark-green.png and b/src/assets/gtk/thumbnails/thumbnail-dark-green.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-dark-grey-nord.png b/src/assets/gtk/thumbnails/thumbnail-dark-grey-nord.png new file mode 100644 index 0000000..b5e92bd Binary files /dev/null and b/src/assets/gtk/thumbnails/thumbnail-dark-grey-nord.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-dark-grey.png b/src/assets/gtk/thumbnails/thumbnail-dark-grey.png index 697ff1a..27d3507 100644 Binary files a/src/assets/gtk/thumbnails/thumbnail-dark-grey.png and b/src/assets/gtk/thumbnails/thumbnail-dark-grey.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-dark-nord.png b/src/assets/gtk/thumbnails/thumbnail-dark-nord.png new file mode 100644 index 0000000..e17af5d Binary files /dev/null and b/src/assets/gtk/thumbnails/thumbnail-dark-nord.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-dark-orange-nord.png b/src/assets/gtk/thumbnails/thumbnail-dark-orange-nord.png new file mode 100644 index 0000000..ffd2ac4 Binary files /dev/null and b/src/assets/gtk/thumbnails/thumbnail-dark-orange-nord.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-dark-orange.png b/src/assets/gtk/thumbnails/thumbnail-dark-orange.png index aea0230..9997cf5 100644 Binary files a/src/assets/gtk/thumbnails/thumbnail-dark-orange.png and b/src/assets/gtk/thumbnails/thumbnail-dark-orange.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-dark-pink-nord.png b/src/assets/gtk/thumbnails/thumbnail-dark-pink-nord.png new file mode 100644 index 0000000..53a7ccf Binary files /dev/null and b/src/assets/gtk/thumbnails/thumbnail-dark-pink-nord.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-dark-pink.png b/src/assets/gtk/thumbnails/thumbnail-dark-pink.png index 5668dde..e3fcc31 100644 Binary files a/src/assets/gtk/thumbnails/thumbnail-dark-pink.png and b/src/assets/gtk/thumbnails/thumbnail-dark-pink.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-dark-purple-nord.png b/src/assets/gtk/thumbnails/thumbnail-dark-purple-nord.png new file mode 100644 index 0000000..78b9fe2 Binary files /dev/null and b/src/assets/gtk/thumbnails/thumbnail-dark-purple-nord.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-dark-purple.png b/src/assets/gtk/thumbnails/thumbnail-dark-purple.png index 897ff3a..e2d8649 100644 Binary files a/src/assets/gtk/thumbnails/thumbnail-dark-purple.png and b/src/assets/gtk/thumbnails/thumbnail-dark-purple.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-dark-red-nord.png b/src/assets/gtk/thumbnails/thumbnail-dark-red-nord.png new file mode 100644 index 0000000..4632f3d Binary files /dev/null and b/src/assets/gtk/thumbnails/thumbnail-dark-red-nord.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-dark-red.png b/src/assets/gtk/thumbnails/thumbnail-dark-red.png index 2278ad1..d1d4ea7 100644 Binary files a/src/assets/gtk/thumbnails/thumbnail-dark-red.png and b/src/assets/gtk/thumbnails/thumbnail-dark-red.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-dark-yellow-nord.png b/src/assets/gtk/thumbnails/thumbnail-dark-yellow-nord.png new file mode 100644 index 0000000..9ad4ca4 Binary files /dev/null and b/src/assets/gtk/thumbnails/thumbnail-dark-yellow-nord.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-dark-yellow.png b/src/assets/gtk/thumbnails/thumbnail-dark-yellow.png index d386ebc..3bb3208 100644 Binary files a/src/assets/gtk/thumbnails/thumbnail-dark-yellow.png and b/src/assets/gtk/thumbnails/thumbnail-dark-yellow.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-dark.png b/src/assets/gtk/thumbnails/thumbnail-dark.png index 0a21769..5030c8f 100644 Binary files a/src/assets/gtk/thumbnails/thumbnail-dark.png and b/src/assets/gtk/thumbnails/thumbnail-dark.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-light-blue-nord.png b/src/assets/gtk/thumbnails/thumbnail-light-blue-nord.png new file mode 100644 index 0000000..4872a99 Binary files /dev/null and b/src/assets/gtk/thumbnails/thumbnail-light-blue-nord.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-light-blue.png b/src/assets/gtk/thumbnails/thumbnail-light-blue.png index b0569f3..64b4866 100644 Binary files a/src/assets/gtk/thumbnails/thumbnail-light-blue.png and b/src/assets/gtk/thumbnails/thumbnail-light-blue.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-light-green-nord.png b/src/assets/gtk/thumbnails/thumbnail-light-green-nord.png new file mode 100644 index 0000000..fb18e8b Binary files /dev/null and b/src/assets/gtk/thumbnails/thumbnail-light-green-nord.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-light-green.png b/src/assets/gtk/thumbnails/thumbnail-light-green.png index d9be776..190a0fd 100644 Binary files a/src/assets/gtk/thumbnails/thumbnail-light-green.png and b/src/assets/gtk/thumbnails/thumbnail-light-green.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-light-grey-nord.png b/src/assets/gtk/thumbnails/thumbnail-light-grey-nord.png new file mode 100644 index 0000000..f3fc867 Binary files /dev/null and b/src/assets/gtk/thumbnails/thumbnail-light-grey-nord.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-light-grey.png b/src/assets/gtk/thumbnails/thumbnail-light-grey.png index 0841c84..5de3b8a 100644 Binary files a/src/assets/gtk/thumbnails/thumbnail-light-grey.png and b/src/assets/gtk/thumbnails/thumbnail-light-grey.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-light-nord.png b/src/assets/gtk/thumbnails/thumbnail-light-nord.png new file mode 100644 index 0000000..52d705d Binary files /dev/null and b/src/assets/gtk/thumbnails/thumbnail-light-nord.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-light-orange-nord.png b/src/assets/gtk/thumbnails/thumbnail-light-orange-nord.png new file mode 100644 index 0000000..7324d2b Binary files /dev/null and b/src/assets/gtk/thumbnails/thumbnail-light-orange-nord.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-light-orange.png b/src/assets/gtk/thumbnails/thumbnail-light-orange.png index 7ae2ab5..55096e8 100644 Binary files a/src/assets/gtk/thumbnails/thumbnail-light-orange.png and b/src/assets/gtk/thumbnails/thumbnail-light-orange.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-light-pink-nord.png b/src/assets/gtk/thumbnails/thumbnail-light-pink-nord.png new file mode 100644 index 0000000..0419b3f Binary files /dev/null and b/src/assets/gtk/thumbnails/thumbnail-light-pink-nord.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-light-pink.png b/src/assets/gtk/thumbnails/thumbnail-light-pink.png index 347dfd8..13721bc 100644 Binary files a/src/assets/gtk/thumbnails/thumbnail-light-pink.png and b/src/assets/gtk/thumbnails/thumbnail-light-pink.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-light-purple-nord.png b/src/assets/gtk/thumbnails/thumbnail-light-purple-nord.png new file mode 100644 index 0000000..afb91fc Binary files /dev/null and b/src/assets/gtk/thumbnails/thumbnail-light-purple-nord.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-light-purple.png b/src/assets/gtk/thumbnails/thumbnail-light-purple.png index 59b7faa..a3f22f9 100644 Binary files a/src/assets/gtk/thumbnails/thumbnail-light-purple.png and b/src/assets/gtk/thumbnails/thumbnail-light-purple.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-light-red-nord.png b/src/assets/gtk/thumbnails/thumbnail-light-red-nord.png new file mode 100644 index 0000000..a94d742 Binary files /dev/null and b/src/assets/gtk/thumbnails/thumbnail-light-red-nord.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-light-red.png b/src/assets/gtk/thumbnails/thumbnail-light-red.png index 944e168..b8f10f2 100644 Binary files a/src/assets/gtk/thumbnails/thumbnail-light-red.png and b/src/assets/gtk/thumbnails/thumbnail-light-red.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-light-yellow-nord.png b/src/assets/gtk/thumbnails/thumbnail-light-yellow-nord.png new file mode 100644 index 0000000..5f0c5fe Binary files /dev/null and b/src/assets/gtk/thumbnails/thumbnail-light-yellow-nord.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-light-yellow.png b/src/assets/gtk/thumbnails/thumbnail-light-yellow.png index d04e82a..1b6dd3e 100644 Binary files a/src/assets/gtk/thumbnails/thumbnail-light-yellow.png and b/src/assets/gtk/thumbnails/thumbnail-light-yellow.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail-light.png b/src/assets/gtk/thumbnails/thumbnail-light.png index 3606470..f2dfbc6 100644 Binary files a/src/assets/gtk/thumbnails/thumbnail-light.png and b/src/assets/gtk/thumbnails/thumbnail-light.png differ diff --git a/src/assets/gtk/thumbnails/thumbnail.svg b/src/assets/gtk/thumbnails/thumbnail.svg index 3f15ec5..fb6f619 100644 --- a/src/assets/gtk/thumbnails/thumbnail.svg +++ b/src/assets/gtk/thumbnails/thumbnail.svg @@ -1,825 +1,457 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + - - - + + - - - - - - - - - - - - - + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - + + - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/metacity-1/thumbnail-dark-nord.png b/src/assets/metacity-1/thumbnail-dark-nord.png new file mode 100644 index 0000000..2715ab9 Binary files /dev/null and b/src/assets/metacity-1/thumbnail-dark-nord.png differ diff --git a/src/assets/metacity-1/thumbnail-dark.png b/src/assets/metacity-1/thumbnail-dark.png index 0839ba2..9db2f35 100644 Binary files a/src/assets/metacity-1/thumbnail-dark.png and b/src/assets/metacity-1/thumbnail-dark.png differ diff --git a/src/assets/metacity-1/thumbnail-light-nord.png b/src/assets/metacity-1/thumbnail-light-nord.png new file mode 100644 index 0000000..cc4a908 Binary files /dev/null and b/src/assets/metacity-1/thumbnail-light-nord.png differ diff --git a/src/assets/metacity-1/thumbnail-light.png b/src/assets/metacity-1/thumbnail-light.png index 770895c..5882bca 100644 Binary files a/src/assets/metacity-1/thumbnail-light.png and b/src/assets/metacity-1/thumbnail-light.png differ diff --git a/src/assets/metacity-1/thumbnail.svg b/src/assets/metacity-1/thumbnail.svg index 2cd0e09..ca8c2d9 100644 --- a/src/assets/metacity-1/thumbnail.svg +++ b/src/assets/metacity-1/thumbnail.svg @@ -1,92 +1,516 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-backdrop.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-backdrop.svg new file mode 100644 index 0000000..46ac698 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-backdrop.svg @@ -0,0 +1,38 @@ + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-close-active.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-close-active.svg new file mode 100644 index 0000000..ad24c45 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-close-active.svg @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-close-backdrop-active.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-close-backdrop-active.svg new file mode 100644 index 0000000..e76ffb9 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-close-backdrop-active.svg @@ -0,0 +1,49 @@ + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-close-backdrop.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-close-backdrop.svg new file mode 100644 index 0000000..cdb75ed --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-close-backdrop.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-close-hover.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-close-hover.svg new file mode 100644 index 0000000..24cef59 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-close-hover.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-close.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-close.svg new file mode 100644 index 0000000..e24e10d --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-close.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-maximize-active.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-maximize-active.svg new file mode 100644 index 0000000..2f77808 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-maximize-active.svg @@ -0,0 +1,55 @@ + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-maximize-backdrop-active.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-maximize-backdrop-active.svg new file mode 100644 index 0000000..3978fad --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-maximize-backdrop-active.svg @@ -0,0 +1,48 @@ + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-maximize-backdrop.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-maximize-backdrop.svg new file mode 100644 index 0000000..9906996 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-maximize-backdrop.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-maximize-hover.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-maximize-hover.svg new file mode 100644 index 0000000..7941ae1 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-maximize-hover.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-maximize.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-maximize.svg new file mode 100644 index 0000000..865dbd1 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-maximize.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-menu-active.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-menu-active.svg new file mode 100644 index 0000000..1c6ff0a --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-menu-active.svg @@ -0,0 +1,53 @@ + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-menu-backdrop-active.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-menu-backdrop-active.svg new file mode 120000 index 0000000..6c570ef --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-menu-backdrop-active.svg @@ -0,0 +1 @@ +titlebutton-menu-active.svg \ No newline at end of file diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-menu-backdrop.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-menu-backdrop.svg new file mode 120000 index 0000000..74c19df --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-menu-backdrop.svg @@ -0,0 +1 @@ +titlebutton-menu-hover.svg \ No newline at end of file diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-menu-hover.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-menu-hover.svg new file mode 100644 index 0000000..59b2787 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-menu-hover.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-menu.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-menu.svg new file mode 120000 index 0000000..2a679ce --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-menu.svg @@ -0,0 +1 @@ +titlebutton-backdrop.svg \ No newline at end of file diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-minimize-active.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-minimize-active.svg new file mode 100644 index 0000000..41e2b3c --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-minimize-active.svg @@ -0,0 +1,54 @@ + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-minimize-backdrop-active.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-minimize-backdrop-active.svg new file mode 100644 index 0000000..8e180c3 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-minimize-backdrop-active.svg @@ -0,0 +1,52 @@ + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-minimize-backdrop.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-minimize-backdrop.svg new file mode 100644 index 0000000..f37dad6 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-minimize-backdrop.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-minimize-hover.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-minimize-hover.svg new file mode 100644 index 0000000..fc38b14 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-minimize-hover.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-minimize.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-minimize.svg new file mode 100644 index 0000000..b7b7be4 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-minimize.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-shade-active.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-shade-active.svg new file mode 100644 index 0000000..f3d5e16 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-shade-active.svg @@ -0,0 +1,50 @@ + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-shade-backdrop-active.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-shade-backdrop-active.svg new file mode 100644 index 0000000..f18223b --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-shade-backdrop-active.svg @@ -0,0 +1,50 @@ + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-shade-backdrop.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-shade-backdrop.svg new file mode 100644 index 0000000..a00bf09 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-shade-backdrop.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-shade-hover.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-shade-hover.svg new file mode 100644 index 0000000..e2b6aad --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-shade-hover.svg @@ -0,0 +1,45 @@ + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-shade.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-shade.svg new file mode 100644 index 0000000..478cf75 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-shade.svg @@ -0,0 +1,38 @@ + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unmaximize-active.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unmaximize-active.svg new file mode 100644 index 0000000..61c0738 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unmaximize-active.svg @@ -0,0 +1,55 @@ + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unmaximize-backdrop-active.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unmaximize-backdrop-active.svg new file mode 100644 index 0000000..6533e4e --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unmaximize-backdrop-active.svg @@ -0,0 +1,48 @@ + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unmaximize-backdrop.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unmaximize-backdrop.svg new file mode 100644 index 0000000..c48a97a --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unmaximize-backdrop.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unmaximize-hover.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unmaximize-hover.svg new file mode 100644 index 0000000..9b8efb5 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unmaximize-hover.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unshade-active.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unshade-active.svg new file mode 100644 index 0000000..ce91ec4 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unshade-active.svg @@ -0,0 +1,50 @@ + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unshade-backdrop-active.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unshade-backdrop-active.svg new file mode 100644 index 0000000..c26d7de --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unshade-backdrop-active.svg @@ -0,0 +1,50 @@ + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unshade-backdrop.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unshade-backdrop.svg new file mode 100644 index 0000000..4efd1fa --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unshade-backdrop.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unshade-hover.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unshade-hover.svg new file mode 100644 index 0000000..e9ef09d --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unshade-hover.svg @@ -0,0 +1,45 @@ + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unshade.svg b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unshade.svg new file mode 120000 index 0000000..58a2bbf --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-dark-nord/titlebutton-unshade.svg @@ -0,0 +1 @@ +titlebutton-shade.svg \ No newline at end of file diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-backdrop.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-backdrop.svg new file mode 100644 index 0000000..df76006 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-backdrop.svg @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-close-active.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-close-active.svg new file mode 100644 index 0000000..54f7597 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-close-active.svg @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-close-backdrop-active.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-close-backdrop-active.svg new file mode 100644 index 0000000..5439118 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-close-backdrop-active.svg @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-close-backdrop.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-close-backdrop.svg new file mode 100644 index 0000000..c8bac1a --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-close-backdrop.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-close-hover.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-close-hover.svg new file mode 100644 index 0000000..5475112 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-close-hover.svg @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-close.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-close.svg new file mode 100644 index 0000000..b85165b --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-close.svg @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-maximize-active.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-maximize-active.svg new file mode 100644 index 0000000..3ad5158 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-maximize-active.svg @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-maximize-backdrop-active.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-maximize-backdrop-active.svg new file mode 100644 index 0000000..94fc397 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-maximize-backdrop-active.svg @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-maximize-backdrop.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-maximize-backdrop.svg new file mode 100644 index 0000000..197da88 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-maximize-backdrop.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-maximize-hover.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-maximize-hover.svg new file mode 100644 index 0000000..fb1655a --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-maximize-hover.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-maximize.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-maximize.svg new file mode 100644 index 0000000..ea3dfc0 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-maximize.svg @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-menu-active.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-menu-active.svg new file mode 100644 index 0000000..0a0c554 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-menu-active.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-menu-backdrop-active.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-menu-backdrop-active.svg new file mode 120000 index 0000000..6c570ef --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-menu-backdrop-active.svg @@ -0,0 +1 @@ +titlebutton-menu-active.svg \ No newline at end of file diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-menu-backdrop.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-menu-backdrop.svg new file mode 120000 index 0000000..74c19df --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-menu-backdrop.svg @@ -0,0 +1 @@ +titlebutton-menu-hover.svg \ No newline at end of file diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-menu-hover.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-menu-hover.svg new file mode 100644 index 0000000..7e9c184 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-menu-hover.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-menu.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-menu.svg new file mode 120000 index 0000000..2a679ce --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-menu.svg @@ -0,0 +1 @@ +titlebutton-backdrop.svg \ No newline at end of file diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-minimize-active.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-minimize-active.svg new file mode 100644 index 0000000..63ba3f8 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-minimize-active.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-minimize-backdrop-active.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-minimize-backdrop-active.svg new file mode 100644 index 0000000..c695379 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-minimize-backdrop-active.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-minimize-backdrop.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-minimize-backdrop.svg new file mode 100644 index 0000000..2aa42fa --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-minimize-backdrop.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-minimize-hover.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-minimize-hover.svg new file mode 100644 index 0000000..e2bc23e --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-minimize-hover.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-minimize.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-minimize.svg new file mode 100644 index 0000000..a40ea46 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-minimize.svg @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-shade-active.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-shade-active.svg new file mode 100644 index 0000000..093b3c2 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-shade-active.svg @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-shade-backdrop-active.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-shade-backdrop-active.svg new file mode 100644 index 0000000..2f7b02b --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-shade-backdrop-active.svg @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-shade-backdrop.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-shade-backdrop.svg new file mode 100644 index 0000000..9580694 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-shade-backdrop.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-shade-hover.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-shade-hover.svg new file mode 100644 index 0000000..280b791 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-shade-hover.svg @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-shade.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-shade.svg new file mode 100644 index 0000000..33e4143 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-shade.svg @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unmaximize-active.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unmaximize-active.svg new file mode 100644 index 0000000..ccb6e15 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unmaximize-active.svg @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unmaximize-backdrop-active.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unmaximize-backdrop-active.svg new file mode 100644 index 0000000..34211d9 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unmaximize-backdrop-active.svg @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unmaximize-backdrop.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unmaximize-backdrop.svg new file mode 100644 index 0000000..2820698 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unmaximize-backdrop.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unmaximize-hover.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unmaximize-hover.svg new file mode 100644 index 0000000..ae27f63 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unmaximize-hover.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unshade-active.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unshade-active.svg new file mode 100644 index 0000000..b717163 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unshade-active.svg @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unshade-backdrop-active.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unshade-backdrop-active.svg new file mode 100644 index 0000000..f15a1e9 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unshade-backdrop-active.svg @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unshade-backdrop.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unshade-backdrop.svg new file mode 100644 index 0000000..bd88750 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unshade-backdrop.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unshade-hover.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unshade-hover.svg new file mode 100644 index 0000000..d678584 --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unshade-hover.svg @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unshade.svg b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unshade.svg new file mode 120000 index 0000000..58a2bbf --- /dev/null +++ b/src/assets/metacity-1/titlebuttons-light-nord/titlebutton-unshade.svg @@ -0,0 +1 @@ +titlebutton-shade.svg \ No newline at end of file diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-dark.scss b/src/main/gnome-shell/shell-42-0/gnome-shell-dark.scss new file mode 100644 index 0000000..86cb6fc --- /dev/null +++ b/src/main/gnome-shell/shell-42-0/gnome-shell-dark.scss @@ -0,0 +1,8 @@ +$variant: 'dark'; + +@import '../../../sass/variables'; +@import '../../../sass/colors'; +@import '../../../sass/gnome-shell/drawing'; +@import '../../../sass/gnome-shell/common'; +@import '../../../sass/gnome-shell/widgets-42-0'; +@import '../../../sass/gnome-shell/extensions-40-0'; diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-light.scss b/src/main/gnome-shell/shell-42-0/gnome-shell-light.scss new file mode 100644 index 0000000..d6124cb --- /dev/null +++ b/src/main/gnome-shell/shell-42-0/gnome-shell-light.scss @@ -0,0 +1,8 @@ +$variant: 'light'; + +@import '../../../sass/variables'; +@import '../../../sass/colors'; +@import '../../../sass/gnome-shell/drawing'; +@import '../../../sass/gnome-shell/common'; +@import '../../../sass/gnome-shell/widgets-42-0'; +@import '../../../sass/gnome-shell/extensions-40-0'; diff --git a/src/main/metacity-1/metacity-theme-3.xml b/src/main/metacity-1/metacity-theme-3.xml index 7553545..2b09205 100644 --- a/src/main/metacity-1/metacity-theme-3.xml +++ b/src/main/metacity-1/metacity-theme-3.xml @@ -51,7 +51,7 @@ - + @@ -80,7 +80,10 @@ - + + + + diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss index 2d0f300..b1bd710 100644 --- a/src/sass/_colors.scss +++ b/src/sass/_colors.scss @@ -80,8 +80,8 @@ $selected_borders_color: darken($selected_bg_color, 10%); $borders_color: if($variant == 'light', rgba(black, 0.12), rgba(white, 0.12)); $light_borders_color: if($variant == 'light', rgba(black, 0.08), rgba(white, 0.10)); $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%)); +$solid_borders_color: if($variant == 'light', mix(black, $base_color, 12%), mix(white, $base_color, 12%)); +$dark_solid_borders_color: if($variant == 'light', mix(black, $base_color, 12%), mix(black, $base_color, 15%)); $highlight_color: if($variant == 'light', rgba(white, 0.15), rgba(white, 0.1)); // Gnome-shell background colors @@ -185,7 +185,7 @@ $menu_bd: if($variant == 'light', rgba(black, 0.05), r $menu_bg: if($variant == 'light', rgba($base_color, 0.95), rgba($bg_color, 0.95)); } -$dialog_bg_color: if($variant == 'light', darken($bg_color, 5%), $base_color); +$dialog_bg_color: if($variant == 'light', $bg_color, $base_color); @if $trans=='true' { $dialog_bg_color: if($variant == 'light', rgba($bg_color, 0.95), rgba($base_color, 0.95)); @@ -262,11 +262,6 @@ $button_bg: if($variant == 'light', white, #656565); } $button_border: $borders_color; -$header_button_bg: if($variant == 'dark', lighten($header_bg, 15%), $header_bg); -$header_button_hover_bg: if($variant == 'dark', lighten($header_bg, 25%), lighten($header_bg, 15%)); -$header_button_active_bg: if($variant == 'dark', lighten($header_bg, 35%), lighten($header_bg, 25%)); -$header_button_checked_bg: if($variant == 'dark', lighten($header_bg, 45%), lighten($header_bg, 20%)); - // Button borders and highlights colors $button_highlight: if($variant == 'light', white, rgba(white, 0.1)); $button_borders: if($variant == 'light', $button_border, $dark_borders_color); diff --git a/src/sass/_variables.scss b/src/sass/_variables.scss index 2dbd82f..6e6a810 100644 --- a/src/sass/_variables.scss +++ b/src/sass/_variables.scss @@ -31,7 +31,7 @@ $medium_size: if($laptop == 'false', 36px, 32px); $large_size: if($laptop == 'false', 48px, 44px); $menuitem_size: if($laptop == 'false', 32px, 28px); $container_padding: if($laptop == 'false', 8px, 6px); -$headerbar_size: if($laptop == 'false', 42px, 38px); +$headerbar_size: if($laptop == 'false', 46px, 42px); // padding, margin and spacing $base_padding: if($laptop == 'false', 6px, 4px); diff --git a/src/sass/cinnamon/_common.scss b/src/sass/cinnamon/_common.scss index 9441588..8b9a72c 100644 --- a/src/sass/cinnamon/_common.scss +++ b/src/sass/cinnamon/_common.scss @@ -677,13 +677,42 @@ $menu_border: if($variant=='light', darken($menu_bg, 18%), darken($menu_bg, 12%) padding: 2px; // label centering } +.calendar-today-home-button, +.calendar-today-home-button-enabled { + margin: $container_padding 0; + padding: $container_padding; + border-radius: $bt_radius; +} + +.calendar-today-home-button-enabled:hover { + background-gradient-direction: vertical; + background-gradient-start: $fill_color; + background-gradient-end: $fill_color; + box-shadow: none; +} + +.calendar-today-day-label { + font-size: 1.75em; + color: $disabled_fg_color; + font-weight: bold; + text-align: center; + padding-bottom: .1em; +} + +.calendar-today-date-label { + font-size: 1.1em; + color: $disabled_fg_color; + font-weight: bold; + text-align: center; +} + .calendar-change-month-back, .calendar-change-month-forward { width: 24px; height: 24px; margin: 0; padding: 0; - border-radius: 100px; + border-radius: $circular_radius; &:focus, &:hover { background-color: rgba($fg_color, 0.1); } &:active { background-color: rgba($fg_color, 0.25); } @@ -716,13 +745,38 @@ $menu_border: if($variant=='light', darken($menu_bg, 18%), darken($menu_bg, 12%) border-radius: $bt_radius; } +.calendar-day-event-dot-box { + margin-top: 22px; + max-rows: 2; +} + +.calendar-day-event-dot { + margin: 1px; + border-radius: 2px; + width: 4px; + height: 4px; +} + .calendar-day-base { text-align: center; width: 28px; height: 28px; padding: 0; margin: 2px; - border-radius: 100px; + border-radius: $circular_radius; + color: $alt_fg_color; + + &:hover { + color: $fg_color; + font-weight: bold; + background-color: $fill_color; + } + + &:active { + color: $fg_color; + font-weight: bold; + background-color: $divider_color; + } } .calendar-day-heading { @@ -732,7 +786,7 @@ $menu_border: if($variant=='light', darken($menu_bg, 18%), darken($menu_bg, 12%) .calendar-day { border-width: 0; - color: transparentize($fg_color, 0.2); + color: $alt_fg_color; } .calendar-day-top { @@ -764,6 +818,15 @@ $menu_border: if($variant=='light', darken($menu_bg, 18%), darken($menu_bg, 12%) opacity: 1; } +.calendar-not-today { + color: $alt_fg_color; + + &:selected { + color: $fg_color; + font-weight: bold; + } +} + .calendar-week-number { width: 20px; height: 20px; @@ -921,7 +984,7 @@ $menu_border: if($variant=='light', darken($menu_bg, 18%), darken($menu_bg, 12%) margin-from-right-edge-of-screen: 20px; width: 34em; color: $text_color; - background-color: $base_color; + background-color: $menu_bg; .notification-button, .notification-icon-button { @extend %flat_button; @@ -936,7 +999,7 @@ $menu_border: if($variant=='light', darken($menu_bg, 18%), darken($menu_bg, 12%) border-radius: $bt_radius; background-color: rgba($fg_color, 0.05); - &:hover { + &:hover, &:selected { background-color: rgba($fg_color, 0.1); box-shadow: 0 3px 8px rgba(black, 0.15); } diff --git a/src/sass/gnome-shell/_widgets-3-28.scss b/src/sass/gnome-shell/_widgets-3-28.scss index 98e290d..b5dd1a0 100644 --- a/src/sass/gnome-shell/_widgets-3-28.scss +++ b/src/sass/gnome-shell/_widgets-3-28.scss @@ -35,6 +35,8 @@ @import 'widgets-3-28/login-dialog'; @import 'widgets-3-28/other'; @import 'widgets-3-28/overview'; +@import 'widgets-3-28/osd'; @import 'widgets-3-28/panel'; +@import 'widgets-3-28/popovers'; @import 'widgets-3-28/window-picker'; @import 'widgets-3-28/workspace-thumbnails'; diff --git a/src/sass/gnome-shell/_widgets-40-0.scss b/src/sass/gnome-shell/_widgets-40-0.scss index c3741b4..2c1f2b4 100644 --- a/src/sass/gnome-shell/_widgets-40-0.scss +++ b/src/sass/gnome-shell/_widgets-40-0.scss @@ -34,7 +34,9 @@ @import 'widgets-40-0/dash'; @import 'widgets-40-0/misc'; @import 'widgets-40-0/overview'; +@import 'widgets-40-0/osd'; @import 'widgets-40-0/panel'; +@import 'widgets-40-0/popovers'; @import 'widgets-40-0/screen-shield'; @import 'widgets-40-0/search-entry'; @import 'widgets-40-0/window-picker'; diff --git a/src/sass/gnome-shell/_widgets-42-0.scss b/src/sass/gnome-shell/_widgets-42-0.scss new file mode 100644 index 0000000..42b8ba2 --- /dev/null +++ b/src/sass/gnome-shell/_widgets-42-0.scss @@ -0,0 +1,43 @@ +@import 'common/a11y'; +@import 'common/app-grid'; +@import 'common/base'; +@import 'common/buttons'; +@import 'common/calendar'; +@import 'common/check-box'; +@import 'common/corner-ripple'; +@import 'common/dash'; +@import 'common/dialogs'; +@import 'common/entries'; +@import 'common/hotplug'; +@import 'common/ibus-popup'; +@import 'common/keyboard'; +@import 'common/login-dialog'; +@import 'common/looking-glass'; +@import 'common/message-list'; +@import 'common/misc'; +@import 'common/network-dialog'; +@import 'common/notifications'; +@import 'common/osd'; +@import 'common/overview'; +@import 'common/panel'; +@import 'common/popovers'; +@import 'common/screen-shield'; +@import 'common/scrollbars'; +@import 'common/search-entry'; +@import 'common/search-results'; +@import 'common/slider'; +@import 'common/switcher-popup'; +@import 'common/switches'; +@import 'common/tiled-previews'; +@import 'common/workspace-switcher'; +@import 'widgets-40-0/app-grid'; +@import 'widgets-40-0/dash'; +@import 'widgets-40-0/misc'; +@import 'widgets-40-0/overview'; +@import 'widgets-42-0/osd'; +@import 'widgets-40-0/panel'; +@import 'widgets-42-0/popovers'; +@import 'widgets-40-0/screen-shield'; +@import 'widgets-40-0/search-entry'; +@import 'widgets-40-0/window-picker'; +@import 'widgets-40-0/workspace-thumbnails'; diff --git a/src/sass/gnome-shell/common/_message-list.scss b/src/sass/gnome-shell/common/_message-list.scss index c2eb9fb..0922e95 100644 --- a/src/sass/gnome-shell/common/_message-list.scss +++ b/src/sass/gnome-shell/common/_message-list.scss @@ -3,10 +3,24 @@ .message-list { width: 31.5em; - padding: 0 12px; + padding: $base_padding; text-shadow: none; + border: none; - .message-list-placeholder { spacing: 12px; } + // padding and margins to account for scrollbar + &:ltr { margin-left: 0; margin-right: 0; padding-right: 0; } + &:rtl { margin-right: 0; margin-left: 0; padding-left: 0; } + + .message-list-placeholder { + spacing: 12px; + + // icon size and color + > StIcon { + icon-size: $base_icon_size * 3; // 48px + margin-bottom: $base_margin * 3; + -st-icon-style: symbolic; + } + } } .message-list-sections { diff --git a/src/sass/gnome-shell/common/_misc.scss b/src/sass/gnome-shell/common/_misc.scss index 104b2bd..0c47af5 100644 --- a/src/sass/gnome-shell/common/_misc.scss +++ b/src/sass/gnome-shell/common/_misc.scss @@ -45,7 +45,7 @@ .flashspot { background-color: white; } // Hidden -.hidden { color: rgba(0,0,0,0);} +.hidden { color: rgba(0,0,0,0); } // Caps-lock warning .caps-lock-warning-label { diff --git a/src/sass/gnome-shell/common/_osd.scss b/src/sass/gnome-shell/common/_osd.scss index e5f0f3f..3995340 100644 --- a/src/sass/gnome-shell/common/_osd.scss +++ b/src/sass/gnome-shell/common/_osd.scss @@ -4,14 +4,6 @@ @extend %osd_panel; text-align: center; font-weight: bold; - spacing: 1em; - margin: 32px; - min-width: 64px; - min-height: 64px; - - StIcon { - icon-size: $base_icon_size * 6; - } .osd-monitor-label { font-size: 3em; } diff --git a/src/sass/gnome-shell/common/_popovers.scss b/src/sass/gnome-shell/common/_popovers.scss index 9e66679..c8db565 100644 --- a/src/sass/gnome-shell/common/_popovers.scss +++ b/src/sass/gnome-shell/common/_popovers.scss @@ -106,11 +106,6 @@ $popop_menuitem_radius: $wm_radius - 4px; font-weight: normal; transition: none; - &:ltr { padding-right: 1.5em; padding-left: 0; } - &:rtl { padding-right: 0; padding-left: 1.5em; } - // &:ltr { padding-right: $base_padding * 2 !important; padding-left: 0 !important; } - // &:rtl { padding-left: $base_padding * 2 !important; padding-right: 0 !important; } - &:checked { font-weight: normal; border-radius: $popop_menuitem_radius $popop_menuitem_radius 0 0; @@ -120,7 +115,7 @@ $popop_menuitem_radius: $wm_radius - 4px; background-color: $submenu_bg_color !important; background-gradient-direction: none !important; - &:hover, &.selected { + &:focus, &:hover, &:selected { color: $selected_fg_color !important; background-color: $selected_bg_color !important; background-gradient-direction: none !important; @@ -134,7 +129,7 @@ $popop_menuitem_radius: $wm_radius - 4px; &:insensitive { color: $disabled_fg_color !important; } } - &.selected { + &:focus, &:hover, &:selected { color: $selected_fg_color !important; background-color: $selected_bg_color !important; transition-duration: 0ms !important; @@ -159,7 +154,7 @@ $popop_menuitem_radius: $wm_radius - 4px; margin: 0; border-radius: $popop_menuitem_radius; - &:focus, &:hover { + &:focus, &:hover, &:selected { color: $selected_fg_color !important; background-color: $selected_bg_color !important; } @@ -172,9 +167,9 @@ $popop_menuitem_radius: $wm_radius - 4px; } .popup-inactive-menu-item { //all icons and other graphical elements - color: $alt_fg_color; + color: $alt_fg_color !important; - &:insensitive { color: $disabled_fg_color; } + &:insensitive { color: $disabled_fg_color !important; } } // symbolic icons in popover @@ -193,13 +188,12 @@ $popop_menuitem_radius: $wm_radius - 4px; .popup-separator-menu-item { background: none; border: none; - // margin: 6px 32px; padding-top: 0 !important; padding-bottom: 0 !important; .popup-separator-menu-item-separator { height: 1px; //not really the whole box - margin: 0 0; + margin: 0; background-color: $borders_color; .popup-sub-menu & { //submenu separators @@ -225,14 +219,4 @@ $popop_menuitem_radius: $wm_radius - 4px; margin: 0 0; -st-icon-style: symbolic; } - - .popup-sub-menu .popup-menu-item > :first-child { - // &:ltr { padding-left: $base_padding * 2 !important; margin-left: $base_padding / 2 !important; } - // &:rtl { padding-right: $base_padding * 2 !important; margin-right: $base_padding / 2 !important; } - - &:ltr { /* 12px spacing + 2*4px padding */ - padding-left: $base_padding * 2 + 4px; margin-left: 1em; } - &:rtl { /* 12px spacing + 2*4px padding */ - padding-right: $base_padding * 2 + 4px; margin-right: 1em; } - } } diff --git a/src/sass/gnome-shell/widgets-3-28/_osd.scss b/src/sass/gnome-shell/widgets-3-28/_osd.scss new file mode 100644 index 0000000..8afe5f2 --- /dev/null +++ b/src/sass/gnome-shell/widgets-3-28/_osd.scss @@ -0,0 +1,9 @@ +.osd-window { + spacing: 1em; + min-width: 64px; + min-height: 64px; + + StIcon { + icon-size: $base_icon_size * 6; + } +} diff --git a/src/sass/gnome-shell/widgets-3-28/_popovers.scss b/src/sass/gnome-shell/widgets-3-28/_popovers.scss new file mode 100644 index 0000000..d71a17c --- /dev/null +++ b/src/sass/gnome-shell/widgets-3-28/_popovers.scss @@ -0,0 +1,13 @@ + +.popup-menu-item { + &:ltr { padding-right: 1.5em; padding-left: 0; } + &:rtl { padding-right: 0; padding-left: 1.5em; } +} + +// system status popover menu +.aggregate-menu { + .popup-sub-menu .popup-menu-item > :first-child { + &:ltr { padding-left: $base_padding * 2 + 4px; margin-left: 1em; } + &:rtl { padding-right: $base_padding * 2 + 4px; margin-right: 1em; } + } +} diff --git a/src/sass/gnome-shell/widgets-40-0/_osd.scss b/src/sass/gnome-shell/widgets-40-0/_osd.scss new file mode 100644 index 0000000..8afe5f2 --- /dev/null +++ b/src/sass/gnome-shell/widgets-40-0/_osd.scss @@ -0,0 +1,9 @@ +.osd-window { + spacing: 1em; + min-width: 64px; + min-height: 64px; + + StIcon { + icon-size: $base_icon_size * 6; + } +} diff --git a/src/sass/gnome-shell/widgets-40-0/_popovers.scss b/src/sass/gnome-shell/widgets-40-0/_popovers.scss new file mode 100644 index 0000000..d71a17c --- /dev/null +++ b/src/sass/gnome-shell/widgets-40-0/_popovers.scss @@ -0,0 +1,13 @@ + +.popup-menu-item { + &:ltr { padding-right: 1.5em; padding-left: 0; } + &:rtl { padding-right: 0; padding-left: 1.5em; } +} + +// system status popover menu +.aggregate-menu { + .popup-sub-menu .popup-menu-item > :first-child { + &:ltr { padding-left: $base_padding * 2 + 4px; margin-left: 1em; } + &:rtl { padding-right: $base_padding * 2 + 4px; margin-right: 1em; } + } +} diff --git a/src/sass/gnome-shell/widgets-42-0/_osd.scss b/src/sass/gnome-shell/widgets-42-0/_osd.scss new file mode 100644 index 0000000..3d53886 --- /dev/null +++ b/src/sass/gnome-shell/widgets-42-0/_osd.scss @@ -0,0 +1,14 @@ + +.osd-window { + spacing: $base_padding * 2; // 12px + padding: $base_padding * 2 $base_padding * 3; + & > * { spacing: 8px; } + margin-bottom: 4em; + + StIcon { icon-size: $base_icon_size * 2; } // 32px + + StLabel { + &:ltr { margin-right: 6px; } + &:rtl { margin-left: 6px; } + } +} diff --git a/src/sass/gnome-shell/widgets-42-0/_popovers.scss b/src/sass/gnome-shell/widgets-42-0/_popovers.scss new file mode 100644 index 0000000..e88759d --- /dev/null +++ b/src/sass/gnome-shell/widgets-42-0/_popovers.scss @@ -0,0 +1,20 @@ + +.popup-menu-item { + &:ltr { padding-right: $base_padding * 2 !important; padding-left: 0 !important; } + &:rtl { padding-left: $base_padding * 2 !important; padding-right: 0 !important; } +} + +// separator +.popup-separator-menu-item { + margin: 6px 32px; +} + +// system status popover menu +.aggregate-menu { + min-width: 21em; + + .popup-sub-menu .popup-menu-item > :first-child { + &:ltr { padding-left: $base_padding * 2 !important; margin-left: $base_margin !important; } + &:rtl { padding-right: $base_padding * 2 !important; margin-right: $base_margin !important; } + } +} diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss index 089c350..5a82443 100644 --- a/src/sass/gtk/_common-3.0.scss +++ b/src/sass/gtk/_common-3.0.scss @@ -15,8 +15,9 @@ $cakeisalie: "This stylesheet is generated, DO NOT EDIT"; -GtkWidget-text-handle-width: 20; -GtkWidget-text-handle-height: 20; - -GtkDialog-button-spacing: 4; - -GtkDialog-action-area-border: 0; + -GtkDialog-button-spacing: 6; + -GtkDialog-action-area-border: 4; // This is necessary to align buttons and elements inside windows. + -GtkDialog-content-area-border: 4; // We use the outline properties to signal the focus properties outline-color: gtkalpha(currentColor, 0.15); @@ -466,6 +467,8 @@ entry { padding: 2px $container_padding + 2px; border-radius: $bt_radius; caret-color: currentColor; + transition: all 300ms $ease-out-quad; + animation-timing-function: ease-in-out; &.search { border-radius: $bt_radius; } @@ -872,7 +875,7 @@ button { } &:active, &:checked { - @include button(suggested_destructive, lighten($b_color, 10%), $b_fg); + @include button(suggested_destructive, darken($b_color, 5%), $b_fg); } &.flat:disabled { @@ -1006,22 +1009,6 @@ toolbar.inline-toolbar toolbutton { border-left-style: none; } } - - @if $button_rules == 'header' { - > button:first-child { border-left-style: if($variant == 'light', solid, none); } - > button + button { border-left-style: solid; } - - @if $variant == 'light' { - > button:active + button { - border-left-color: mix(black, $header_button_active_bg, 15%); - } - - > button:active + button:checked, - > button:checked + button { - border-left-color: mix(black, $header_button_checked_bg, 15%); - } - } - } } // Apply the rules defined above @@ -1254,16 +1241,15 @@ combobox { url("assets/combobox-arrow#{$asset_suffix}.png"), url("assets/combobox-arrow#{$asset_suffix}@2.png")); } - } - .linked:not(.vertical) > entry + button.combo:checked, - .linked:not(.vertical) > & > box > button.combo:checked { - arrow { - border-radius: 0; - background-color: transparent; - -gtk-icon-source: -gtk-scaled( - url("assets/combobox-arrow-dark.png"), - url("assets/combobox-arrow-dark@2.png")); + &:checked, &:active { + arrow { + border-radius: 0; + background-color: transparent; + -gtk-icon-source: -gtk-scaled( + url("assets/combobox-arrow-dark.png"), + url("assets/combobox-arrow-dark@2.png")); + } } } @@ -1276,7 +1262,7 @@ combobox { .linked:not(.vertical) > &:first-child > box > button.combo { border-top-left-radius: $bt_radius; - border-bottom-left-radius: $bt_radius + border-bottom-left-radius: $bt_radius; } .linked:not(.vertical) > &:last-child > box > button.combo { @@ -2344,13 +2330,10 @@ menu, // popover, popover.background { - padding: $container_padding; + padding: 0; border-radius: $wm_radius; background-clip: border-box; background-color: $menu_bg; - - &.menu { padding: 0; } - box-shadow: 0 3px 6px 0 rgba(black, 0.15), 0 0 0 1px if($variant=='light', rgba(black, 0.03), rgba(black, 0.65)); @@ -2362,8 +2345,6 @@ popover.background { separator, & separator, .csd & separator { - // margin: 4px -9px; - // min-height: 2px; border: none; background-color: transparent; } @@ -2385,8 +2366,9 @@ popover.background { background-color: transparent; } - > scrolledwindow > viewport > list { - margin: $container_padding; + &.combo > scrolledwindow > viewport > list { + margin: 0; + padding: $container_padding; row { padding: $container_padding $container_padding * 2; @@ -2704,7 +2686,7 @@ scrollbar { background-color: mix($fg_color, $bg_color, 40%); &:hover { background-color: mix($fg_color, $bg_color, 30%); } - &:hover:active { background-color: $header_button_checked_bg; } + &:hover:active { background-color: mix($fg_color, $bg_color, 50%); } &:disabled { background-color: transparent; } } @@ -2933,6 +2915,7 @@ radio { } &:active { + color: $selected_fg_color; background-color: $selected_bg_color; @if $variant == 'light' { @@ -3700,7 +3683,7 @@ messagedialog { // Message Dialog styling } &:active, &:checked { - @include button(suggested_destructive, lighten($b_color, 10%), $b_fg); + @include button(suggested_destructive, darken($b_color, 5%), $b_fg); } &:disabled { @include button(insensitive); } diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss index 1aa4f68..20b1d51 100644 --- a/src/sass/gtk/_common-4.0.scss +++ b/src/sass/gtk/_common-4.0.scss @@ -7,14 +7,12 @@ $cakeisalie: "This stylesheet is generated, DO NOT EDIT"; %side_headerbar_left { background-image: none; background-color: rgba($dark_sidebar_bg, 1); - box-shadow: inset 0 1px $highlight_color; border: none; } %side_headerbar_right { background-image: none; background-color: rgba($base_color, 1); - box-shadow: inset 0 1px $highlight_color; } %side_searchbar { @@ -41,6 +39,7 @@ $list_shadow: if($variant == 'light', box-shadow: $list_shadow; background-color: if($variant == 'light', rgba(black, 0.03), rgba(white, 0.05)); border: none; + color: $text_color; > separator { background: none; min-height: 0; } } @@ -195,7 +194,6 @@ $list_shadow: if($variant == 'light', // Base States // .background { - // border-radius: 0 0 $wm_radius $wm_radius; color: $fg_color; background-color: rgba($bg_color, 1); @@ -364,10 +362,8 @@ label { } window.assistant { - // min-height: 38px; .sidebar { background-color: $base_color; -// border-top: 1px solid $borders_color; } &.csd .sidebar { border-top-style: none; } @@ -498,6 +494,8 @@ entry { padding: 2px $container_padding + 2px; border-radius: $bt_radius; caret-color: currentColor; + transition: all 300ms $ease-out-quad; + animation-timing-function: ease-in-out; &.search { border-radius: $bt_radius; } @@ -917,7 +915,7 @@ button { background-color: $fill_color; background-clip: padding-box; font-weight: inherit; - padding: 0; + padding: $container_padding; transition: $button_transition; &:hover { @@ -959,6 +957,7 @@ button { color: $osd_fg_color; background-color: $osd_bg_color; border-color: darken($osd_bg_color, 8%); + box-shadow: none; &.image-button { padding: 0; @@ -1019,7 +1018,7 @@ button { } &:active, &:checked { - @include button(suggested_destructive, lighten($b_color, 10%), $b_fg); + @include button(suggested_destructive, darken($b_color, 5%), $b_fg); box-shadow: none; } @@ -1043,14 +1042,17 @@ button { padding-left: $container_padding; // label padding padding-right: $container_padding; // } + > image { padding-left: $container_padding; padding-right: $container_padding; } + &.text-button { padding-left: $container_padding + 4px; padding-right: $container_padding + 4px; } + &.image-button { padding-left: 2px; padding-right: 2px; @@ -1078,6 +1080,8 @@ button { } menubutton { + margin: 0; + &.osd { background: none; color: inherit; @@ -1148,6 +1152,20 @@ menubutton { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); } } + + .linked > &:not(:only-child) > button { + @extend %linked_middle; + } + + .linked > &:first-child > button { + border-top-left-radius: $bt_radius; + border-bottom-left-radius: $bt_radius; + } + + .linked > &:last-child > button { + border-top-right-radius: $bt_radius; + border-bottom-right-radius: $bt_radius; + } } splitbutton { @@ -1320,22 +1338,6 @@ buttoncontent { border-left-style: none; } } - - @if $button_rules == 'header' { - > button:first-child { border-left-style: if($variant == 'light', solid, none); } - > button + button { border-left-style: solid; } - - @if $variant == 'light' { - > button:active + button { - border-left-color: mix(black, $header_button_active_bg, 15%); - } - - > button:active + button:checked, - > button:checked + button { - border-left-color: mix(black, $header_button_checked_bg, 15%); - } - } - } } // Apply the rules defined above @@ -1540,6 +1542,11 @@ spinbutton { &:focus, &:hover, &:selected { background-color: rgba($fg_color, 0.12); } + &:focus-within { + box-shadow: inset 0 0 0 2px $entry_highlight; + transition: $shadow_transition; + } + > text { &, &:hover, &:focus { background: none; @@ -1605,13 +1612,7 @@ combobox { padding-right: $container_padding + 4px; } - arrow { - -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); - min-height: 16px; - min-width: 16px; - } - - .background & button.combo arrow { + button.combo arrow { @include button(active); -gtk-icon-source: -gtk-scaled( url("assets/combobox-arrow-dark.png"), @@ -1648,16 +1649,16 @@ combobox { padding: 0; listview { - margin: $container_padding 0; + margin: $container_padding 0; - & > row { - padding: $container_padding; + & > row { + padding: $container_padding; - &:selected { - color: $selected_fg_color; - background-color: $selected_bg_color; - } - } + &:selected { + color: $selected_fg_color; + background-color: $selected_bg_color; + } + } } // drodowns with searchboxes on top @@ -1676,16 +1677,15 @@ combobox { url("assets/combobox-arrow#{$asset_suffix}.png"), url("assets/combobox-arrow#{$asset_suffix}@2.png")); } - } - .linked:not(.vertical) > entry + button.combo:checked, - .linked:not(.vertical) > & > box > button.combo:checked { - arrow { - border-radius: 0; - background-color: transparent; - -gtk-icon-source: -gtk-scaled( - url("assets/combobox-arrow-dark.png"), - url("assets/combobox-arrow-dark@2.png")); + &:checked, &:active { + arrow { + border-radius: 0; + background-color: transparent; + -gtk-icon-source: -gtk-scaled( + url("assets/combobox-arrow-dark.png"), + url("assets/combobox-arrow-dark@2.png")); + } } } @@ -1698,7 +1698,7 @@ combobox { .linked:not(.vertical) > &:first-child > box > button.combo { border-top-left-radius: $bt_radius; - border-bottom-left-radius: $bt_radius + border-bottom-left-radius: $bt_radius; } .linked:not(.vertical) > &:last-child > box > button.combo { @@ -1734,19 +1734,22 @@ combobox { %toolbar { padding: $container_padding / 2 $container_padding; border-spacing: $container_padding; - background-color: $header_bg; - border-bottom: 1px solid $borders_color; + // background-color: $header_bg; + // border-bottom: 1px solid $borders_color; } -.toolbar, -toolbar { +.toolbar { @extend %toolbar; - &.horizontal { border-bottom: 1px solid $borders_color; } - separator { background: none; } - &.horizontal separator { margin: 0 6px; } - &.vertical separator { margin: 6px 0; } + &.horizontal separator { margin: 0 $container_padding; } + &.vertical separator { margin: $container_padding 0; } + + // oldstyle toolbar buttons + button { + margin: 1px; + @extend %flat_button; + } .osd & { background-color: transparent; } @@ -1757,18 +1760,8 @@ toolbar { background-color: $osd_bg_color; box-shadow: $shadow_4; - &.toolbar { - padding: 0; - margin: 6px 8px 10px; - box-shadow: none; - background: none; - - > box.horizontal { - padding: $container_padding; - border-radius: $bt_radius + 4px; - background-color: $osd_bg_color; - box-shadow: $shadow_4; - } + scalebutton { + margin: 0; } &.left, @@ -1783,33 +1776,36 @@ toolbar { } } -// oldstyle toolbar buttons -.toolbar button { - margin: 1px; - @extend %flat_button; -} - searchbar { - > revealer > box { - padding: $container_padding; - border-spacing: $container_padding; + &:not(.inline) > revealer > box { border-style: solid; border-color: $solid_borders_color; - background-color: $bg_color; + background-color: $header_bg; border-width: 0 0 1px; - } - - .linked:not(.vertical) { - > entry { - margin-top: 0; - margin-bottom: 0; - } + box-shadow: none; + color: $header_fg; } // Close button on searchbar button.flat { @extend %circular_button; } + + > revealer > box { + padding: $container_padding; + border-spacing: $container_padding; + @extend %toolbar; + + entry { margin: 0; } + + .close { + min-width: 18px; + min-height: 18px; + padding: 4px; + border-radius: 50%; + @extend %circular_button; + } + } } actionbar > revealer > box { @@ -1817,9 +1813,12 @@ actionbar > revealer > box { border-spacing: $container_padding; border-top: 1px solid $borders_color; background-color: darken($bg_color, 3%); + box-shadow: none; - .background.csd revealer > & { - border-radius: 0 0 $wm_radius $wm_radius; + entry, button { margin: 0; } + + &, > box.start, > box.end { + border-spacing: $container_padding; } } @@ -1924,12 +1923,13 @@ actionbar > revealer > box { } headerbar { - min-height: $headerbar_size + 4px; + min-height: $headerbar_size; padding: 0 $container_padding + 10px; color: $header_fg; background-color: $header_bg; border-bottom: 1px solid $header_border; box-shadow: none; + margin: 0; &:backdrop { transition: $backdrop_transition; @@ -1952,6 +1952,16 @@ headerbar { @extend %dim-label; } + > windowhandle > box { + padding: 0; + + &, + > box.start, + > box.end { + border-spacing: $container_padding; + } + } + entry { @extend %headerbar_entrys; } button { @extend %headerbar_buttons; } @@ -2034,8 +2044,8 @@ headerbar { // Headerbar Switches switch { - margin-top: 10px; - margin-bottom: 10px; + margin-top: 0; + margin-bottom: 0; &:backdrop { opacity: 0.75; } } @@ -2046,21 +2056,6 @@ headerbar { } windowhandle { - viewswitcher { - button { - margin-top: 2px; - margin-bottom: 1px; - min-height: 0; - - > stack > box { - &.wide { - padding: 0 12px; - border-spacing: 0; - } - } - } - } - box.linked > button { background-color: $fill_color; @@ -2181,28 +2176,6 @@ headerbar { } } -headerbar { - > windowhandle > box { - &, - > box.start, - > box.end { - border-spacing: $container_padding; - } - } - - button { - min-height: 26px; - min-width: 22px; - } - - entry { // Reset entrys - min-height: 22px; - margin-left: 0; - margin-right: 0; - padding: 2px $container_padding * 2; - } -} - // // Pathbars // @@ -2441,18 +2414,19 @@ menubar { // // Popovers // -popover.background { - font: initial; // Decouple the font of popovers from their entry/textview +popover { + &.background { + background-color: transparent; + font: initial; + } > arrow, > contents { - padding: 0; color: $fg_color; background-clip: border-box; background-color: $menu_bg; box-shadow: 0 3px 6px 0 if($variant=='light', transparentize(black, 0.85), transparentize(black, 0.85)), 0 0 0 1px if($variant=='light', rgba($borders_color, 0.03), rgba($dark_borders_color, 0.55)); - border-radius: $wm_radius; border: 1px solid if($variant=='light', rgba($borders_color, 0.2), lighten($menu_bg, 6%)); } @@ -2462,7 +2436,7 @@ popover.background { > contents { padding: $container_padding; - border-radius: $mn_radius; + border-radius: $wm_radius; > list, > .view, @@ -2476,52 +2450,45 @@ popover.background { margin: $container_padding / 2; } - list separator { margin: 0; } - } + > scrolledwindow > viewport > stack > box { + padding: 0; + } - label.separator { - @extend %dim-label; - color: $fg_color; + listview.view { + padding: 0; + margin: 0; + + > row { + margin: 0; + padding: $container_padding / 2 $container_padding; + } + } } entry { background-color: mix($fg_color, $menu_bg, 5%); } - > list, - > .view, - > toolbar, - > scrolledwindow > viewport > list { - border-style: none; + .osd &, + &.touch-selection, + &.magnifier { background-color: transparent; - } - > scrolledwindow > viewport > list { - margin: $container_padding; + > arrow, + > contents { + @extend %osd; - row { - padding: $container_padding $container_padding * 2; - border-radius: $bt_radius; + border: none; + box-shadow: 0 3px 8px 0 rgba(black, 0.35); } } - &, .csd & { - &.osd, &.magnifier { @extend %osd; } - &.touch-selection { font: initial; } - - &.osd { @extend %osd; } - } - &.touch-selection, &.magnifier { button { @extend %osd_button; } } } -magnifier { - background-color: $base_color; -} - //touch selection handlebars for the Popover.osd above cursor-handle { background-color: transparent; @@ -2563,7 +2530,7 @@ popover.menu { button.circular.image-button.model { @extend %list_button; - padding: $container_padding + 4px; + padding: $container_padding; border: none; &:focus { @@ -2580,7 +2547,6 @@ popover.menu { & > arrow, &.background > contents { background-color: $menu_bg; - padding: $container_padding; color: $fg_color; } @@ -2702,10 +2668,6 @@ notebook { background-color: $base_color; } - .csd &:not(.frame), .csd &:not(.frame) > stack { - border-radius: 0 0 $wm_radius $wm_radius; - } - > header { @if $monterey == 'false' { background-color: darken($header_bg, 10%); @@ -2959,6 +2921,7 @@ scrollbar { background-color: transparent; transition: 300ms $ease-out-quad; + outline: none; // scrollbar border // &.top { border-bottom: 1px solid $borders_color; } @@ -2966,9 +2929,7 @@ scrollbar { // &.left { border-right: 1px solid $borders_color; } // &.right { border-left: 1px solid $borders_color; } - border: none; - - button { border: none; } + &, button { border: none; } &.vertical button { &.down { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); } @@ -2981,18 +2942,30 @@ scrollbar { } // slider - > range > trough > slider { - min-width: $container_padding - 2px; - min-height: $container_padding - 2px; - margin: -1px; - border: 4px solid transparent; - border-radius: $container_padding * 2; - background-clip: padding-box; - background-color: mix($fg_color, $bg_color, 40%); + > range > trough { + background: none; + padding: 0; + margin: 0; + border: none; + outline: none; + transition: none; - &:hover { background-color: mix($fg_color, $bg_color, 30%); } - &:hover:active { background-color: $header_button_checked_bg; } - &:disabled { background-color: transparent; } + > slider { + min-width: $container_padding - 2px; + min-height: $container_padding - 2px; + margin: -1px; + border: 4px solid transparent; + border-radius: $container_padding * 2; + background-clip: padding-box; + background-color: mix($fg_color, $bg_color, 40%); + box-shadow: none; + outline: none; + transition: all 200ms linear; + + &:hover { background-color: mix($fg_color, $bg_color, 30%); } + &:hover:active { background-color: mix($fg_color, $bg_color, 50%); } + &:disabled { background-color: transparent; } + } } > range.fine-tune { @@ -3006,17 +2979,32 @@ scrollbar { } &.overlay-indicator { + background: none; + color: inherit; + box-shadow: none; + padding: 0; + + > range > trough { + outline: none; + background: none; + + > slider { + outline: none; + } + } + &:not(.dragging):not(.hovering) { opacity: 0.4; border-color: transparent; background-color: transparent; + box-shadow: none; > range > trough > slider { margin: 0; min-width: $container_padding - 2px; min-height: $container_padding - 2px; background-color: mix($fg_color, $bg_color, 70%); - border: 1px solid $borders_color; + border: none; } &.horizontal > range > trough > slider { @@ -3076,6 +3064,7 @@ switch { min-width: 40px; min-height: 24px; font-size: 0; + padding: 0; box-shadow: inset 0 1px 2px rgba(black, 0.1); background-image: $switch_image, radial-gradient(circle farthest-corner at center, transparent 0%, transparent 0%); @@ -3105,6 +3094,7 @@ switch { min-width: 22px; min-height: 22px; margin: 1px 0 1px 1px; + padding: 0; border-radius: $circular_radius; background-color: white; box-shadow: 0 1px 2px rgba(black, 0.15); @@ -3248,16 +3238,20 @@ radio { check { border-radius: 3px; - &:checked { -gtk-icon-source: -gtk-recolor(url("assets/scalable/checkbox-checked-symbolic.svg")); } - &:indeterminate { -gtk-icon-source: -gtk-recolor(url("assets/scalable/checkbox-mixed-symbolic.svg")); } + &:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/checkbox-checked-symbolic.svg")), + -gtk-recolor(url("assets/scalable/checkbox-checked-symbolic@2.svg"))); } + &:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/checkbox-mixed-symbolic.svg")), + -gtk-recolor(url("assets/scalable/checkbox-mixed-symbolic@2.svg"))); } } %radio, radio { border-radius: $circular_radius; - &:checked { -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-checked-symbolic.svg")); } - &:indeterminate { -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-mixed-symbolic.svg")); } + &:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/radio-checked-symbolic.svg")), + -gtk-recolor(url("assets/scalable/radio-checked-symbolic@2.svg"))); } + &:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/radio-mixed-symbolic.svg")), + -gtk-recolor(url("assets/scalable/radio-mixed-symbolic@2.svg"))); } } // @@ -3353,18 +3347,18 @@ scale { border: 1px solid $_slider_border; border-radius: 100%; box-shadow: $shadow_2; - + background-clip: padding-box; transition: $button_transition; transition-property: background, border; + outline: none; &:hover { - background-color: lighten($selected_fg_color, 3%); - border-color: $_slider_border; - box-shadow: $shadow_0; - } + background-color: lighten($selected_fg_color, 3%); + border-color: $_slider_border; + box-shadow: $shadow_0; + } &:active { - background-clip: border-box; background-color: $selected_fg_color; border-color: $_slider_border; box-shadow: $shadow_3; @@ -3373,13 +3367,13 @@ scale { &:disabled { background-color: darken($selected_fg_color, 5%); border-color: darken($_slider_border, 5%); + box-shadow: none; } // Selected list-row and infobar sliders modelbutton:hover &, row:selected &, infobar & { - background-clip: border-box; background-color: $selected_fg_color; border-color: $selected_fg_color; @@ -3399,7 +3393,6 @@ scale { // OSD sliders .osd & { - background-clip: border-box; background-color: $selected_fg_color; border-color: $_slider_border; @@ -3446,6 +3439,7 @@ scale { } } } + &.horizontal { indicator { min-height: $_marks_length; @@ -3454,6 +3448,7 @@ scale { &.fine-tune indicator { min-height: ($_marks_length - 1px); } } + &.vertical { indicator { min-height: 1px; @@ -3466,7 +3461,7 @@ scale { // *WARNING* scale with marks madness following // FIXME: OSD and selected list rows missing, I don't feel like adding the other 144 assets needed for those... -// $suffix: if($variant == 'light', '', '-dark'); + // $suffix: if($variant == 'light', '', '-dark'); @each $dir_class, $dir_infix in ('horizontal', 'horz'), ('vertical', 'vert') { @@ -3477,8 +3472,9 @@ scale { (':active', '-active'), (':disabled', '-insensitive') { &.#{$dir_class}.#{$marks_class} { - slider { + transform: none; + &#{$state} { // an asymmetric slider asset is used here, so the margins are uneven, the smaller // margin is set on the point side. @@ -3801,9 +3797,12 @@ separator { min-width: 1px; min-height: 1px; - // &.vertical { - // background-color: if($variant=='light', $borders_color, $header_border); - // } + &.spacer { + background: none; + + &.horizontal { min-width: $container_padding * 2; } + &.vertical { min-height: $container_padding * 2; } + } } // @@ -3817,11 +3816,10 @@ list { color: $fg_color; > row { - padding: 2px; background-clip: padding-box; &.expander { padding: 0; } - &.expander .row-header { padding: 2px; } + &.expander .row-header { padding: $container_padding / 2; } } &.horizontal row.separator, @@ -3866,8 +3864,6 @@ list { listview.view { color: $fg_color; background-color: transparent; - - popover.menu & { padding: $container_padding / 2; } } %row_activatable { @@ -4220,55 +4216,11 @@ window.aboutdialog image.large-icons { // Filechooser // filechooser { - .csd & { - background-color: $base_color; - border-radius: 0 0 $wm_radius $wm_radius; - - > actionbar { - border-top: 1px solid $header_border; - background-color: $dark_sidebar_bg; - color: $dark_sidebar_fg; - border-radius: 0 0 $wm_radius $wm_radius; - - label, combobox { color: $dark_sidebar_fg; } - } - - paned { - stack { - &:dir(ltr) { border-radius: 0 0 (($wm_radius/1.5) + 2) 0 } - &:dir(rtl) { border-radius: 0 0 0 (($wm_radius/1.5) + 2) } - } - } - - 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; - } - } - } + paned.horizontal > separator { + background-image: image($header_border); } - > box.vertical > paned.horizontal > separator, - > box.vertical > box.vertical > paned.horizontal > separator { - border: none; - min-width: 1px; - background-image: image($dark_sidebar_border); - background-color: transparent; - - // &:dir(ltr) { margin-left: -1px; } - // &:dir(rtl) { margin-right: -1px; } - } - - #pathbarbox { border-bottom: 1px solid transparentize($borders_color, 0.5); } + #pathbarbox { border-bottom: 1px solid $borders_color; } } // Filechooser, we put this here to give a different style between csd and @@ -4287,12 +4239,12 @@ filechooserbutton:drop(active) { // Sidebar // %sidebar_left { - border-right: 1px solid $borders_color; + border-right: 1px solid $header_border; border-left-style: none; } %sidebar_right { - border-left: 1px solid $borders_color; + border-left: 1px solid $header_border; border-right-style: none; } @@ -4320,6 +4272,13 @@ filechooserbutton:drop(active) { paned & { &.left, &.right, &.left:dir(rtl), &:dir(rtl), &:dir(ltr), & { border: none; }} } +separator.sidebar { + &.left, &.right, &.left:dir(rtl), &:dir(rtl), &:dir(ltr), & { border: none; } + background-color: $header_border; + min-height: 1px; + min-width: 1px; +} + stacksidebar { list.separators:not(.horizontal) > row:not(.separator) { border-bottom: none; @@ -4342,17 +4301,17 @@ stacksidebar { // Navigation Sidebar .navigation-sidebar { - padding: 3px 0; //only vertical padding. horizontal row size would clip + padding: $container_padding / 2 0; //only vertical padding. horizontal row size would clip > separator { - margin: $container_padding / 2; + margin: $container_padding / 2 0; } > row { min-height: 36px; padding: 0 $container_padding + 2px; border-radius: $bt_radius; - margin: 0 3px 2px; + margin: 0 $container_padding / 2 2px; &:hover, &:focus-visible:focus-within { @@ -4491,6 +4450,7 @@ paned { background-color: transparent; background-image: _solid($solid_borders_color); background-size: 1px 1px; + box-shadow: none; &:selected { background-image: _solid($selected_bg_color); } @@ -4504,12 +4464,12 @@ paned { } &.horizontal > separator { - background-repeat: repeat-y; &:dir(ltr) { margin: 0 -8px 0 0; padding: 0 8px 0 0; background-position: left; } + &:dir(rtl) { margin: 0 0 0 -8px; padding: 0 0 0 8px; diff --git a/src/sass/gtk/_drawing.scss b/src/sass/gtk/_drawing.scss index fd62ded..aaa5454 100644 --- a/src/sass/gtk/_drawing.scss +++ b/src/sass/gtk/_drawing.scss @@ -312,7 +312,7 @@ // color: $osd_fg_color; border-color: $osd_button_border; - background-color: $osd_button_bg; + background-color: rgba(white, 0.08); box-shadow: none; } @@ -322,7 +322,7 @@ // color: $osd_fg_color; border-color: $osd_button_border; - background-color: opacify(lighten($osd_button_bg, 7%), 0.1); + background-color: rgba(white, 0.16); box-shadow: none; } @@ -332,7 +332,7 @@ // color: $selected_fg_color; border-color: $osd_button_border; - background-color: $selected_bg_color; + background-color: rgba(white, 0.25); background-image: none; box-shadow: none; background-clip: padding-box; @@ -344,7 +344,7 @@ // color: $osd_disabled_fg_color; border-color: $osd_button_border; - background-color: transparentize($osd_button_bg, 0.15); + background-color: rgba(white, 0.03); box-shadow: none; } diff --git a/src/sass/gtk/apps/_gnome-3.22.scss b/src/sass/gtk/apps/_gnome-3.22.scss index 1d2a9a1..e4a36b7 100644 --- a/src/sass/gtk/apps/_gnome-3.22.scss +++ b/src/sass/gtk/apps/_gnome-3.22.scss @@ -274,24 +274,6 @@ $nautilus_sidebar_image: image($dark_sidebar_bg); background: none; border: none; - &.overlay-indicator:not(.dragging):not(.hovering) slider { - background-color: rgba(lighten($dark_sidebar_fg, 15%), 0.35); - border: none; - } - - slider { - min-width: 4px; - background-color: transparentize(lighten($dark_sidebar_fg, 15%), 0.3); - - &:hover { background-color: lighten($dark_sidebar_fg, 20%); } - - &:hover:active { background-color: $header_button_checked_bg; } - - &:disabled { - background-color: transparent; - } - } - trough { background-color: transparent; } @@ -336,13 +318,39 @@ $nautilus_sidebar_image: image($dark_sidebar_bg); background-color: transparent; } } + + // >= 42.0 + &.windowhandle .linked.nautilus-path-bar { + background-color: $fill_color; + border-radius: $bt_radius; + margin: $container_padding 0 $container_padding $container_padding; + + .path-buttons-box > box > button { + margin-top: 0; + margin-bottom: 0; + + &.current-dir { + color: $header_fg; + + &:hover, &:active { + background: none; + box-shadow: none; + } + } + } + + > button.popup.toggle { + margin-top: 0; + margin-bottom: 0; + } + } } notebook { &.background.csd { background-color: transparent; } > header { - background-color: $base_color; + // background-color: $base_color; border-color: $header_border; } @@ -1973,8 +1981,8 @@ window.background.csd { > tab { @if $monterey == 'false' { @extend %tabs_tab; - border-top: none; border-top: 1px solid $borders_color; + &:checked { border-top-color: $header_bg; } } @else { @extend %monterey_tab; @@ -3139,9 +3147,7 @@ window.background.csd { window.background.csd.unified { headerbar { - box-shadow: none; - - &.selection-mode { + &, &.selection-mode { box-shadow: none; } } diff --git a/src/sass/gtk/apps/_gnome-40.0.scss b/src/sass/gtk/apps/_gnome-40.0.scss index c5c7267..eeb6ef3 100644 --- a/src/sass/gtk/apps/_gnome-40.0.scss +++ b/src/sass/gtk/apps/_gnome-40.0.scss @@ -46,3 +46,43 @@ window.nightthemeswitcher headerbar { background: $header_bg; color: $header_fg; } + + +// +// Gnome Control Center +// + +window.background.csd { + > contents { + > leaflet.unfolded > box { + > headerbar { + @extend %side_headerbar_left; + } + + > searchbar { + @extend %side_searchbar; + } + + > stack > widget > box > widget > headerbar, + > stack > widget > overlay > leaflet.folded > box > headerbar { + @extend %side_headerbar_right; + } + + > scrolledwindow > viewport > widget > stack { + > list.navigation-sidebar { + background-color: rgba($dark_sidebar_bg, 1); + + > separator { + background-color: transparent; + margin: 0; + min-height: 0; + } + } + + > box > list.navigation-sidebar { background-color: rgba($dark_sidebar_bg, 1); } + } + + > stack.background { background-color: $base_color; } + } + } +} diff --git a/src/sass/gtk/apps/_libadwaita.scss b/src/sass/gtk/apps/_libadwaita.scss index 8d5efb6..7f2ad3f 100644 --- a/src/sass/gtk/apps/_libadwaita.scss +++ b/src/sass/gtk/apps/_libadwaita.scss @@ -63,6 +63,21 @@ preferencesgroup > box { > box.single-line { min-height: 34px; } + + button.background-preview-button { + &, &:hover, &:active, &:checked { + background: none; + border: none; + box-shadow: none; + padding: $container_padding / 2; + border: 2px solid transparent; + border-radius: $bt_radius + $container_padding / 2; + } + + &:checked { + border: 2px solid $selected_bg_color; + } + } } // @@ -112,3 +127,265 @@ statuspage { } } } + + +// +// Cards +// + +.card { + @at-root %card, & { + @extend %circular_list; + + .osd &, &.osd { + background-color: gtkalpha(currentColor, .1); + color: inherit; + box-shadow: none; + } + } + + .osd &, &.osd { + &:focus:focus-visible { + outline-color: $fill_color; + } + } + + &.activatable { + transition: $button_transition; + + &:hover { + background-image: image(gtkalpha(currentColor, .03)); + } + + &:active { + background-image: image(gtkalpha(currentColor, .08)); + } + } +} + +// +// Toasts +// + +toast { + @extend %osd; + margin: $container_padding * 2; + margin-bottom: $container_padding * 3; + border-radius: $mn_radius; + border-spacing: $container_padding; + padding: $container_padding; + box-shadow: 0 3px 8px rgba(black, 0.35); + + &:dir(ltr) { padding-left: $container_padding * 2; } + &:dir(rtl) { padding-right: $container_padding * 2; } + + button { @extend %osd_button; } + + > widget { + margin: 0 $container_padding; + } +} + +// +// viewswitcher +// + +viewswitcher { + margin: 0; + + &.wide { + border-spacing: $container_padding / 2; + + button.toggle { margin: $container_padding 0; } + } + + &.narrow button.toggle { + border-radius: 0; + margin: 0; + min-height: 0; + } + + button.toggle { + font-weight: bold; + padding: 0; + + > stack > box { + &.narrow { + font-size: 0.75rem; + padding-top: $container_padding + 1px; + padding-bottom: $container_padding - 1px; + border-spacing: $container_padding - 2px; + + > stack > label { + padding-left: $container_padding + 2px; + padding-right: $container_padding + 2px; + } + } + + &.wide { + padding: 2px $container_padding * 2; + border-spacing: $container_padding; + } + } + } +} + +// AdwViewSwitcherBar + +viewswitcherbar actionbar > revealer > box { + padding: 0; +} + +// AdwViewSwitcherTitle + +viewswitchertitle viewswitcher { + margin-left: $container_padding * 2; + margin-right: $container_padding * 2; +} + +// AdwIndicatorBin + +indicatorbin { + > indicator, > mask { + min-width: $container_padding * 2; + min-height: $container_padding * 2; + border-radius: $circular_radius; + } + + > indicator { + margin: 1px; + background: gtkalpha(currentColor, .4); + + > label { + font-size: 0.6rem; + font-weight: bold; + padding: 1px 4px; + color: white; + } + } + + > mask { + padding: 1px; + background: black; + } + + &.needs-attention > indicator { + background: $selected_bg_color; + + > label { color: $selected_fg_color; } + } +} + + +// +// Tab View +// + +tabbar { + .box { + min-height: $menuitem_size; + } + + tabbox { + > separator { + &.hidden { + opacity: 0; + } + } + + > revealer > indicator { + min-width: 2px; + border-radius: 2px; + background: gtkalpha($selected_bg_color, 0.5); + } + } + + .start-action, + .end-action { + padding: $container_padding; + } + + .start-action:dir(ltr), + .end-action:dir(rtl) { + padding-right: 0; + } + + .start-action:dir(rtl), + .end-action:dir(ltr) { + padding-left: 0; + } + + &:not(.inline) { + .box { + background-color: $bg_color; + color: $text_color; + margin-top: -1px; + + @if $monterey == 'false' { + padding: 0; + box-shadow: inset 0 -1px $borders_color; + border-bottom: none; + } @else { + border-bottom: 1px solid $borders_color; + padding: 0 $container_padding / 2 $container_padding / 2; + } + } + + &:backdrop .box { + > scrolledwindow, + > .start-action, + > .end-action { + filter: opacity(0.5); + } + } + } +} + +dnd tab { + background-color: $base_color; + color: $text_color; + box-shadow: none; + margin: $container_padding * 4; +} + +tabbar, +dnd { + tab { + padding-right: $container_padding / 2; + margin: 0; + + @if $monterey == 'false' { + @extend %tabs_tab; + } @else { + @extend %monterey_tab; + + + tab { + margin-left: $container_padding / 2; + } + } + + button.tab-close-button { + border-radius: 3px; + min-height: $small_size; + min-width: $small_size; + padding: 0; + } + + indicator { + min-height: 2px; + border-radius: 2px; + background: gtkalpha($selected_bg_color, 0.5); + } + } +} + +tabview:drop(active), +tabbox:drop(active) { + box-shadow: none; +} + +// Sidebar + +.unfolded stacksidebar.sidebar { + border: none; +} diff --git a/src/sass/gtk/apps/_misc.scss b/src/sass/gtk/apps/_misc.scss index df25e21..92f92cc 100644 --- a/src/sass/gtk/apps/_misc.scss +++ b/src/sass/gtk/apps/_misc.scss @@ -87,11 +87,6 @@ window.background:not(.csd) { padding: 4px 6px; > label:disabled { color: $disabled_fg_color; } - - > radio, - > check { - padding: 0 2px 0 4px; - } } > window > menu { @@ -683,3 +678,15 @@ window.background.csd { border: none; } } + +// +// Cinnamon setting +// + +frame.view list > row { + button.gtkstyle-fallback { + padding: $container_padding; + + > image { border-radius: 3px; } + } +}