From 83137a49903db121060f6011d434b7d59ad7cb26 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Mon, 1 Oct 2018 12:07:54 +0800 Subject: [PATCH] update --- Install | 212 ------------------ README.md | 27 ++- install.sh | 184 +++++++-------- .../activities.svg} | 0 .../calendar-arrow-left.svg} | 0 .../calendar-arrow-right.svg} | 0 .../checkbox-off.svg} | 0 .../close-dark.svg => assets-dark/close.svg} | 0 .../key-hide.svg} | 0 .../key-layout.svg} | 0 .../key-shift.svg} | 0 .../no-events.svg} | 0 .../no-notifications.svg} | 0 .../toggle-off.svg} | 0 .../{activities-light.svg => activities.svg} | 0 ...left-light.svg => calendar-arrow-left.svg} | 0 ...ght-light.svg => calendar-arrow-right.svg} | 0 ...heckbox-off-light.svg => checkbox-off.svg} | 0 .../assets/{close-light.svg => close.svg} | 0 .../{key-hide-light.svg => key-hide.svg} | 0 .../{key-layout-light.svg => key-layout.svg} | 0 .../{key-shift-light.svg => key-shift.svg} | 0 .../{no-events-light.svg => no-events.svg} | 0 ...cations-light.svg => no-notifications.svg} | 0 .../{toggle-off-light.svg => toggle-off.svg} | 0 .../{assets => common-assets}/checkbox.svg | 0 .../dash-placeholder.svg | 0 .../dash/bottom-running1-focused.svg | 0 .../dash/bottom-running1.svg | 0 .../dash/bottom-running2-focused.svg | 0 .../dash/bottom-running2.svg | 0 .../dash/bottom-running3-focused.svg | 0 .../dash/bottom-running3.svg | 0 .../dash/bottom-running4-focused.svg | 0 .../dash/bottom-running4.svg | 0 .../dash/left-running1-focused.svg | 0 .../dash/left-running1.svg | 0 .../dash/left-running2-focused.svg | 0 .../dash/left-running2.svg | 0 .../dash/left-running3-focused.svg | 0 .../dash/left-running3.svg | 0 .../dash/left-running4-focused.svg | 0 .../dash/left-running4.svg | 0 .../dash/right-running1-focused.svg | 0 .../dash/right-running1.svg | 0 .../dash/right-running2-focused.svg | 0 .../dash/right-running2.svg | 0 .../dash/right-running3-focused.svg | 0 .../dash/right-running3.svg | 0 .../dash/right-running4-focused.svg | 0 .../dash/right-running4.svg | 0 .../dash/top-running1-focused.svg | 0 .../dash/top-running1.svg | 0 .../dash/top-running2-focused.svg | 0 .../dash/top-running2.svg | 0 .../dash/top-running3-focused.svg | 0 .../dash/top-running3.svg | 0 .../dash/top-running4-focused.svg | 0 .../dash/top-running4.svg | 0 .../{assets => common-assets}/key-enter.svg | 0 .../key-shift-latched-uppercase.svg | 0 .../key-shift-uppercase.svg | 0 .../more-results.svg | 0 .../noise-texture.svg | 0 .../process-working.svg | 0 .../{assets => common-assets}/startup.png | Bin .../{assets => common-assets}/toggle-on.svg | 0 .../window-close-active.svg | 0 .../window-close.svg | 0 src/gtk-2.0/{ => common}/apps.rc | 0 src/gtk-2.0/{ => common}/main.rc | 0 src/gtk-2.0/{ => common}/panel.rc | 0 src/gtk-2.0/{ => common}/xfce-notify.rc | 0 73 files changed, 105 insertions(+), 318 deletions(-) delete mode 100755 Install rename src/gnome-shell/{assets/activities-dark.svg => assets-dark/activities.svg} (100%) rename src/gnome-shell/{assets/calendar-arrow-left-dark.svg => assets-dark/calendar-arrow-left.svg} (100%) rename src/gnome-shell/{assets/calendar-arrow-right-dark.svg => assets-dark/calendar-arrow-right.svg} (100%) rename src/gnome-shell/{assets/checkbox-off-dark.svg => assets-dark/checkbox-off.svg} (100%) rename src/gnome-shell/{assets/close-dark.svg => assets-dark/close.svg} (100%) rename src/gnome-shell/{assets/key-hide-dark.svg => assets-dark/key-hide.svg} (100%) rename src/gnome-shell/{assets/key-layout-dark.svg => assets-dark/key-layout.svg} (100%) rename src/gnome-shell/{assets/key-shift-dark.svg => assets-dark/key-shift.svg} (100%) rename src/gnome-shell/{assets/no-events-dark.svg => assets-dark/no-events.svg} (100%) rename src/gnome-shell/{assets/no-notifications-dark.svg => assets-dark/no-notifications.svg} (100%) rename src/gnome-shell/{assets/toggle-off-dark.svg => assets-dark/toggle-off.svg} (100%) rename src/gnome-shell/assets/{activities-light.svg => activities.svg} (100%) rename src/gnome-shell/assets/{calendar-arrow-left-light.svg => calendar-arrow-left.svg} (100%) rename src/gnome-shell/assets/{calendar-arrow-right-light.svg => calendar-arrow-right.svg} (100%) rename src/gnome-shell/assets/{checkbox-off-light.svg => checkbox-off.svg} (100%) rename src/gnome-shell/assets/{close-light.svg => close.svg} (100%) rename src/gnome-shell/assets/{key-hide-light.svg => key-hide.svg} (100%) rename src/gnome-shell/assets/{key-layout-light.svg => key-layout.svg} (100%) rename src/gnome-shell/assets/{key-shift-light.svg => key-shift.svg} (100%) rename src/gnome-shell/assets/{no-events-light.svg => no-events.svg} (100%) rename src/gnome-shell/assets/{no-notifications-light.svg => no-notifications.svg} (100%) rename src/gnome-shell/assets/{toggle-off-light.svg => toggle-off.svg} (100%) rename src/gnome-shell/{assets => common-assets}/checkbox.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash-placeholder.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/bottom-running1-focused.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/bottom-running1.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/bottom-running2-focused.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/bottom-running2.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/bottom-running3-focused.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/bottom-running3.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/bottom-running4-focused.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/bottom-running4.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/left-running1-focused.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/left-running1.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/left-running2-focused.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/left-running2.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/left-running3-focused.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/left-running3.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/left-running4-focused.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/left-running4.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/right-running1-focused.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/right-running1.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/right-running2-focused.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/right-running2.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/right-running3-focused.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/right-running3.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/right-running4-focused.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/right-running4.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/top-running1-focused.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/top-running1.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/top-running2-focused.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/top-running2.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/top-running3-focused.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/top-running3.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/top-running4-focused.svg (100%) rename src/gnome-shell/{assets => common-assets}/dash/top-running4.svg (100%) rename src/gnome-shell/{assets => common-assets}/key-enter.svg (100%) rename src/gnome-shell/{assets => common-assets}/key-shift-latched-uppercase.svg (100%) rename src/gnome-shell/{assets => common-assets}/key-shift-uppercase.svg (100%) rename src/gnome-shell/{assets => common-assets}/more-results.svg (100%) rename src/gnome-shell/{assets => common-assets}/noise-texture.svg (100%) rename src/gnome-shell/{assets => common-assets}/process-working.svg (100%) rename src/gnome-shell/{assets => common-assets}/startup.png (100%) rename src/gnome-shell/{assets => common-assets}/toggle-on.svg (100%) rename src/gnome-shell/{assets => common-assets}/window-close-active.svg (100%) rename src/gnome-shell/{assets => common-assets}/window-close.svg (100%) rename src/gtk-2.0/{ => common}/apps.rc (100%) rename src/gtk-2.0/{ => common}/main.rc (100%) rename src/gtk-2.0/{ => common}/panel.rc (100%) rename src/gtk-2.0/{ => common}/xfce-notify.rc (100%) diff --git a/Install b/Install deleted file mode 100755 index 1c705d8..0000000 --- a/Install +++ /dev/null @@ -1,212 +0,0 @@ -#!/bin/bash - -ROOT_UID=0 -DEST_DIR= - -# Destination directory -if [ "$UID" -eq "$ROOT_UID" ]; then - DEST_DIR="/usr/share/themes" -else - DEST_DIR="$HOME/.themes" -fi - -repodir=$(cd $(dirname $0) && pwd) -srcdir=${repodir}/src - -# Copying files -for compact in '' '-compact' ; do - for color in '-light' '-dark'; do - for trans in '' '-solid' ; do - for thin in '' '-thin' ; do - echo -e " Installing Sierra${compact}${color}${trans}${thin} ..." - - rm -rf $DEST_DIR/Sierra${compact}${color}${trans}${thin} - themedir=$DEST_DIR/Sierra${compact}${color}${trans}${thin} - install -d ${themedir} - - # Install index.theme - echo "[Desktop Entry]" >> ${themedir}/index.theme - echo "Type=X-GNOME-Metatheme" >> ${themedir}/index.theme - echo "Name=Sierra${compact}${color}${trans}${thin}" >> ${themedir}/index.theme - echo "Comment=An Stylish Gtk+ theme based on Elegant Design" >> ${themedir}/index.theme - echo "Encoding=UTF-8" >> ${themedir}/index.theme - echo "" >> ${themedir}/index.theme - echo "[X-GNOME-Metatheme]" >> ${themedir}/index.theme - echo "GtkTheme=Sierra${compact}${color}${trans}${thin}" >> ${themedir}/index.theme - echo "MetacityTheme=Sierra${compact}${color}${trans}${thin}" >> ${themedir}/index.theme - echo "IconTheme=Adwaita" >> ${themedir}/index.theme - echo "CursorTheme=Adwaita" >> ${themedir}/index.theme - echo "ButtonLayout=close,minimize,maximize:menu" >> ${themedir}/index.theme - - # Install GNOME Shell Theme - install -d ${themedir}/gnome-shell - cd ${srcdir}/gnome-shell - - cp -ur \ - gnome-shell${color}${trans}.css \ - ${themedir}/gnome-shell/gnome-shell.css - - cp -ur \ - extensions \ - pad-osd.css \ - message-indicator-symbolic.svg \ - ${themedir}/gnome-shell - - install -d ${themedir}/gnome-shell/assets - cd ${srcdir}/gnome-shell/assets - - cp -ur \ - dash \ - dash-placeholder.svg \ - noise-texture.svg \ - startup.png \ - process-working.svg \ - window-close.svg \ - window-close-active.svg \ - toggle-on.svg \ - more-results.svg \ - checkbox.svg \ - key-enter.svg \ - key-shift-latched-uppercase.svg \ - key-shift-uppercase.svg \ - ${themedir}/gnome-shell/assets - - cp -ur \ - activities${color}.svg \ - ${themedir}/gnome-shell/assets/activities.svg - - cp -ur \ - no-events${color}.svg \ - ${themedir}/gnome-shell/assets/no-events.svg - - cp -ur \ - no-notifications${color}.svg \ - ${themedir}/gnome-shell/assets/no-notifications.svg - - cp -ur \ - calendar-arrow-left${color}.svg \ - ${themedir}/gnome-shell/assets/calendar-arrow-left.svg - - cp -ur \ - calendar-arrow-right${color}.svg \ - ${themedir}/gnome-shell/assets/calendar-arrow-right.svg - - cp -ur \ - checkbox-off${color}.svg \ - ${themedir}/gnome-shell/assets/checkbox-off.svg - - cp -ur \ - close${color}.svg \ - ${themedir}/gnome-shell/assets/close.svg - - cp -ur \ - toggle-off${color}.svg \ - ${themedir}/gnome-shell/assets/toggle-off.svg - - cp -ur \ - key-hide${color}.svg \ - ${themedir}/gnome-shell/assets/key-hide.svg - - cp -ur \ - key-layout${color}.svg \ - ${themedir}/gnome-shell/assets/key-layout.svg - - cp -ur \ - key-shift${color}.svg \ - ${themedir}/gnome-shell/assets/key-shift.svg - - cd ${themedir}/gnome-shell - ln -s assets/no-events.svg no-events.svg - ln -s assets/process-working.svg process-working.svg - ln -s assets/no-notifications.svg no-notifications.svg - - # cd ${srcdir}/gnome-shell - # glib-compile-resources \ - # --sourcedir=${themedir}/gnome-shell \ - # --target=${themedir}/gnome-shell/gnome-shell-theme.gresource \ - # gnome-shell-theme.gresource.xml - - # Install GTK+ 2 Theme - install -d ${themedir}/gtk-2.0 - cd ${srcdir}/gtk-2.0 - - cp -ur \ - gtkrc${color} \ - ${themedir}/gtk-2.0/gtkrc - - cp -ur \ - assets${color} \ - ${themedir}/gtk-2.0/assets - - cp -ur \ - apps.rc \ - main.rc \ - panel.rc \ - xfce-notify.rc \ - ${themedir}/gtk-2.0 - - cp -ur \ - menubar-toolbar${color}.rc \ - ${themedir}/gtk-2.0/menubar-toolbar.rc - - # Install GTK+ 3 Theme - install -d ${themedir}/gtk-3.0 - cd ${srcdir}/gtk-3.0 - cp -ur \ - assets \ - ${themedir}/gtk-3.0 - - cp -ur \ - thumbnail${compact}${color}.png \ - ${themedir}/gtk-3.0/thumbnail.png - - cp -ur \ - gtk${compact}${color}${trans}${thin}.css \ - ${themedir}/gtk-3.0/gtk.css - - cp -ur \ - gtk${compact}-dark${trans}${thin}.css \ - ${themedir}/gtk-3.0/gtk-dark.css - - # Install Metacity Theme - install -d ${themedir}/metacity-1 - cd ${srcdir}/metacity-1 - - cp -ur \ - metacity-theme${color}.xml \ - ${themedir}/metacity-1/metacity-theme.xml - - cp -ur \ - *.png \ - *.svg \ - ${themedir}/metacity-1 - - cd ${themedir}/metacity-1 - ln -s metacity-theme.xml metacity-theme-1.xml - ln -s metacity-theme.xml metacity-theme-2.xml - ln -s metacity-theme.xml metacity-theme-3.xml - - # Install Unity Theme - install -d ${themedir}/unity - cd ${srcdir} - cp -ur \ - unity \ - ${themedir} - - # Install xfwm4 Theme - install -d ${themedir}/xfwm4 - cd ${srcdir}/xfwm4 - - cp -ur \ - assets${color}/*.png \ - ${themedir}/xfwm4 - - cp -ur \ - themerc${color} \ - ${themedir}/xfwm4/themerc - - done - done - done -done - diff --git a/README.md b/README.md index 03b80cc..d533fbd 100644 --- a/README.md +++ b/README.md @@ -57,23 +57,23 @@ sudo apt install sierra-gtk-theme-git # git master branch ### From source -Open the terminal at current directory. - Run - sudo ./install.sh - -When running the installer script in ubuntu16.04 or later, if you had this error: - - XMLLINT not set and xmllint not found in path; skipping xml preprocessing. + ./install.sh -To fix it you have to install libxml2-utils +#### Install tips - sudo apt install libxml2-utils +Usage: `./Install` **[OPTIONS...]** -When running the installer script in Fedora 24 or later, you need to install 'glib2-devel'. - - sudo dnf install glib2-devel +| OPTIONS: | | +|:--------------------|:-------------| +|-d, --dest | Specify theme destination directory (Default: $HOME/.themes)| +|-n, --name | Specify theme name (Default: Sierra)| +|-c, --color | Specify theme color variant(s) **[light/dark]** (Default: All variants)| +|-t, --trans | Specify theme transparent variant(s) **[standard/solid]** (Default: All variants)| +|-s, --size | Specify theme size variant(s) **[standard/compact]** (Default: All variants)| +|-g, --gdm | Install GDM theme| +|-h, --help | Show this help| ## Screenshots @@ -84,5 +84,4 @@ When running the installer script in Fedora 24 or later, you need to install 'gl ![02](https://github.com/vinceliuice/Sierra-gtk-theme/blob/imgs/screenshot2.jpeg?raw=true) ![03](https://github.com/vinceliuice/Sierra-gtk-theme/blob/imgs/screenshot3.jpeg?raw=true) ![04](https://github.com/vinceliuice/Sierra-gtk-theme/blob/imgs/screenshot4.jpeg?raw=true) -![05](https://github.com/vinceliuice/Sierra-gtk-theme/blob/imgs/screenshot5.jpeg?raw=true) - +![05](https://github.com/vinceliuice/Sierra-gtk-theme/blob/imgs/screenshot5.jpeg?raw=true) \ No newline at end of file diff --git a/install.sh b/install.sh index e77a0af..fe4ef25 100755 --- a/install.sh +++ b/install.sh @@ -5,9 +5,18 @@ REPO_DIR=$(cd $(dirname $0) && pwd) SRC_DIR=${REPO_DIR}/src -DEST_DIR=/usr/share/themes +ROOT_UID=0 +DEST_DIR= + +# Destination directory +if [ "$UID" -eq "$ROOT_UID" ]; then + DEST_DIR="/usr/share/themes" +else + DEST_DIR="$HOME/.themes" +fi + THEME_NAME=Sierra -COMPACT_VARIANTS=('' '-compact') +SIZE_VARIANTS=('' '-compact') TRANS_VARIANTS=('' '-solid') COLOR_VARIANTS=('-light' '-dark') THIN_VARIANTS=('' '-thin') @@ -17,10 +26,10 @@ usage() { printf "\n%s\n" "OPTIONS:" printf " %-25s%s\n" "-d, --dest DIR" "Specify theme destination directory (Default: ${DEST_DIR})" printf " %-25s%s\n" "-n, --name NAME" "Specify theme name (Default: ${THEME_NAME})" - printf " %-25s%s\n" "-t, --trans VARIANTS..." "Specify theme trans variant(s) [solid] (Default: All variants)" - printf " %-25s%s\n" "-c, --color VARIANTS..." "Specify theme color variant(s) [light|dark] (Default: All variants)" - printf " %-25s%s\n" "-i, --thin VARIANTS..." "Specify theme trans variant(s) [thin] (Default: All variants)" - printf " %-25s%s\n" "-s, --compact VARIANT" "Specify theme compact variant [compact] (Default: All variants)" + printf " %-25s%s\n" "-t, --trans VARIANTS" "Specify theme trans variant(s) [standard|solid] (Default: All variants)" + printf " %-25s%s\n" "-c, --color VARIANTS" "Specify theme color variant(s) [light|dark] (Default: All variants)" + printf " %-25s%s\n" "-i, --thin VARIANTS" "Specify theme titilebutton variant(s) [standard|thin] (Default: All variants)" + printf " %-25s%s\n" "-s, --size VARIANT" "Specify theme compact variant [standard|compact] (Default: All variants)" printf " %-25s%s\n" "-g, --gdm" "Install GDM theme" printf " %-25s%s\n" "-h, --help" "Show this help" printf "\n%s\n" "INSTALLATION EXAMPLES:" @@ -37,7 +46,7 @@ usage() { install() { local dest=${1} local name=${2} - local compact=${3} + local size=${3} local color=${4} local trans=${5} local thin=${6} @@ -45,83 +54,67 @@ install() { [[ ${color} == '-light' ]] && local ELSE_LIGHT=${color} [[ ${color} == '-dark' ]] && local ELSE_DARK=${color} - local THEME_DIR=${dest}/${name}${compact}${color}${trans}${thin} + local THEME_DIR=${dest}/${name}${size}${color}${trans}${thin} [[ -d ${THEME_DIR} ]] && rm -rf ${THEME_DIR} echo "Installing '${THEME_DIR}'..." - mkdir -p ${THEME_DIR} - cp -r ${REPO_DIR}/COPYING ${THEME_DIR} - # Install index.theme - echo "[Desktop Entry]" >> ${THEME_DIR}/index.theme - echo "Type=X-GNOME-Metatheme" >> ${THEME_DIR}/index.theme - echo "Name=${name}${compact}${color}${trans}${thin}" >> ${THEME_DIR}/index.theme - echo "Comment=An Stylish Gtk+ theme based on Elegant Design" >> ${THEME_DIR}/index.theme - echo "Encoding=UTF-8" >> ${THEME_DIR}/index.theme - echo "" >> ${THEME_DIR}/index.theme - echo "[X-GNOME-Metatheme]" >> ${THEME_DIR}/index.theme - echo "GtkTheme=${name}${compact}${color}${trans}${thin}" >> ${THEME_DIR}/index.theme - echo "MetacityTheme=${name}${compact}${color}${trans}${thin}" >> ${THEME_DIR}/index.theme - echo "IconTheme=Adwaita" >> ${THEME_DIR}/index.theme - echo "CursorTheme=Adwaita" >> ${THEME_DIR}/index.theme - echo "ButtonLayout=close,minimize,maximize:menu" >> ${THEME_DIR}/index.theme + mkdir -p ${THEME_DIR} + cp -ur ${REPO_DIR}/COPYING ${THEME_DIR} - mkdir -p ${THEME_DIR}/gnome-shell - cd ${SRC_DIR}/gnome-shell - cp -r ${SRC_DIR}/gnome-shell/gnome-shell${color}${trans}.css ${THEME_DIR}/gnome-shell/gnome-shell.css - cp -r ${SRC_DIR}/gnome-shell/{extensions,message-indicator-symbolic.svg,pad-osd.css} ${THEME_DIR}/gnome-shell + # Install index.theme + echo "[Desktop Entry]" >> ${THEME_DIR}/index.theme + echo "Type=X-GNOME-Metatheme" >> ${THEME_DIR}/index.theme + echo "Name=${name}${size}${color}${trans}${thin}" >> ${THEME_DIR}/index.theme + echo "Comment=An Stylish Gtk+ theme based on Elegant Design" >> ${THEME_DIR}/index.theme + echo "Encoding=UTF-8" >> ${THEME_DIR}/index.theme + echo "" >> ${THEME_DIR}/index.theme + echo "[X-GNOME-Metatheme]" >> ${THEME_DIR}/index.theme + echo "GtkTheme=${name}${size}${color}${trans}${thin}" >> ${THEME_DIR}/index.theme + echo "MetacityTheme=${name}${size}${color}${trans}${thin}" >> ${THEME_DIR}/index.theme + echo "IconTheme=Adwaita" >> ${THEME_DIR}/index.theme + echo "CursorTheme=Adwaita" >> ${THEME_DIR}/index.theme + echo "ButtonLayout=close,minimize,maximize:menu" >> ${THEME_DIR}/index.theme + # Install index.theme - mkdir -p ${THEME_DIR}/gnome-shell/assets - cd ${SRC_DIR}/gnome-shell/assets - cp -r ${SRC_DIR}/gnome-shell/assets/{dash,dash-placeholder.svg,noise-texture.svg,startup.png,process-working.svg,window-close.svg,window-close-active.svg,toggle-on.svg,more-results.svg,checkbox.svg,key-enter.svg,key-shift-latched-uppercase.svg,key-shift-uppercase.svg} ${THEME_DIR}/gnome-shell/assets - cp -r ${SRC_DIR}/gnome-shell/assets/activities${color}.svg ${THEME_DIR}/gnome-shell/assets/activities.svg - cp -r ${SRC_DIR}/gnome-shell/assets/no-events${color}.svg ${THEME_DIR}/gnome-shell/assets/no-events.svg - cp -r ${SRC_DIR}/gnome-shell/assets/no-notifications${color}.svg ${THEME_DIR}/gnome-shell/assets/no-notifications.svg - cp -r ${SRC_DIR}/gnome-shell/assets/calendar-arrow-left${color}.svg ${THEME_DIR}/gnome-shell/assets/calendar-arrow-left.svg - cp -r ${SRC_DIR}/gnome-shell/assets/calendar-arrow-right${color}.svg ${THEME_DIR}/gnome-shell/assets/calendar-arrow-right.svg - cp -r ${SRC_DIR}/gnome-shell/assets/checkbox-off${color}.svg ${THEME_DIR}/gnome-shell/assets/checkbox-off.svg - cp -r ${SRC_DIR}/gnome-shell/assets/close${color}.svg ${THEME_DIR}/gnome-shell/assets/close.svg - cp -r ${SRC_DIR}/gnome-shell/assets/toggle-off${color}.svg ${THEME_DIR}/gnome-shell/assets/toggle-off.svg - cp -r ${SRC_DIR}/gnome-shell/assets/key-hide${color}.svg ${THEME_DIR}/gnome-shell/assets/key-hide.svg - cp -r ${SRC_DIR}/gnome-shell/assets/key-layout${color}.svg ${THEME_DIR}/gnome-shell/assets/key-layout.svg - cp -r ${SRC_DIR}/gnome-shell/assets/key-shift${color}.svg ${THEME_DIR}/gnome-shell/assets/key-shift.svg + mkdir -p ${THEME_DIR}/gnome-shell + cp -ur ${SRC_DIR}/gnome-shell/{extensions,message-indicator-symbolic.svg,pad-osd.css} ${THEME_DIR}/gnome-shell + cp -ur ${SRC_DIR}/gnome-shell/gnome-shell${color}${trans}.css ${THEME_DIR}/gnome-shell/gnome-shell.css + cp -ur ${SRC_DIR}/gnome-shell/common-assets ${THEME_DIR}/gnome-shell/assets + cp -ur ${SRC_DIR}/gnome-shell/assets${ELSE_DARK}/*.svg ${THEME_DIR}/gnome-shell/assets cd ${THEME_DIR}/gnome-shell ln -s assets/no-events.svg no-events.svg ln -s assets/process-working.svg process-working.svg ln -s assets/no-notifications.svg no-notifications.svg - mkdir -p ${THEME_DIR}/gtk-2.0 - cd ${SRC_DIR}/gtk-2.0 - cp -r ${SRC_DIR}/gtk-2.0/gtkrc${color} ${THEME_DIR}/gtk-2.0/gtkrc - cp -r ${SRC_DIR}/gtk-2.0/assets${color} ${THEME_DIR}/gtk-2.0/assets - cp -r ${SRC_DIR}/gtk-2.0/{apps.rc,main.rc,panel.rc,xfce-notify.rc} ${THEME_DIR}/gtk-2.0 - cp -r ${SRC_DIR}/gtk-2.0/menubar-toolbar${color}.rc ${THEME_DIR}/gtk-2.0/menubar-toolbar.rc + mkdir -p ${THEME_DIR}/gtk-2.0 + cp -ur ${SRC_DIR}/gtk-2.0/gtkrc${color} ${THEME_DIR}/gtk-2.0/gtkrc + cp -ur ${SRC_DIR}/gtk-2.0/assets${color} ${THEME_DIR}/gtk-2.0/assets + cp -ur ${SRC_DIR}/gtk-2.0/common/*.rc ${THEME_DIR}/gtk-2.0 + cp -ur ${SRC_DIR}/gtk-2.0/menubar-toolbar${color}.rc ${THEME_DIR}/gtk-2.0/menubar-toolbar.rc - mkdir -p ${THEME_DIR}/gtk-3.0 - cd ${SRC_DIR}/gtk-3.0 - cp -r ${SRC_DIR}/gtk-3.0/assets ${THEME_DIR}/gtk-3.0 - cp -r ${SRC_DIR}/gtk-3.0/thumbnail${compact}${color}.png ${THEME_DIR}/gtk-3.0/thumbnail.png - cp -r ${SRC_DIR}/gtk-3.0/gtk${compact}${color}${trans}${thin}.css ${THEME_DIR}/gtk-3.0/gtk.css - cp -r ${SRC_DIR}/gtk-3.0/gtk${compact}-dark${trans}${thin}.css ${THEME_DIR}/gtk-3.0/gtk-dark.css + mkdir -p ${THEME_DIR}/gtk-3.0 + cp -ur ${SRC_DIR}/gtk-3.0/assets ${THEME_DIR}/gtk-3.0 + cp -ur ${SRC_DIR}/gtk-3.0/thumbnail${size}${color}.png ${THEME_DIR}/gtk-3.0/thumbnail.png + cp -ur ${SRC_DIR}/gtk-3.0/gtk${size}${color}${trans}${thin}.css ${THEME_DIR}/gtk-3.0/gtk.css + [[ ${color} != '-dark' ]] && \ + cp -ur ${SRC_DIR}/gtk-3.0/gtk${size}-dark${trans}${thin}.css ${THEME_DIR}/gtk-3.0/gtk-dark.css - mkdir -p ${THEME_DIR}/metacity-1 - cd ${SRC_DIR}/metacity-1 - cp -r ${SRC_DIR}/metacity-1/metacity-theme${color}.xml ${THEME_DIR}/metacity-1/metacity-theme.xml - cp -r ${SRC_DIR}/metacity-1/{*.png,*.svg} ${THEME_DIR}/metacity-1 + mkdir -p ${THEME_DIR}/metacity-1 + cp -ur ${SRC_DIR}/metacity-1/metacity-theme${color}.xml ${THEME_DIR}/metacity-1/metacity-theme.xml + cp -ur ${SRC_DIR}/metacity-1/{*.png,*.svg} ${THEME_DIR}/metacity-1 cd ${THEME_DIR}/metacity-1 ln -s metacity-theme.xml metacity-theme-1.xml ln -s metacity-theme.xml metacity-theme-2.xml ln -s metacity-theme.xml metacity-theme-3.xml - mkdir -p ${THEME_DIR}/unity - cd ${SRC_DIR} - cp -r ${SRC_DIR}/unity ${THEME_DIR} + mkdir -p ${THEME_DIR}/unity + cp -ur ${SRC_DIR}/unity ${THEME_DIR} - mkdir -p ${THEME_DIR}/xfwm4 - cd ${SRC_DIR}/xfwm4 - cp -r ${SRC_DIR}/xfwm4/assets${color}/*.png ${THEME_DIR}/xfwm4 - cp -r ${SRC_DIR}/xfwm4/themerc${color} ${THEME_DIR}/xfwm4/themerc + mkdir -p ${THEME_DIR}/xfwm4 + cp -ur ${SRC_DIR}/xfwm4/assets${color}/*.png ${THEME_DIR}/xfwm4 + cp -ur ${SRC_DIR}/xfwm4/themerc${color} ${THEME_DIR}/xfwm4/themerc } install_gdm() { @@ -161,13 +154,17 @@ while [[ $# -gt 0 ]]; do shift 2 ;; -g|--gdm) - gdm=true + gdm='true' shift 1 ;; -t|--trans) shift - for variant in "${@}"; do - case "${variant}" in + for trans in "${@}"; do + case "${trans}" in + standard) + transs+=("${TRANS_VARIANTS[0]}") + shift + ;; solid) transs+=("${TRANS_VARIANTS[1]}") shift @@ -185,14 +182,14 @@ while [[ $# -gt 0 ]]; do ;; -c|--color) shift - for variant in "${@}"; do - case "${variant}" in + for color in "${@}"; do + case "${color}" in light) - colors+=("${COLOR_VARIANTS[1]}") + colors+=("${COLOR_VARIANTS[0]}") shift ;; dark) - colors+=("${COLOR_VARIANTS[2]}") + colors+=("${COLOR_VARIANTS[1]}") shift ;; -*|--*) @@ -206,38 +203,46 @@ while [[ $# -gt 0 ]]; do esac done ;; - -t|--thin) + -s|--size) shift - for variant in "${@}"; do - case "${variant}" in - thin) - thins+=("${THIN_VARIANTS[1]}") + for size in "${@}"; do + case "${size}" in + standard) + sizes+=("${SIZE_VARIANTS[0]}") + shift + ;; + compact) + sizes+=("${SIZE_VARIANTS[1]}") shift ;; -*|--*) break ;; *) - echo "ERROR: Unrecognized thin variant '$1'." + echo "ERROR: Unrecognized color variant '$1'." echo "Try '$0 --help' for more information." exit 1 ;; esac done ;; - -s|--size) + -i|--thin) shift - for variant in "${@}"; do - case "${variant}" in - compact) - transs+=("${SIZE_VARIANTS[1]}") + for thin in "${@}"; do + case "${thin}" in + standard) + thins+=("${THIN_VARIANTS[0]}") + shift + ;; + thin) + thins+=("${THIN_VARIANTS[1]}") shift ;; -*|--*) break ;; *) - echo "ERROR: Unrecognized size variant '$1'." + echo "ERROR: Unrecognized thin variant '$1'." echo "Try '$0 --help' for more information." exit 1 ;; @@ -256,23 +261,18 @@ while [[ $# -gt 0 ]]; do esac done -if [[ ! -w "${dest:-${DEST_DIR}}" ]]; then - echo "Please run as root." - exit 1 -fi - -for compact in "${compacts[@]:-${COMPACT_VARIANTS[@]}}"; do +for size in "${sizes[@]:-${COMPACT_VARIANTS[@]}}"; do for trans in "${transs[@]:-${TRANS_VARIANTS[@]}}"; do for color in "${colors[@]:-${COLOR_VARIANTS[@]}}"; do for thin in "${thins[@]:-${THIN_VARIANTS[@]}}"; do - install "${dest:-${DEST_DIR}}" "${name:-${THEME_NAME}}" "${compact}" "${color}" "${trans}" "${thin}" + install "${dest:-${DEST_DIR}}" "${name:-${THEME_NAME}}" "${size}" "${color}" "${trans}" "${thin}" done done done done -if [[ $gdm == true ]]; then - install_gdm "${dest:-${DEST_DIR}}" "${name:-${THEME_NAME}}" "${compact}" "${color}" "${trans}" "${thin}" +if [[ "${gdm:-}" == 'true' ]]; then + install_gdm "${dest:-${DEST_DIR}}" "${name:-${THEME_NAME}}" "${size}" "${color}" "${trans}" "${thin}" fi echo diff --git a/src/gnome-shell/assets/activities-dark.svg b/src/gnome-shell/assets-dark/activities.svg similarity index 100% rename from src/gnome-shell/assets/activities-dark.svg rename to src/gnome-shell/assets-dark/activities.svg diff --git a/src/gnome-shell/assets/calendar-arrow-left-dark.svg b/src/gnome-shell/assets-dark/calendar-arrow-left.svg similarity index 100% rename from src/gnome-shell/assets/calendar-arrow-left-dark.svg rename to src/gnome-shell/assets-dark/calendar-arrow-left.svg diff --git a/src/gnome-shell/assets/calendar-arrow-right-dark.svg b/src/gnome-shell/assets-dark/calendar-arrow-right.svg similarity index 100% rename from src/gnome-shell/assets/calendar-arrow-right-dark.svg rename to src/gnome-shell/assets-dark/calendar-arrow-right.svg diff --git a/src/gnome-shell/assets/checkbox-off-dark.svg b/src/gnome-shell/assets-dark/checkbox-off.svg similarity index 100% rename from src/gnome-shell/assets/checkbox-off-dark.svg rename to src/gnome-shell/assets-dark/checkbox-off.svg diff --git a/src/gnome-shell/assets/close-dark.svg b/src/gnome-shell/assets-dark/close.svg similarity index 100% rename from src/gnome-shell/assets/close-dark.svg rename to src/gnome-shell/assets-dark/close.svg diff --git a/src/gnome-shell/assets/key-hide-dark.svg b/src/gnome-shell/assets-dark/key-hide.svg similarity index 100% rename from src/gnome-shell/assets/key-hide-dark.svg rename to src/gnome-shell/assets-dark/key-hide.svg diff --git a/src/gnome-shell/assets/key-layout-dark.svg b/src/gnome-shell/assets-dark/key-layout.svg similarity index 100% rename from src/gnome-shell/assets/key-layout-dark.svg rename to src/gnome-shell/assets-dark/key-layout.svg diff --git a/src/gnome-shell/assets/key-shift-dark.svg b/src/gnome-shell/assets-dark/key-shift.svg similarity index 100% rename from src/gnome-shell/assets/key-shift-dark.svg rename to src/gnome-shell/assets-dark/key-shift.svg diff --git a/src/gnome-shell/assets/no-events-dark.svg b/src/gnome-shell/assets-dark/no-events.svg similarity index 100% rename from src/gnome-shell/assets/no-events-dark.svg rename to src/gnome-shell/assets-dark/no-events.svg diff --git a/src/gnome-shell/assets/no-notifications-dark.svg b/src/gnome-shell/assets-dark/no-notifications.svg similarity index 100% rename from src/gnome-shell/assets/no-notifications-dark.svg rename to src/gnome-shell/assets-dark/no-notifications.svg diff --git a/src/gnome-shell/assets/toggle-off-dark.svg b/src/gnome-shell/assets-dark/toggle-off.svg similarity index 100% rename from src/gnome-shell/assets/toggle-off-dark.svg rename to src/gnome-shell/assets-dark/toggle-off.svg diff --git a/src/gnome-shell/assets/activities-light.svg b/src/gnome-shell/assets/activities.svg similarity index 100% rename from src/gnome-shell/assets/activities-light.svg rename to src/gnome-shell/assets/activities.svg diff --git a/src/gnome-shell/assets/calendar-arrow-left-light.svg b/src/gnome-shell/assets/calendar-arrow-left.svg similarity index 100% rename from src/gnome-shell/assets/calendar-arrow-left-light.svg rename to src/gnome-shell/assets/calendar-arrow-left.svg diff --git a/src/gnome-shell/assets/calendar-arrow-right-light.svg b/src/gnome-shell/assets/calendar-arrow-right.svg similarity index 100% rename from src/gnome-shell/assets/calendar-arrow-right-light.svg rename to src/gnome-shell/assets/calendar-arrow-right.svg diff --git a/src/gnome-shell/assets/checkbox-off-light.svg b/src/gnome-shell/assets/checkbox-off.svg similarity index 100% rename from src/gnome-shell/assets/checkbox-off-light.svg rename to src/gnome-shell/assets/checkbox-off.svg diff --git a/src/gnome-shell/assets/close-light.svg b/src/gnome-shell/assets/close.svg similarity index 100% rename from src/gnome-shell/assets/close-light.svg rename to src/gnome-shell/assets/close.svg diff --git a/src/gnome-shell/assets/key-hide-light.svg b/src/gnome-shell/assets/key-hide.svg similarity index 100% rename from src/gnome-shell/assets/key-hide-light.svg rename to src/gnome-shell/assets/key-hide.svg diff --git a/src/gnome-shell/assets/key-layout-light.svg b/src/gnome-shell/assets/key-layout.svg similarity index 100% rename from src/gnome-shell/assets/key-layout-light.svg rename to src/gnome-shell/assets/key-layout.svg diff --git a/src/gnome-shell/assets/key-shift-light.svg b/src/gnome-shell/assets/key-shift.svg similarity index 100% rename from src/gnome-shell/assets/key-shift-light.svg rename to src/gnome-shell/assets/key-shift.svg diff --git a/src/gnome-shell/assets/no-events-light.svg b/src/gnome-shell/assets/no-events.svg similarity index 100% rename from src/gnome-shell/assets/no-events-light.svg rename to src/gnome-shell/assets/no-events.svg diff --git a/src/gnome-shell/assets/no-notifications-light.svg b/src/gnome-shell/assets/no-notifications.svg similarity index 100% rename from src/gnome-shell/assets/no-notifications-light.svg rename to src/gnome-shell/assets/no-notifications.svg diff --git a/src/gnome-shell/assets/toggle-off-light.svg b/src/gnome-shell/assets/toggle-off.svg similarity index 100% rename from src/gnome-shell/assets/toggle-off-light.svg rename to src/gnome-shell/assets/toggle-off.svg diff --git a/src/gnome-shell/assets/checkbox.svg b/src/gnome-shell/common-assets/checkbox.svg similarity index 100% rename from src/gnome-shell/assets/checkbox.svg rename to src/gnome-shell/common-assets/checkbox.svg diff --git a/src/gnome-shell/assets/dash-placeholder.svg b/src/gnome-shell/common-assets/dash-placeholder.svg similarity index 100% rename from src/gnome-shell/assets/dash-placeholder.svg rename to src/gnome-shell/common-assets/dash-placeholder.svg diff --git a/src/gnome-shell/assets/dash/bottom-running1-focused.svg b/src/gnome-shell/common-assets/dash/bottom-running1-focused.svg similarity index 100% rename from src/gnome-shell/assets/dash/bottom-running1-focused.svg rename to src/gnome-shell/common-assets/dash/bottom-running1-focused.svg diff --git a/src/gnome-shell/assets/dash/bottom-running1.svg b/src/gnome-shell/common-assets/dash/bottom-running1.svg similarity index 100% rename from src/gnome-shell/assets/dash/bottom-running1.svg rename to src/gnome-shell/common-assets/dash/bottom-running1.svg diff --git a/src/gnome-shell/assets/dash/bottom-running2-focused.svg b/src/gnome-shell/common-assets/dash/bottom-running2-focused.svg similarity index 100% rename from src/gnome-shell/assets/dash/bottom-running2-focused.svg rename to src/gnome-shell/common-assets/dash/bottom-running2-focused.svg diff --git a/src/gnome-shell/assets/dash/bottom-running2.svg b/src/gnome-shell/common-assets/dash/bottom-running2.svg similarity index 100% rename from src/gnome-shell/assets/dash/bottom-running2.svg rename to src/gnome-shell/common-assets/dash/bottom-running2.svg diff --git a/src/gnome-shell/assets/dash/bottom-running3-focused.svg b/src/gnome-shell/common-assets/dash/bottom-running3-focused.svg similarity index 100% rename from src/gnome-shell/assets/dash/bottom-running3-focused.svg rename to src/gnome-shell/common-assets/dash/bottom-running3-focused.svg diff --git a/src/gnome-shell/assets/dash/bottom-running3.svg b/src/gnome-shell/common-assets/dash/bottom-running3.svg similarity index 100% rename from src/gnome-shell/assets/dash/bottom-running3.svg rename to src/gnome-shell/common-assets/dash/bottom-running3.svg diff --git a/src/gnome-shell/assets/dash/bottom-running4-focused.svg b/src/gnome-shell/common-assets/dash/bottom-running4-focused.svg similarity index 100% rename from src/gnome-shell/assets/dash/bottom-running4-focused.svg rename to src/gnome-shell/common-assets/dash/bottom-running4-focused.svg diff --git a/src/gnome-shell/assets/dash/bottom-running4.svg b/src/gnome-shell/common-assets/dash/bottom-running4.svg similarity index 100% rename from src/gnome-shell/assets/dash/bottom-running4.svg rename to src/gnome-shell/common-assets/dash/bottom-running4.svg diff --git a/src/gnome-shell/assets/dash/left-running1-focused.svg b/src/gnome-shell/common-assets/dash/left-running1-focused.svg similarity index 100% rename from src/gnome-shell/assets/dash/left-running1-focused.svg rename to src/gnome-shell/common-assets/dash/left-running1-focused.svg diff --git a/src/gnome-shell/assets/dash/left-running1.svg b/src/gnome-shell/common-assets/dash/left-running1.svg similarity index 100% rename from src/gnome-shell/assets/dash/left-running1.svg rename to src/gnome-shell/common-assets/dash/left-running1.svg diff --git a/src/gnome-shell/assets/dash/left-running2-focused.svg b/src/gnome-shell/common-assets/dash/left-running2-focused.svg similarity index 100% rename from src/gnome-shell/assets/dash/left-running2-focused.svg rename to src/gnome-shell/common-assets/dash/left-running2-focused.svg diff --git a/src/gnome-shell/assets/dash/left-running2.svg b/src/gnome-shell/common-assets/dash/left-running2.svg similarity index 100% rename from src/gnome-shell/assets/dash/left-running2.svg rename to src/gnome-shell/common-assets/dash/left-running2.svg diff --git a/src/gnome-shell/assets/dash/left-running3-focused.svg b/src/gnome-shell/common-assets/dash/left-running3-focused.svg similarity index 100% rename from src/gnome-shell/assets/dash/left-running3-focused.svg rename to src/gnome-shell/common-assets/dash/left-running3-focused.svg diff --git a/src/gnome-shell/assets/dash/left-running3.svg b/src/gnome-shell/common-assets/dash/left-running3.svg similarity index 100% rename from src/gnome-shell/assets/dash/left-running3.svg rename to src/gnome-shell/common-assets/dash/left-running3.svg diff --git a/src/gnome-shell/assets/dash/left-running4-focused.svg b/src/gnome-shell/common-assets/dash/left-running4-focused.svg similarity index 100% rename from src/gnome-shell/assets/dash/left-running4-focused.svg rename to src/gnome-shell/common-assets/dash/left-running4-focused.svg diff --git a/src/gnome-shell/assets/dash/left-running4.svg b/src/gnome-shell/common-assets/dash/left-running4.svg similarity index 100% rename from src/gnome-shell/assets/dash/left-running4.svg rename to src/gnome-shell/common-assets/dash/left-running4.svg diff --git a/src/gnome-shell/assets/dash/right-running1-focused.svg b/src/gnome-shell/common-assets/dash/right-running1-focused.svg similarity index 100% rename from src/gnome-shell/assets/dash/right-running1-focused.svg rename to src/gnome-shell/common-assets/dash/right-running1-focused.svg diff --git a/src/gnome-shell/assets/dash/right-running1.svg b/src/gnome-shell/common-assets/dash/right-running1.svg similarity index 100% rename from src/gnome-shell/assets/dash/right-running1.svg rename to src/gnome-shell/common-assets/dash/right-running1.svg diff --git a/src/gnome-shell/assets/dash/right-running2-focused.svg b/src/gnome-shell/common-assets/dash/right-running2-focused.svg similarity index 100% rename from src/gnome-shell/assets/dash/right-running2-focused.svg rename to src/gnome-shell/common-assets/dash/right-running2-focused.svg diff --git a/src/gnome-shell/assets/dash/right-running2.svg b/src/gnome-shell/common-assets/dash/right-running2.svg similarity index 100% rename from src/gnome-shell/assets/dash/right-running2.svg rename to src/gnome-shell/common-assets/dash/right-running2.svg diff --git a/src/gnome-shell/assets/dash/right-running3-focused.svg b/src/gnome-shell/common-assets/dash/right-running3-focused.svg similarity index 100% rename from src/gnome-shell/assets/dash/right-running3-focused.svg rename to src/gnome-shell/common-assets/dash/right-running3-focused.svg diff --git a/src/gnome-shell/assets/dash/right-running3.svg b/src/gnome-shell/common-assets/dash/right-running3.svg similarity index 100% rename from src/gnome-shell/assets/dash/right-running3.svg rename to src/gnome-shell/common-assets/dash/right-running3.svg diff --git a/src/gnome-shell/assets/dash/right-running4-focused.svg b/src/gnome-shell/common-assets/dash/right-running4-focused.svg similarity index 100% rename from src/gnome-shell/assets/dash/right-running4-focused.svg rename to src/gnome-shell/common-assets/dash/right-running4-focused.svg diff --git a/src/gnome-shell/assets/dash/right-running4.svg b/src/gnome-shell/common-assets/dash/right-running4.svg similarity index 100% rename from src/gnome-shell/assets/dash/right-running4.svg rename to src/gnome-shell/common-assets/dash/right-running4.svg diff --git a/src/gnome-shell/assets/dash/top-running1-focused.svg b/src/gnome-shell/common-assets/dash/top-running1-focused.svg similarity index 100% rename from src/gnome-shell/assets/dash/top-running1-focused.svg rename to src/gnome-shell/common-assets/dash/top-running1-focused.svg diff --git a/src/gnome-shell/assets/dash/top-running1.svg b/src/gnome-shell/common-assets/dash/top-running1.svg similarity index 100% rename from src/gnome-shell/assets/dash/top-running1.svg rename to src/gnome-shell/common-assets/dash/top-running1.svg diff --git a/src/gnome-shell/assets/dash/top-running2-focused.svg b/src/gnome-shell/common-assets/dash/top-running2-focused.svg similarity index 100% rename from src/gnome-shell/assets/dash/top-running2-focused.svg rename to src/gnome-shell/common-assets/dash/top-running2-focused.svg diff --git a/src/gnome-shell/assets/dash/top-running2.svg b/src/gnome-shell/common-assets/dash/top-running2.svg similarity index 100% rename from src/gnome-shell/assets/dash/top-running2.svg rename to src/gnome-shell/common-assets/dash/top-running2.svg diff --git a/src/gnome-shell/assets/dash/top-running3-focused.svg b/src/gnome-shell/common-assets/dash/top-running3-focused.svg similarity index 100% rename from src/gnome-shell/assets/dash/top-running3-focused.svg rename to src/gnome-shell/common-assets/dash/top-running3-focused.svg diff --git a/src/gnome-shell/assets/dash/top-running3.svg b/src/gnome-shell/common-assets/dash/top-running3.svg similarity index 100% rename from src/gnome-shell/assets/dash/top-running3.svg rename to src/gnome-shell/common-assets/dash/top-running3.svg diff --git a/src/gnome-shell/assets/dash/top-running4-focused.svg b/src/gnome-shell/common-assets/dash/top-running4-focused.svg similarity index 100% rename from src/gnome-shell/assets/dash/top-running4-focused.svg rename to src/gnome-shell/common-assets/dash/top-running4-focused.svg diff --git a/src/gnome-shell/assets/dash/top-running4.svg b/src/gnome-shell/common-assets/dash/top-running4.svg similarity index 100% rename from src/gnome-shell/assets/dash/top-running4.svg rename to src/gnome-shell/common-assets/dash/top-running4.svg diff --git a/src/gnome-shell/assets/key-enter.svg b/src/gnome-shell/common-assets/key-enter.svg similarity index 100% rename from src/gnome-shell/assets/key-enter.svg rename to src/gnome-shell/common-assets/key-enter.svg diff --git a/src/gnome-shell/assets/key-shift-latched-uppercase.svg b/src/gnome-shell/common-assets/key-shift-latched-uppercase.svg similarity index 100% rename from src/gnome-shell/assets/key-shift-latched-uppercase.svg rename to src/gnome-shell/common-assets/key-shift-latched-uppercase.svg diff --git a/src/gnome-shell/assets/key-shift-uppercase.svg b/src/gnome-shell/common-assets/key-shift-uppercase.svg similarity index 100% rename from src/gnome-shell/assets/key-shift-uppercase.svg rename to src/gnome-shell/common-assets/key-shift-uppercase.svg diff --git a/src/gnome-shell/assets/more-results.svg b/src/gnome-shell/common-assets/more-results.svg similarity index 100% rename from src/gnome-shell/assets/more-results.svg rename to src/gnome-shell/common-assets/more-results.svg diff --git a/src/gnome-shell/assets/noise-texture.svg b/src/gnome-shell/common-assets/noise-texture.svg similarity index 100% rename from src/gnome-shell/assets/noise-texture.svg rename to src/gnome-shell/common-assets/noise-texture.svg diff --git a/src/gnome-shell/assets/process-working.svg b/src/gnome-shell/common-assets/process-working.svg similarity index 100% rename from src/gnome-shell/assets/process-working.svg rename to src/gnome-shell/common-assets/process-working.svg diff --git a/src/gnome-shell/assets/startup.png b/src/gnome-shell/common-assets/startup.png similarity index 100% rename from src/gnome-shell/assets/startup.png rename to src/gnome-shell/common-assets/startup.png diff --git a/src/gnome-shell/assets/toggle-on.svg b/src/gnome-shell/common-assets/toggle-on.svg similarity index 100% rename from src/gnome-shell/assets/toggle-on.svg rename to src/gnome-shell/common-assets/toggle-on.svg diff --git a/src/gnome-shell/assets/window-close-active.svg b/src/gnome-shell/common-assets/window-close-active.svg similarity index 100% rename from src/gnome-shell/assets/window-close-active.svg rename to src/gnome-shell/common-assets/window-close-active.svg diff --git a/src/gnome-shell/assets/window-close.svg b/src/gnome-shell/common-assets/window-close.svg similarity index 100% rename from src/gnome-shell/assets/window-close.svg rename to src/gnome-shell/common-assets/window-close.svg diff --git a/src/gtk-2.0/apps.rc b/src/gtk-2.0/common/apps.rc similarity index 100% rename from src/gtk-2.0/apps.rc rename to src/gtk-2.0/common/apps.rc diff --git a/src/gtk-2.0/main.rc b/src/gtk-2.0/common/main.rc similarity index 100% rename from src/gtk-2.0/main.rc rename to src/gtk-2.0/common/main.rc diff --git a/src/gtk-2.0/panel.rc b/src/gtk-2.0/common/panel.rc similarity index 100% rename from src/gtk-2.0/panel.rc rename to src/gtk-2.0/common/panel.rc diff --git a/src/gtk-2.0/xfce-notify.rc b/src/gtk-2.0/common/xfce-notify.rc similarity index 100% rename from src/gtk-2.0/xfce-notify.rc rename to src/gtk-2.0/common/xfce-notify.rc