diff --git a/install.sh b/install.sh index f3483b1d..a9cf60d3 100755 --- a/install.sh +++ b/install.sh @@ -62,12 +62,11 @@ OPTIONS: -r, --remove, -u, --uninstall Uninstall/Remove installed themes or links - --tweaks Specify versions for tweaks [nord|dracula|black|rimless|normal] (only nord and dracula can not mix use with!) - 1. nord: Nord ColorScheme version - 2. dracula Dracula ColorScheme version - 3. black: Blackness color version - 4. rimless: Remove the 1px border about windows and menus - 5. normal: Normal windows button style (titlebuttons: max/min/close) + --tweaks Specify versions for tweaks [(nord/dracula)|black|rimless|normal] (only nord and dracula can not mix use with!) + 1. [nord/dracula]: Nord/Dracula ColorScheme version + 2. black: Blackness color version + 3. rimless: Remove the 1px border about windows and menus + 4. normal: Normal windows button style (titlebuttons: max/min/close) -h, --help Show help EOF diff --git a/src/assets/cinnamon/thumbnails/make-thumbnails.sh b/src/assets/cinnamon/thumbnails/make-thumbnails.sh index 68af44cb..92051006 100755 --- a/src/assets/cinnamon/thumbnails/make-thumbnails.sh +++ b/src/assets/cinnamon/thumbnails/make-thumbnails.sh @@ -134,13 +134,11 @@ for theme in '' '-Purple' '-Pink' '-Red' '-Orange' '-Yellow' '-Green' '-Teal' '- sed -i "s/#5b9bf8/${theme_color_light}/g" "thumbnail${theme}${type}.svg" sed -i "s/#f2f2f2/${panel_light}/g" "thumbnail${theme}${type}.svg" sed -i "s/#212121/${panel_dark}/g" "thumbnail${theme}${type}.svg" - sed -i "s/thumbnail/thumbnail${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/#3c84f7/${theme_color_dark}/g" "thumbnail${theme}.svg" sed -i "s/#5b9bf8/${theme_color_light}/g" "thumbnail${theme}.svg" - sed -i "s/thumbnail/thumbnail${theme}/g" "thumbnail${theme}.svg" fi done done diff --git a/src/assets/cinnamon/thumbnails/render-thumbnails.sh b/src/assets/cinnamon/thumbnails/render-thumbnails.sh index acf092c0..0023f806 100755 --- a/src/assets/cinnamon/thumbnails/render-thumbnails.sh +++ b/src/assets/cinnamon/thumbnails/render-thumbnails.sh @@ -11,11 +11,11 @@ for theme in '' '-Purple' '-Pink' '-Red' '-Orange' '-Yellow' '-Green' '-Teal' '- for color in '' '-Light' '-Dark'; do echo echo Rendering thumbnail${theme}${type}${color}.png - $INKSCAPE --export-id=thumbnail${theme}${type}${color} \ + $INKSCAPE --export-id=thumbnail${color} \ --export-id-only \ --export-dpi=96 \ --export-filename=thumbnail${theme}${type}${color}.png $SRC_FILE >/dev/null \ - && $OPTIPNG -o7 --quiet thumbnail${theme}${type}.png + && $OPTIPNG -o7 --quiet thumbnail${theme}${type}${color}.png done done done diff --git a/src/assets/gtk-2.0/make-assets.sh b/src/assets/gtk-2.0/make-assets.sh index 8fe5a23c..ae39d076 100755 --- a/src/assets/gtk-2.0/make-assets.sh +++ b/src/assets/gtk-2.0/make-assets.sh @@ -203,13 +203,10 @@ for theme in '' '-Purple' '-Pink' '-Red' '-Orange' '-Yellow' '-Green' '-Teal' '- if [[ "$type" != '' ]]; then cp -r "assets${color}.svg" "assets${theme}${color}${type}.svg" - # cp -r "assets-common${color}.svg" "assets-common${color}${type}.svg" if [[ "$color" == '' ]]; then sed -i "s/#3c84f7/${theme_color}/g" "assets${theme}${color}${type}.svg" - # sed -i "s/#FAFAFA/${background_color}/g" "assets-common${color}${type}.svg" else sed -i "s/#5b9bf8/${theme_color}/g" "assets${theme}${color}${type}.svg" - # sed -i "s/#2C2C2C/${background_color}/g" "assets-common${color}${type}.svg" fi elif [[ "$theme" != '' ]]; then cp -r "assets${color}.svg" "assets${theme}${color}.svg" diff --git a/src/assets/gtk/render-assets.sh b/src/assets/gtk/render-assets.sh index b4fd2e3c..6d26c0dd 100755 --- a/src/assets/gtk/render-assets.sh +++ b/src/assets/gtk/render-assets.sh @@ -9,52 +9,51 @@ INDEX="assets.txt" ./make-assets.sh for theme in '' '-Purple' '-Pink' '-Red' '-Orange' '-Yellow' '-Green' '-Teal' '-Grey'; do -for type in '' '-Nord' '-Dracula'; do + for type in '' '-Nord' '-Dracula'; do + ASSETS_DIR="assets${theme}${type}" + SRC_FILE="assets${theme}${type}.svg" -ASSETS_DIR="assets${theme}${type}" -SRC_FILE="assets${theme}${type}.svg" + #[[ -d $ASSETS_DIR ]] && rm -rf $ASSETS_DIR + mkdir -p $ASSETS_DIR -#[[ -d $ASSETS_DIR ]] && rm -rf $ASSETS_DIR -mkdir -p $ASSETS_DIR + for i in `cat $INDEX`; do + echo "Rendering '$ASSETS_DIR/$i.png'" -for i in `cat $INDEX`; do -echo "Rendering '$ASSETS_DIR/$i.png'" + if [[ -f "$ASSETS_DIR/$i.png" ]]; then + echo "'$ASSETS_DIR/$i.png' exists." + elif [[ -n "${RENDER_SVG}" ]]; then + "$RENDER_SVG" --export-id "$i" \ + "$SRC_FILE" "$ASSETS_DIR/$i.png" + else + "$INKSCAPE" --export-id="$i" \ + --export-id-only \ + --export-filename="$ASSETS_DIR/$i.png" "$SRC_FILE" >/dev/null + if [[ -n "${OPTIPNG}" ]]; then + "$OPTIPNG" -o7 --quiet "$ASSETS_DIR/$i.png" + fi + fi -if [[ -f "$ASSETS_DIR/$i.png" ]]; then - echo "'$ASSETS_DIR/$i.png' exists." -elif [[ -n "${RENDER_SVG}" ]]; then - "$RENDER_SVG" --export-id "$i" \ - "$SRC_FILE" "$ASSETS_DIR/$i.png" -else - "$INKSCAPE" --export-id="$i" \ - --export-id-only \ - --export-filename="$ASSETS_DIR/$i.png" "$SRC_FILE" >/dev/null - if [[ -n "${OPTIPNG}" ]]; then - "$OPTIPNG" -o7 --quiet "$ASSETS_DIR/$i.png" - fi -fi + echo "Rendering '$ASSETS_DIR/$i@2.png'" -echo "Rendering '$ASSETS_DIR/$i@2.png'" + if [[ -f "$ASSETS_DIR/$i@2.png" ]]; then + echo "'$ASSETS_DIR/$i@2.png' exists." + elif [[ -n "${RENDER_SVG}" ]]; then + "$RENDER_SVG" --export-id "$i" \ + --dpi 192 \ + --zoom 2 \ + "$SRC_FILE" "$ASSETS_DIR/$i@2.png" + else + "$INKSCAPE" --export-id="$i" \ + --export-id-only \ + --export-dpi=192 \ + --export-filename="$ASSETS_DIR/$i@2.png" "$SRC_FILE" >/dev/null + if [[ -n "${OPTIPNG}" ]]; then + "$OPTIPNG" -o7 --quiet "$ASSETS_DIR/$i@2.png" + fi + fi -if [[ -f "$ASSETS_DIR/$i@2.png" ]]; then - echo "'$ASSETS_DIR/$i@2.png' exists." -elif [[ -n "${RENDER_SVG}" ]]; then - "$RENDER_SVG" --export-id "$i" \ - --dpi 192 \ - --zoom 2 \ - "$SRC_FILE" "$ASSETS_DIR/$i@2.png" -else - "$INKSCAPE" --export-id="$i" \ - --export-id-only \ - --export-dpi=192 \ - --export-filename="$ASSETS_DIR/$i@2.png" "$SRC_FILE" >/dev/null - if [[ -n "${OPTIPNG}" ]]; then - "$OPTIPNG" -o7 --quiet "$ASSETS_DIR/$i@2.png" - fi -fi - -done -done + done + done done for theme in '' '-Purple' '-Pink' '-Red' '-Orange' '-Yellow' '-Green' '-Teal' '-Grey'; do diff --git a/src/sass/_tweaks.scss b/src/sass/_tweaks.scss index 559139e3..04523e7e 100644 --- a/src/sass/_tweaks.scss +++ b/src/sass/_tweaks.scss @@ -1,5 +1,5 @@ -// Theme ColorScheme palette: default/nord +// Theme ColorScheme palette: default/nord/dracula @import 'color-palette-default'; $colorscheme: 'default';