diff --git a/docker-compose/requirements/djangoserver/file/server/server/templates/lobbyPage.html b/docker-compose/requirements/djangoserver/file/server/server/templates/lobbyPage.html index d3714de..b9a5f72 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/templates/lobbyPage.html +++ b/docker-compose/requirements/djangoserver/file/server/server/templates/lobbyPage.html @@ -91,10 +91,10 @@
-
+
-
+
@@ -102,23 +102,38 @@ -
diff --git a/docker-compose/requirements/djangoserver/file/server/server/templates/profilPage.html b/docker-compose/requirements/djangoserver/file/server/server/templates/profilPage.html index 244e4cb..3feb698 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/templates/profilPage.html +++ b/docker-compose/requirements/djangoserver/file/server/server/templates/profilPage.html @@ -28,7 +28,7 @@
-

History

+

History

diff --git a/docker-compose/requirements/nginx/static/javascript/filesLoader.js b/docker-compose/requirements/nginx/static/javascript/filesLoader.js index cd6c0ca..b2edbda 100644 --- a/docker-compose/requirements/nginx/static/javascript/filesLoader.js +++ b/docker-compose/requirements/nginx/static/javascript/filesLoader.js @@ -6,7 +6,7 @@ /* By: edbernar { const div = document.createElement('div'); div.setAttribute('class', 'history-card'); - if (element.won) + if (element.forfeit) + div.style.backgroundColor = '#c45f0c'; + else if (element.won) div.style.backgroundColor = '#11ad11'; div.innerHTML = `
diff --git a/docker-compose/requirements/nginx/static/style/lobbyPage/lobbyPage.css b/docker-compose/requirements/nginx/static/style/lobbyPage/lobbyPage.css index 3490e07..6f0ec77 100644 --- a/docker-compose/requirements/nginx/static/style/lobbyPage/lobbyPage.css +++ b/docker-compose/requirements/nginx/static/style/lobbyPage/lobbyPage.css @@ -239,7 +239,7 @@ body { align-items: center; } -#bar{ +.barSelection{ margin: 25px; width: 250px; height: 250px; @@ -247,11 +247,11 @@ body { transition: transform 0.3s ease; } -#bar:hover{ +.barSelection:hover{ transform: scale(1.05); } -#goal{ +.goalSelection{ margin: 25px; width: 250px; height: 250px; @@ -259,7 +259,7 @@ body { transition: transform 0.3s ease; } -#goal:hover{ +.goalSelection:hover{ transform: scale(1.05); } diff --git a/docker-compose/requirements/nginx/static/style/profilPage/profil.css b/docker-compose/requirements/nginx/static/style/profilPage/profil.css index 839ffea..4b7f1d3 100644 --- a/docker-compose/requirements/nginx/static/style/profilPage/profil.css +++ b/docker-compose/requirements/nginx/static/style/profilPage/profil.css @@ -112,16 +112,20 @@ text-align: center; } -#profil .scroll-match { +#profil .history #scroll-match { overflow-y: auto; - height: 100%; + width: 100%; + height: calc(100% - 60px); + display: flex; + flex-direction: column; + align-items: center; } #profil .history { background-color: white; width: 48%; height: 42vh; - padding: 20px; + /* padding: 20px; */ text-align: center; } @@ -131,6 +135,7 @@ margin-top: 20px; background-color: #E74040; height: 110px; + width: 90%; padding: 15px; padding-inline: 40px; transition: 0.3s ease;