diff --git a/.gitignore b/.gitignore index 5cb1dc87..409338bd 100644 --- a/.gitignore +++ b/.gitignore @@ -17,5 +17,9 @@ addons/godot-plugin-refresher # Exports build/**/ +#custom downloaded templates +templates/* +???custom-templates.zip + # Local user overrides override.cfg \ No newline at end of file diff --git a/html_export/index_template.html b/html_export/index_template.html index 8f70d795..78ed4314 100644 --- a/html_export/index_template.html +++ b/html_export/index_template.html @@ -46,7 +46,7 @@

- You appear to be using a mobile browser. This application is not + Your browser window seems to be too narrow. This application is not suitable for small screens and portrait orientation. If you want to continue, it's at your own risk!

diff --git a/html_export/static/style.css b/html_export/static/style.css index 21439447..76bdbd35 100644 --- a/html_export/static/style.css +++ b/html_export/static/style.css @@ -138,8 +138,9 @@ body { .notices { font-family: "Noto Sans", "Droid Sans", Arial, sans-serif; color: #3b3943; - width: 640px; + max-width: 640px; padding: 3em; + margin: 1em; background: #fdfdfd; box-shadow: 0 19px 38px rgba(0, 0, 0, 0.3), 0 15px 12px rgba(0, 0, 0, 0.22); } @@ -180,7 +181,7 @@ body { display: none; } -@media (orientation: portrait), (max-aspect-ratio: 4/3), (max-width: 750px) { +@media (orientation: portrait), (max-width: 700px), (max-height: 400px) { .mobile-only { display: flex; } diff --git a/run b/run index 9d4380c4..6d0e9d74 100755 --- a/run +++ b/run @@ -3,6 +3,9 @@ APP_NAME="learn_to_code" +# This is used while developing to supply the `GODOT_VERSION` variable that is +# normally provided by the CI +local_godot_version=${GODOT_VERSION:-"3.4.4"} ######################################## HELP @@ -363,6 +366,11 @@ push_all(){ prepare_ci_copytemplates(){ if [ "$1" == "help" ]; then + echo "-- DEPRECATED --" + echo "Do not use this, use gettemplates instead" + echo "We need to download custom templates to enable offline GDScript error reporting" + echo "Once/if this is merged in master, we can use copytemplates again" + echo "----------------" echo "Prepares the CI by copying the template from the docker" echo "You should not run this on your local computer" echo "cannot run in dry mode" @@ -385,7 +393,6 @@ prepare_ci_copytemplates(){ prepare_ci_gettemplates(){ if [ "$1" == "help" ]; then echo "Prepares the CI by getting the custom templates online" - echo "You should not run this on your local computer" echo "cannot run in dry mode" exit 0 fi @@ -499,6 +506,18 @@ prepare_htmltemplate(){ } +prepare_local(){ + # TODO: remove this if/when prepare_ci_gettemplates becomes unecessary + if [ "$1" == "help" ]; then + echo "Downloads the custom templates locally" + echo "Necessary before any export" + echo "cannot run in dry mode" + exit 0 + fi + GODOT_VERSION="$local_godot_version" prepare_ci_gettemplates +} + + ######################################## BOOTSTRAP