diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index d6ec1acd..5c09de3e 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -32,7 +32,7 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} repository: thecodingmachine/workadventure-front - tags: ${{ env.GITHUB_REF_SLUG }} + tags: ${{ env.GITHUB_HEAD_REF_SLUG }} add_git_labels: true build-back: @@ -55,7 +55,7 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} repository: thecodingmachine/workadventure-back - tags: ${{ env.GITHUB_REF_SLUG }} + tags: ${{ env.GITHUB_HEAD_REF_SLUG }} add_git_labels: true build-pusher: @@ -78,7 +78,7 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} repository: thecodingmachine/workadventure-pusher - tags: ${{ env.GITHUB_REF_SLUG }} + tags: ${{ env.GITHUB_HEAD_REF_SLUG }} add_git_labels: true build-uploader: @@ -101,7 +101,7 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} repository: thecodingmachine/workadventure-uploader - tags: ${{ env.GITHUB_REF_SLUG }} + tags: ${{ env.GITHUB_HEAD_REF_SLUG }} add_git_labels: true build-maps: @@ -125,7 +125,7 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} repository: thecodingmachine/workadventure-maps - tags: ${{ env.GITHUB_REF_SLUG }} + tags: ${{ env.GITHUB_HEAD_REF_SLUG }} add_git_labels: true deeploy: @@ -154,13 +154,13 @@ jobs: SECRET_JITSI_KEY: ${{ secrets.SECRET_JITSI_KEY }} TURN_STATIC_AUTH_SECRET: ${{ secrets.TURN_STATIC_AUTH_SECRET }} with: - namespace: workadventure-${{ env.GITHUB_REF_SLUG }} + namespace: workadventure-${{ env.GITHUB_HEAD_REF_SLUG }} - name: Add a comment in PR uses: unsplash/comment-on-pr@v1.2.0 - if: ${{ env.GITHUB_REF_SLUG != 'master' }} + if: ${{ env.GITHUB_HEAD_REF_SLUG != 'master' }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - msg: Environment deployed at https://play.${{ env.GITHUB_REF_SLUG }}.test.workadventu.re + msg: Environment deployed at https://play.${{ env.GITHUB_HEAD_REF_SLUG }}.test.workadventu.re check_for_duplicate_msg: true diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml index 558a2c3e..ab39978b 100644 --- a/.github/workflows/cleanup.yml +++ b/.github/workflows/cleanup.yml @@ -15,13 +15,11 @@ jobs: steps: # Create a slugified value of the branch - - uses: rlespinasse/github-slug-action@1.1.0 + - uses: rlespinasse/github-slug-action@3.1.0 - name: Cleanup uses: thecodingmachine/deeployer-cleanup-action@master env: KUBE_CONFIG_FILE: ${{ secrets.KUBE_CONFIG_FILE }} with: -# FIXME: we are not using ${{ env.GITHUB_REF_SLUG }} that resolves to master BUT! we are not using a slugified namespace -# so complex namespace names will not be treated correctly - namespace: workadventure-${{ github.event.ref }} + namespace: workadventure-${{ env.GITHUB_HEAD_REF_SLUG }} diff --git a/deeployer.libsonnet b/deeployer.libsonnet index 3eeaa359..f94f4e69 100644 --- a/deeployer.libsonnet +++ b/deeployer.libsonnet @@ -1,6 +1,6 @@ { local env = std.extVar("env"), - local namespace = env.GITHUB_REF_SLUG, + local namespace = env.GITHUB_HEAD_REF_SLUG, local tag = namespace, local url = if namespace == "master" then "workadventu.re" else namespace+".test.workadventu.re", // develop branch does not use admin because of issue with SSL certificate of admin as of now. diff --git a/front/dist/index.tmpl.html b/front/dist/index.tmpl.html index b381c0fb..a81c283c 100644 --- a/front/dist/index.tmpl.html +++ b/front/dist/index.tmpl.html @@ -49,15 +49,15 @@
-
+
-
+
-
+
diff --git a/front/dist/resources/html/CustomCharacterScene.html b/front/dist/resources/html/CustomCharacterScene.html index eb02b642..a1c0fd2a 100644 --- a/front/dist/resources/html/CustomCharacterScene.html +++ b/front/dist/resources/html/CustomCharacterScene.html @@ -7,9 +7,9 @@ color: #ebeeee; overflow: auto; width: 42vw; - height: 38vh; - /*max-width: 300px;*/ - max-height: 40vh; + height: 48vh; + /*max-width: 300px; + max-height: 48vh;*/ } #customizeScene h1 { background-image: linear-gradient(top, #f1f3f3, #d4dae0); @@ -47,14 +47,6 @@ #customizeScene section.text-center{ text-align: center; } - #customizeScene section a{ - font-size: 14px; - text-decoration: underline; - color: #ebeeee; - } - #customizeScene section a:hover{ - font-weight: 700; - } #customizeScene section p{ text-align: left; font-size: 8px; @@ -107,6 +99,7 @@ @media only screen and (max-width: 600px) { #customizeScene { max-width: 160px; + overflow-y: scroll; } } @media only screen and (max-height: 400px) { @@ -130,7 +123,7 @@ -->
- Back + Back
diff --git a/front/dist/resources/html/EnableCameraScene.html b/front/dist/resources/html/EnableCameraScene.html index 7f3e7787..855ffd62 100644 --- a/front/dist/resources/html/EnableCameraScene.html +++ b/front/dist/resources/html/EnableCameraScene.html @@ -5,10 +5,10 @@ border-radius: 6px; margin: 20px auto 0; color: #ebeeee; - max-height: 40vh; + max-height: 48vh; width: 42vw; max-width: 300px; - /*overflow: scroll;*/ + overflow: hidden; } #enableCameraScene h1 { background-image: linear-gradient(top, #f1f3f3, #d4dae0); @@ -45,7 +45,7 @@ text-align: center; margin: 0; position: absolute; - top: 40vh; + top: 44vh; width: 100%; } #enableCameraScene button#enableCameraSceneFormCancel { @@ -87,6 +87,12 @@ width: 160px; margin: 20px 0; } + /*@media only screen and (max-width: 800px), + only screen and (max-height: 600px) { + #enableCameraScene{ + overflow-y: scroll; + } + }*/ diff --git a/front/dist/resources/html/helpCameraSettings.html b/front/dist/resources/html/helpCameraSettings.html index cdaf69a0..1746f620 100644 --- a/front/dist/resources/html/helpCameraSettings.html +++ b/front/dist/resources/html/helpCameraSettings.html @@ -5,9 +5,10 @@ border-radius: 6px; margin: 25px auto 0; width: 400px; - max-height: calc(50vh - 25px); - overflow: scroll; + max-height: calc(48vh - 50px); max-width: 48vw; + overflow: auto; + padding-bottom: 10px; } #helpCameraSettings h1 { background-image: linear-gradient(top, #f1f3f3, #d4dae0); @@ -29,22 +30,10 @@ text-align: center; margin: 0; } - #helpCameraSettings button { - margin: 10px 4px; - background-color: black; - color: white; - border-radius: 7px; - padding-bottom: 4px; - } #helpCameraSettings button#helpCameraSettingsFormCancel { background-color: #c7c7c700; color: #292929; } - #helpCameraSettings section a{ - font-size: 12px; - text-decoration: underline; - color: black; - } #helpCameraSettings section h6, #helpCameraSettings section h5{ margin: 1px; @@ -53,7 +42,7 @@ text-align: center; } #helpCameraSettings section p{ - font-size: 8px; + font-size: 7px; margin: 0px 20px; } #helpCameraSettings section p.err{ @@ -64,12 +53,18 @@ } #helpCameraSettings section li{ text-align: left; - font-size: 8px; + font-size: 7px; } #helpCameraSettings section img { width: 200px; margin-top: 10px; } + @media only screen and (max-width: 800px), + only screen and (max-height: 600px) { + #helpCameraSettings{ + overflow-y: scroll; + } + } diff --git a/front/dist/resources/html/loginScene.html b/front/dist/resources/html/loginScene.html index 9b017d40..d189b866 100644 --- a/front/dist/resources/html/loginScene.html +++ b/front/dist/resources/html/loginScene.html @@ -69,6 +69,12 @@ width: 160px; margin: 20px 0; } + @media only screen and (max-width: 800px), + only screen and (max-height: 600px) { + #loginScene{ + overflow-y: scroll; + } + }