Merge pull request 'feature/return-to-starting-point-button' (#26) from feature/return-to-starting-point-button into develop
	
		
			
	
		
	
	
		
	
		
			All checks were successful
		
		
	
	
		
			
				
	
				default-pipeline default-pipeline #148
				
			
		
		
	
	
				
					
				
			
		
			All checks were successful
		
		
	
	default-pipeline default-pipeline #148
				
			Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/26 Reviewed-by: Pőcze Bence <bence@pocze.ch>
This commit is contained in:
		
						commit
						759f654a0d
					
				@ -149,13 +149,47 @@
 | 
				
			|||||||
    color: #701919;
 | 
					    color: #701919;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#navigation {
 | 
				
			||||||
 | 
					    position: absolute;
 | 
				
			||||||
 | 
					    z-index: 2;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#navigation .navigationItem {
 | 
				
			||||||
 | 
					    margin-top: 10px;
 | 
				
			||||||
 | 
					    opacity: 70%;
 | 
				
			||||||
 | 
					    cursor: pointer;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#navigation .navigationItem:hover {
 | 
				
			||||||
 | 
					    opacity: 100%;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#navigation .navigationItem div {
 | 
				
			||||||
 | 
					    position: absolute;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#navigation .circleBackground {
 | 
				
			||||||
 | 
					    width: 100%;
 | 
				
			||||||
 | 
					    height: 100%;
 | 
				
			||||||
 | 
					    opacity: 50%;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#navigation .navigationIcon {
 | 
				
			||||||
 | 
					    width: 75%;
 | 
				
			||||||
 | 
					    height: 75%;
 | 
				
			||||||
 | 
					    margin: auto;
 | 
				
			||||||
 | 
					    margin-top: 50%;
 | 
				
			||||||
 | 
					    transform: translateY(-50%);
 | 
				
			||||||
 | 
					    -ms-transform: translateY(-50%);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@media screen and (max-width: 599px) {
 | 
					@media screen and (max-width: 599px) {
 | 
				
			||||||
    #mapName {
 | 
					    #mapName {
 | 
				
			||||||
        display: none;
 | 
					        display: none;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    #showGuessButtonContainer {
 | 
					    #showGuessButtonContainer {
 | 
				
			||||||
        position: absolute;
 | 
					        position: absolute;
 | 
				
			||||||
        left: 20px;
 | 
					        left: 65px;
 | 
				
			||||||
        bottom: 30px;
 | 
					        bottom: 30px;
 | 
				
			||||||
        right: 20px;
 | 
					        right: 20px;
 | 
				
			||||||
        z-index: 2;
 | 
					        z-index: 2;
 | 
				
			||||||
@ -172,6 +206,14 @@
 | 
				
			|||||||
    #scoreBarBase {
 | 
					    #scoreBarBase {
 | 
				
			||||||
        width: 100%;
 | 
					        width: 100%;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					    #navigation {
 | 
				
			||||||
 | 
					        bottom: 25px;
 | 
				
			||||||
 | 
					        left: 10px;
 | 
				
			||||||
 | 
					        width: 45px;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    #navigation .navigationItem {
 | 
				
			||||||
 | 
					        height: 45px;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@media screen and (min-width: 600px) {
 | 
					@media screen and (min-width: 600px) {
 | 
				
			||||||
@ -215,6 +257,14 @@
 | 
				
			|||||||
    #scoreBarBase {
 | 
					    #scoreBarBase {
 | 
				
			||||||
        width: 60%;
 | 
					        width: 60%;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					    #navigation {
 | 
				
			||||||
 | 
					        bottom: 50px;
 | 
				
			||||||
 | 
					        left: 20px;
 | 
				
			||||||
 | 
					        width: 60px;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    #navigation .navigationItem {
 | 
				
			||||||
 | 
					        height: 60px;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
    @media screen and (max-height: 424px) {
 | 
					    @media screen and (max-height: 424px) {
 | 
				
			||||||
        #guess {
 | 
					        #guess {
 | 
				
			||||||
            top: 10px;
 | 
					            top: 10px;
 | 
				
			||||||
@ -229,5 +279,13 @@
 | 
				
			|||||||
            right: 20px;
 | 
					            right: 20px;
 | 
				
			||||||
            bottom: 30px;
 | 
					            bottom: 30px;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					        #navigation {
 | 
				
			||||||
 | 
					            bottom: 30px;
 | 
				
			||||||
 | 
					            left: 10px;
 | 
				
			||||||
 | 
					            width: 45px;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        #navigation .navigationItem {
 | 
				
			||||||
 | 
					            height: 45px;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										3
									
								
								public/static/img/circle_background.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								public/static/img/circle_background.svg
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,3 @@
 | 
				
			|||||||
 | 
					<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16 16">
 | 
				
			||||||
 | 
					  <circle cx="50%" cy="50%" r="50%" fill="black" />
 | 
				
			||||||
 | 
					</svg>
 | 
				
			||||||
| 
		 After Width: | Height: | Size: 146 B  | 
							
								
								
									
										5
									
								
								public/static/img/house-fill.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								public/static/img/house-fill.svg
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,5 @@
 | 
				
			|||||||
 | 
					<!-- Original image: Copyright (c) 2019 The Bootstrap Authors. License can be found in 'USED_SOFTWARE' in section 'Bootstrap Icons'. -->
 | 
				
			||||||
 | 
					<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" fill="#3183ce" viewBox="0 0 16 16">
 | 
				
			||||||
 | 
					  <path fill-rule="evenodd" d="m8 3.293 6 6V13.5a1.5 1.5 0 0 1-1.5 1.5h-9A1.5 1.5 0 0 1 2 13.5V9.293l6-6zm5-.793V6l-2-2V2.5a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 .5.5z"/>
 | 
				
			||||||
 | 
					  <path fill-rule="evenodd" d="M7.293 1.5a1 1 0 0 1 1.414 0l6.647 6.646a.5.5 0 0 1-.708.708L8 2.207 1.354 8.854a.5.5 0 1 1-.708-.708L7.293 1.5z"/>
 | 
				
			||||||
 | 
					</svg>
 | 
				
			||||||
| 
		 After Width: | Height: | Size: 556 B  | 
@ -334,6 +334,9 @@
 | 
				
			|||||||
            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.initialize();
 | 
					            Game.initialize();
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -358,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'
 | 
				
			||||||
@ -864,11 +870,13 @@
 | 
				
			|||||||
    document.getElementById('showGuessButton').onclick = function () {
 | 
					    document.getElementById('showGuessButton').onclick = function () {
 | 
				
			||||||
        this.style.visibility = 'hidden';
 | 
					        this.style.visibility = 'hidden';
 | 
				
			||||||
        document.getElementById('guess').style.visibility = 'visible';
 | 
					        document.getElementById('guess').style.visibility = 'visible';
 | 
				
			||||||
 | 
					        document.getElementById('navigation').style.visibility = 'hidden';
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    document.getElementById('closeGuessButton').onclick = function () {
 | 
					    document.getElementById('closeGuessButton').onclick = function () {
 | 
				
			||||||
        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('navigation').style.visibility = 'visible';
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    document.getElementById('guessButton').onclick = function () {
 | 
					    document.getElementById('guessButton').onclick = function () {
 | 
				
			||||||
@ -936,4 +944,8 @@
 | 
				
			|||||||
            }
 | 
					            }
 | 
				
			||||||
        });
 | 
					        });
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    document.getElementById('returnToStart').onclick = function () {
 | 
				
			||||||
 | 
					        Game.loadPano(Game.panoId, Game.pov);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
})();
 | 
					})();
 | 
				
			||||||
 | 
				
			|||||||
@ -59,6 +59,16 @@
 | 
				
			|||||||
            <button id="startNewGameButton" class="fullWidth">Play this map again</button>
 | 
					            <button id="startNewGameButton" class="fullWidth">Play this map again</button>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
 | 
					    <div id="navigation">
 | 
				
			||||||
 | 
					        <div id="returnToStart" class="navigationItem">
 | 
				
			||||||
 | 
					            <div>
 | 
				
			||||||
 | 
					                <img src="<?= $_ENV['STATIC_ROOT'] ?>/img/circle_background.svg?rev=<?= REVISION ?>" alt="Circle Background" class="circleBackground" />
 | 
				
			||||||
 | 
					            </div>
 | 
				
			||||||
 | 
					            <div>
 | 
				
			||||||
 | 
					                <img src="<?= $_ENV['STATIC_ROOT'] ?>/img/house-fill.svg?rev=<?= REVISION ?>" alt="Return to Start icon" class="navigationIcon" />
 | 
				
			||||||
 | 
					            </div>
 | 
				
			||||||
 | 
					        </div>
 | 
				
			||||||
 | 
					    </div>
 | 
				
			||||||
@endsection
 | 
					@endsection
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@section(pageScript)
 | 
					@section(pageScript)
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user