diff --git a/docker-compose/requirements/djangoserver/file/server/server/typeRequests/tournamentRequest.py b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/tournamentRequest.py index 922b373..c8119ca 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/typeRequests/tournamentRequest.py +++ b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/tournamentRequest.py @@ -6,7 +6,7 @@ # By: edbernar { - console.log("dsadsadas"); if (opponentInfo && typeof(opponentInfo) != 'boolean') sendRequest("game", {action: 0, skinId: lastSelected ? lastSelected.id : 0, opponent: opponentInfo.id}); else sendRequest("game", {action: 0, skinId: lastSelected ? lastSelected.id : 0, isRanked: opponentInfo ? true : false}); timeout = null; - }, 1500); - returnButton.addEventListener('click', returnToLobby); + }, (opponentInfo && typeof(opponentInfo) != 'boolean' && !opponentInfo.isTournament) ? 1500 : 500); + if (!opponentInfo || typeof(opponentInfo) == 'boolean' || (typeof(opponentInfo) != 'boolean' && !opponentInfo.isTournament)) + returnButton.addEventListener('click', returnToLobby); + else + returnButton.remove(); } static dispose() diff --git a/docker-compose/requirements/nginx/static/style/tournamentPage/tournamentPage.css b/docker-compose/requirements/nginx/static/style/tournamentPage/tournamentPage.css index 3fcaef3..ca95412 100644 --- a/docker-compose/requirements/nginx/static/style/tournamentPage/tournamentPage.css +++ b/docker-compose/requirements/nginx/static/style/tournamentPage/tournamentPage.css @@ -162,8 +162,13 @@ display: flex; width: 95%; height: 100%; + flex-direction: column; background-color: #090909; + align-items: center; padding: 20px; + padding-top: 0; + padding-bottom: 0; + margin-top: 0; overflow-y: auto; }