diff --git a/.gitignore b/.gitignore index dd0463112..5f901ef86 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,9 @@ node_modules npm-debug.log src/assets/*.js last-js-build.md5 +last-sass-build.md5 +last-composer-build.md5 +last-package-build.md5 src/admin/scss/.sass-cache src/assets/css/tainacan-admin.css src/assets/css/tainacan-admin.css.map \ No newline at end of file diff --git a/build.sh b/build.sh index 4469e966a..17cc28329 100755 --- a/build.sh +++ b/build.sh @@ -3,28 +3,53 @@ source build-config.cfg ## Only run npm build if there was a change in a .js or .vue file -current_md5=$( last-js-build.md5 + find src -type f \( -name "*.js" -or -name "*.vue" \) -exec md5 {} \; | sort -k 2 | md5 > last-js-build.md5 + find src -type f \( -name "*.scss" \) -exec md5 {} \; | sort -k 2 | md5 > last-sass-build.md5 + find src -type f \( -name "composer.json" \) -exec md5 {} \; | sort -k 2 | md5 > last-composer-build.md5 + find src -type f \( -name "package.json" \) -exec md5 {} \; | sort -k 2 | md5 > last-package-build.md5 else - find src -type f \( -name "*.js" -or -name "*.vue" -or -name "*.scss" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-js-build.md5 + find src -type f \( -name "*.js" -or -name "*.vue" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-js-build.md5 + find src -type f \( -name "*.scss" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-sass-build.md5 + find src -type f \( -name "composer.json" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-composer-build.md5 + find src -type f \( -name "package.json" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-package-build.md5 fi -new_md5=$( - +
{{ collection.name }}
- Lista de Itens - Criar Item + Lista de Itens + Criar Item
-
+
@@ -62,13 +62,12 @@ export default { line-height: 12px; } - el-button { - padding: 0; + .element-button { float: right; } .image { - width: 100%; + max-width: 100%; display: block; }