From f147700e0ec0b251e5b5f1815d269f00b625a715 Mon Sep 17 00:00:00 2001 From: Javi Aguilar <122741+itsjavi@users.noreply.github.com> Date: Wed, 2 Sep 2020 17:47:33 +0200 Subject: [PATCH] reorganise assets and scripts --- Makefile | 2 +- README.md | 3 ++- src/{ => docs}/index.template.html | 0 {assets => src}/sass/items.scss | 2 +- {assets => src}/sass/marks.scss | 2 +- {assets => src}/sass/pokemon.scss | 4 ++-- {assets => src}/sass/ribbons.scss | 2 +- {assets => src}/sass/symbols.scss | 2 +- src/scripts/generate-spritesheet.sh | 17 +++++++++++++---- src/scripts/import-generated-spritesheet.sh | 2 +- src/scripts/import-shiny-pokemon-spritesheet.sh | 2 +- 11 files changed, 24 insertions(+), 14 deletions(-) rename src/{ => docs}/index.template.html (100%) rename {assets => src}/sass/items.scss (99%) rename {assets => src}/sass/marks.scss (98%) rename {assets => src}/sass/pokemon.scss (99%) rename {assets => src}/sass/ribbons.scss (99%) rename {assets => src}/sass/symbols.scss (99%) diff --git a/Makefile b/Makefile index c029239..d9d9de9 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ install: rm -rf tmp/pandoc-css && git clone https://gist.github.com/5917178.git tmp/pandoc-css index-page: - pandoc --from gfm --to html --standalone README.md --output .gh-pages/index.html --template src/index.template.html + pandoc --from gfm --to html --standalone README.md --output .gh-pages/index.html --template src/docs/index.template.html pages: ./src/scripts/build-gh-pages.sh diff --git a/README.md b/README.md index 6165c81..78b67f9 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,8 @@ You can check all available assets in the following [reference pages](https://it --- -For fonts and audio reference, check the [`/assets/`](https://github.com/itsjavi/pokemon-assets/tree/master/assets) folder. +For fonts and audio reference, +check the [`/assets/`](https://github.com/itsjavi/pokemon-assets/tree/master/assets) folder. --- diff --git a/src/index.template.html b/src/docs/index.template.html similarity index 100% rename from src/index.template.html rename to src/docs/index.template.html diff --git a/assets/sass/items.scss b/src/sass/items.scss similarity index 99% rename from assets/sass/items.scss rename to src/sass/items.scss index 52deeda..ec9baac 100644 --- a/assets/sass/items.scss +++ b/src/sass/items.scss @@ -11,7 +11,7 @@ .pkitem { display: inline-block; vertical-align: middle; - background-image: url(../img/items.png); + background-image: url(../../assets/img/items.png); image-rendering: crisp-edges; image-rendering: -moz-crisp-edges; image-rendering: -webkit-crisp-edges; diff --git a/assets/sass/marks.scss b/src/sass/marks.scss similarity index 98% rename from assets/sass/marks.scss rename to src/sass/marks.scss index 4237d0a..574d47b 100644 --- a/assets/sass/marks.scss +++ b/src/sass/marks.scss @@ -11,7 +11,7 @@ .pkmark { display: inline-block; vertical-align: middle; - background-image: url(../img/marks.png); + background-image: url(../../assets/img/marks.png); image-rendering: crisp-edges; image-rendering: -moz-crisp-edges; image-rendering: -webkit-crisp-edges; diff --git a/assets/sass/pokemon.scss b/src/sass/pokemon.scss similarity index 99% rename from assets/sass/pokemon.scss rename to src/sass/pokemon.scss index c676c13..8061e72 100644 --- a/assets/sass/pokemon.scss +++ b/src/sass/pokemon.scss @@ -1,5 +1,5 @@ .pkm.shiny { - background-image: url(../img/pokemon-shiny.png); + background-image: url(../../assets/img/pokemon-shiny.png); } .pkm-wrapper { @@ -15,7 +15,7 @@ .pkm { display: inline-block; vertical-align: middle; - background-image: url(../img/pokemon.png); + background-image: url(../../assets/img/pokemon.png); image-rendering: crisp-edges; image-rendering: -moz-crisp-edges; image-rendering: -webkit-crisp-edges; diff --git a/assets/sass/ribbons.scss b/src/sass/ribbons.scss similarity index 99% rename from assets/sass/ribbons.scss rename to src/sass/ribbons.scss index 508ca06..4c5837e 100644 --- a/assets/sass/ribbons.scss +++ b/src/sass/ribbons.scss @@ -11,7 +11,7 @@ .pkribbon { display: inline-block; vertical-align: middle; - background-image: url(../img/ribbons.png); + background-image: url(../../assets/img/ribbons.png); image-rendering: crisp-edges; image-rendering: -moz-crisp-edges; image-rendering: -webkit-crisp-edges; diff --git a/assets/sass/symbols.scss b/src/sass/symbols.scss similarity index 99% rename from assets/sass/symbols.scss rename to src/sass/symbols.scss index 7ca17e1..3ab2bd3 100644 --- a/assets/sass/symbols.scss +++ b/src/sass/symbols.scss @@ -11,7 +11,7 @@ .pksymbol { display: inline-block; vertical-align: middle; - background-image: url(../img/symbols.png); + background-image: url(../../assets/img/symbols.png); image-rendering: crisp-edges; image-rendering: -moz-crisp-edges; image-rendering: -webkit-crisp-edges; diff --git a/src/scripts/generate-spritesheet.sh b/src/scripts/generate-spritesheet.sh index 51c3b0b..23c75c8 100755 --- a/src/scripts/generate-spritesheet.sh +++ b/src/scripts/generate-spritesheet.sh @@ -66,22 +66,31 @@ HIGHEST=0 WIDEST_ALL=0 HIGHEST_ALL=0 -css=" -.${_CSS_PREFIX} { +styles_base_main=" display: inline-block; vertical-align: middle; - background-image: url(../img/${_OUT_NAME}.png); image-rendering: crisp-edges; image-rendering: -moz-crisp-edges; image-rendering: -webkit-crisp-edges; image-rendering: pixelated; +" + +css=" +.${_CSS_PREFIX} { + background-image: url(../img/${_OUT_NAME}.png); +${styles_base_main} }" -scss="$css + +scss=" @mixin sprite-rect (\$w, \$h, \$x, \$y) { width: \$w; height: \$h; background-position: \$x \$y; } +.${_CSS_PREFIX} { + background-image: url(../../assets/img/${_OUT_NAME}.png); +${styles_base_main} +} " html=" diff --git a/src/scripts/import-generated-spritesheet.sh b/src/scripts/import-generated-spritesheet.sh index 1d92734..65074be 100755 --- a/src/scripts/import-generated-spritesheet.sh +++ b/src/scripts/import-generated-spritesheet.sh @@ -4,5 +4,5 @@ name=$1 rm -f "assets/css/${name}.css" "assets/sass/${name}.scss" "assets/img/${name}.png" cp "tmp/output-${name}/css/styles.css" "assets/css/${name}.css" -cp "tmp/output-${name}/sass/styles.scss" "assets/sass/${name}.scss" +cp "tmp/output-${name}/sass/styles.scss" "src/sass/${name}.scss" cp "tmp/output-${name}/img/sprites.png" "assets/img/${name}.png" diff --git a/src/scripts/import-shiny-pokemon-spritesheet.sh b/src/scripts/import-shiny-pokemon-spritesheet.sh index 1b58042..b34ab79 100755 --- a/src/scripts/import-shiny-pokemon-spritesheet.sh +++ b/src/scripts/import-shiny-pokemon-spritesheet.sh @@ -5,4 +5,4 @@ cp "tmp/output-pokemon-shiny/img/sprites.png" "assets/img/pokemon-shiny.png" extraCss='.pkm.shiny { background-image: url(../img/pokemon-shiny.png); }' printf '%s\n%s\n' $extraCss "$(cat ./assets/css/pokemon.css)" >./assets/css/pokemon.css -printf '%s\n%s\n' $extraCss "$(cat ./assets/sass/pokemon.scss)" >./assets/sass/pokemon.scss +printf '%s\n%s\n' $extraCss "$(cat ./assets/sass/pokemon.scss)" >./src/sass/pokemon.scss