Merge branch 'feature/return-to-starting-point-button' into feature/in-game-compass

This commit is contained in:
Balázs Vigh 2021-04-29 09:11:32 +02:00
commit 0739c65961
5 changed files with 11 additions and 8 deletions

View File

@ -8,6 +8,6 @@
"ws": "^7.4.4" "ws": "^7.4.4"
}, },
"scripts": {}, "scripts": {},
"author": "Pőcze Bence <bence@pocze.ch>", "author": "Pőcze Bence and The MapGuesser Contributors <bence@pocze.ch>",
"license": "GNU AGPL 3.0" "license": "GNU AGPL 3.0"
} }

View File

@ -164,7 +164,7 @@
opacity: 100%; opacity: 100%;
} }
#navigation div { #navigation span {
position: absolute; position: absolute;
} }

View File

@ -361,7 +361,10 @@
document.getElementById('panoCover').style.visibility = 'hidden'; document.getElementById('panoCover').style.visibility = 'hidden';
document.getElementById('showGuessButton').style.visibility = null; document.getElementById('showGuessButton').style.visibility = null;
document.getElementById('guess').style.visibility = null; document.getElementById('guess').style.visibility = null;
document.getElementById('guess').classList.remove('result') document.getElementById('guess').classList.remove('result');
// needs to be set visible after the show guess map hid it in mobile view
document.getElementById("navigation").style.visibility = 'visible';
Game.map.setOptions({ Game.map.setOptions({
draggableCursor: 'crosshair' draggableCursor: 'crosshair'

View File

@ -69,12 +69,12 @@
</span> </span>
</div> </div>
<div id="returnToStart" class="navigationItem"> <div id="returnToStart" class="navigationItem">
<div> <span>
<img src="<?= $_ENV['STATIC_ROOT'] ?>/img/circle_background.svg?rev=<?= REVISION ?>" alt="Circle Background" class="circleBackground" /> <img src="<?= $_ENV['STATIC_ROOT'] ?>/img/circle_background.svg?rev=<?= REVISION ?>" alt="Circle Background" class="circleBackground" />
</div> </span>
<div> <span>
<img src="<?= $_ENV['STATIC_ROOT'] ?>/img/house-fill.svg?rev=<?= REVISION ?>" alt="Return to Start icon" class="navigationIcon" /> <img src="<?= $_ENV['STATIC_ROOT'] ?>/img/house-fill.svg?rev=<?= REVISION ?>" alt="Return to Start icon" class="navigationIcon" />
</div> </span>
</div> </div>
</div> </div>
@endsection @endsection

View File

@ -29,6 +29,6 @@
</main> </main>
<footer> <footer>
<p><span class="bold"><?= $_ENV['APP_NAME'] ?></span> <?= str_replace('Release_', '', VERSION) ?></p><!-- <p><span class="bold"><?= $_ENV['APP_NAME'] ?></span> <?= str_replace('Release_', '', VERSION) ?></p><!--
--><p>&copy; Pőcze Bence <?= (new DateTime(REVISION_DATE))->format('Y') ?></p> --><p>&copy; The MapGuesser Contributors <?= (new DateTime(REVISION_DATE))->format('Y') ?></p>
</footer> </footer>
@endsection @endsection