tom/METH_Transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Site :

Browse Source 
- Fix cross button chat to a real cross
    - Fix top bar lobby
This commit is contained in:
Misthaa
2024-09-18 01:50:40 +02:00
parent dbbecc2232
commit 1381009e1d
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose/requirements/djangoserver/file/server/server/templates/homePage.html
View File

@ -73,9 +73,7 @@
<div id="chatDiv"> <div id="chatDiv">
<div id="topChatHome"> <div id="topChatHome">
<h1>Chat</h1> <h1>Chat</h1>
<div id="topChatCross"> <div id="topChatCross"><span>&times;</span></div>
<h2>X</h2>
</div>
</div> </div>
<p id="infoChat">You are not connected to the chat</p> <p id="infoChat">You are not connected to the chat</p>
</div> </div>

12
docker-compose/requirements/nginx/static/javascript/lobbyPage/main.js
View File

@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* main.js :+: :+: :+: */ /* main.js :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */ /* By: marvin <marvin@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/22 17:08:46 by madegryc #+# #+# */ /* Created: 2024/08/22 17:08:46 by madegryc #+# #+# */
/* Updated: 2024/09/17 22:46:41 by edbernar ### ########.fr */ /* Updated: 2024/09/18 01:48:32 by marvin ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -123,6 +123,14 @@ function showGameMode()
document.getElementById('loginPopup').style.display = 'flex'; document.getElementById('loginPopup').style.display = 'flex';
} }
// Pour EDDY : Je l'ai fait fonctionné comme ça mais change le comme tu le veux,
// La fonction sert a quitter la login popup si on clique en dehors de la zone. (Efface le commentaire quand tu fais les changements)
window.addEventListener('click', function(event) {
if (event.target == document.getElementById('loginPopup')) {
document.getElementById('loginPopup').style.display = 'none';
}
});
function hideGameMode() function hideGameMode()
{ {

11
docker-compose/requirements/nginx/static/style/homePage/liveChat.css
View File

@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* liveChat.css :+: :+: :+: */ /* liveChat.css :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */ /* By: marvin <marvin@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/07/30 13:53:39 by edbernar #+# #+# */ /* Created: 2024/07/30 13:53:39 by edbernar #+# #+# */
/* Updated: 2024/09/17 23:12:39 by edbernar ### ########.fr */ /* Updated: 2024/09/18 01:28:22 by marvin ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -58,11 +58,8 @@
font-size: 25px; font-size: 25px;
} }
/* Delete this, is just for cross style */ #topChatCross span{
#chatDiv h2 { font-size: 30px;
cursor : pointer;
margin: 0;
font-size: 25px;
} }
#chatDiv #topChatHome { #chatDiv #topChatHome {

5
docker-compose/requirements/nginx/static/style/lobbyPage/lobbyPage.css
View File

@ -57,7 +57,7 @@ body {
} }
.main{ .main{
padding-block: 25px; padding-block: 45px;
padding-inline: 150px; padding-inline: 150px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -187,7 +187,7 @@ body {
padding: 0; padding: 0;
padding-inline: 50px; padding-inline: 50px;
display: flex; display: flex;
gap: 2rem; gap: 5rem;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
inset-inline: 0; inset-inline: 0;
@ -230,6 +230,7 @@ body {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
justify-content: center; justify-content: center;
width: 40%; width: 40%;
padding-top: 20px; padding-top: 20px;
} }