From 9465ac6f2ddae756c809b2828a585ae230a56119 Mon Sep 17 00:00:00 2001
From: Mathis Degryck <madegryc@3C6.42angouleme.fr>
Date: Tue, 1 Oct 2024 23:27:18 +0200
Subject: [PATCH] Site :     - Fix 42 to real logo

---
 .../server/server/templates/homePage.html     |  34 +++++++++---------
 .../server/server/templates/lobbyPage.html    |   2 +-
 .../nginx/static/img/homePage/42logo.png      | Bin 0 -> 5087 bytes
 .../nginx/static/style/homePage/home.css      |  10 +++---
 .../nginx/static/style/settings/settings.css  |   1 +
 5 files changed, 24 insertions(+), 23 deletions(-)
 create mode 100644 docker-compose/requirements/nginx/static/img/homePage/42logo.png

diff --git a/docker-compose/requirements/djangoserver/file/server/server/templates/homePage.html b/docker-compose/requirements/djangoserver/file/server/server/templates/homePage.html
index 7b3c693..451720d 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/templates/homePage.html
+++ b/docker-compose/requirements/djangoserver/file/server/server/templates/homePage.html
@@ -39,7 +39,7 @@
 						<p>Or</p>
 						<span></span>
 					</div>
-					<button type="button" class="login-42-btn" href="{{ link42 }}">Log with <span>42</span></button>
+					<button type="button" class="login-42-btn" href="{{ link42 }}">Log with <img id="logo-ft" src="/static/img/homePage/42logo.png"></img></button>
 				</form>
 			</div>
 			<div class="right-side-register">
@@ -93,6 +93,22 @@
 <section class="homeSection" id="authors">
 	<div class="team">
 		<div class="team-member">
+			<div class="team-member">
+				<img src="/static/img/homePage/madegryc.png" alt="Mathis" class="team-photo">
+				<h2>Mathis, madegryc</h2>
+				<p>Frontend / Design</p>
+				<div class="info">
+					<p>Mathis took charge of the front-end development, user interface and experience (UI/UX), overseeing the overall design and contributing to the conceptualization, ensuring both aesthetic appeal and ergonomic functionality.</p>
+				</div>
+			</div>
+			<div class="team-member">
+				<img src="/static/img/homePage/edbernard.png" alt="Eddy" class="team-photo">
+				<h2>Eddy, edbernar</h2>
+				<p>Full-stack</p>
+				<div class="info">
+					<p>Eddy worked on the fundamentals of back-end and front-end development, as well as game development. He have a solid grasp of Python and JavaScript, which allowed him to contribute from all angles and be involved in every aspect of the project.</p>
+				</div>
+			</div>
 			<img src="/static/img/homePage/tomoron.png" alt="Tom" class="team-photo">
 			<h2>Tom, tomoron</h2>
 			<p>Backend</p>
@@ -100,22 +116,6 @@
 				<p>Tom est spécialisé en développement backend et travaille principalement avec Node.js et MongoDB.</p>
 			</div>
 		</div>
-		<div class="team-member">
-			<img src="/static/img/homePage/madegryc.png" alt="Mathis" class="team-photo">
-			<h2>Mathis, madegryc</h2>
-			<p>Frontend / Design</p>
-			<div class="info">
-				<p>Mathis took charge of the front-end development, user interface and experience (UI/UX), overseeing the overall design and contributing to the conceptualization, ensuring both aesthetic appeal and ergonomic functionality.</p>
-			</div>
-		</div>
-		<div class="team-member">
-			<img src="/static/img/homePage/edbernard.png" alt="Eddy" class="team-photo">
-			<h2>Eddy, edbernar</h2>
-			<p>Full-stack</p>
-			<div class="info">
-				<p>Eddy worked on the fundamentals of back-end and front-end development, as well as game development. He have a solid grasp of Python and JavaScript, which allowed him to contribute from all angles and be involved in every aspect of the project.</p>
-			</div>
-		</div>
 		<div class="team-member">
 			<img src="/static/img/homePage/hubourge.png" alt="Hugo" class="team-photo">
 			<h2>Hugo, hubourge</h2>
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 3364108..b26ef8a 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/templates/lobbyPage.html
+++ b/docker-compose/requirements/djangoserver/file/server/server/templates/lobbyPage.html
@@ -28,7 +28,7 @@
 	</div>
 </div>
 
-<div class="popup-background" id="popup-background">
+<div class="popup" id="popup-background">
 	<div class="popup-skin">
 		<h1>Select your skin</h1>
 		<div class="color-grid">
diff --git a/docker-compose/requirements/nginx/static/img/homePage/42logo.png b/docker-compose/requirements/nginx/static/img/homePage/42logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..a54c238ddde5fb15db930d51741bd9f67363f92b
GIT binary patch
literal 5087
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

literal 0
HcmV?d00001

diff --git a/docker-compose/requirements/nginx/static/style/homePage/home.css b/docker-compose/requirements/nginx/static/style/homePage/home.css
index 53c0133..bf2fb93 100644
--- a/docker-compose/requirements/nginx/static/style/homePage/home.css
+++ b/docker-compose/requirements/nginx/static/style/homePage/home.css
@@ -6,7 +6,7 @@
 /*   By: madegryc <madegryc@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/07 12:00:55 by edbernar          #+#    #+#             */
-/*   Updated: 2024/09/24 15:16:08 by madegryc         ###   ########.fr       */
+/*   Updated: 2024/10/01 17:17:24 by madegryc         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -224,7 +224,6 @@ button {
 	font-style: normal;
 }
 
-
 .login-btn {
     background-color: #fff;
     margin-bottom: 20px;
@@ -290,9 +289,10 @@ button {
 	transition: background-color 0.3s ease;
 }
 
-.login-42-btn span {
-    font-size: 1.5rem;
-    font-weight: bold;
+#logo-ft {
+	width: 40px;
+	height: 40px;
+	margin: 5px;
 }
 
 .login-42-btn:hover {
diff --git a/docker-compose/requirements/nginx/static/style/settings/settings.css b/docker-compose/requirements/nginx/static/style/settings/settings.css
index e0504a8..fc854b6 100644
--- a/docker-compose/requirements/nginx/static/style/settings/settings.css
+++ b/docker-compose/requirements/nginx/static/style/settings/settings.css
@@ -18,6 +18,7 @@
 	width: 100%;
 	height: 100%;
 	background-color: rgba(0, 0, 0, 0.5);
+	backdrop-filter: blur(5px);
 	justify-content: center;
 	align-items: center;
 	z-index: 700;