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

Site :

Browse Source 
- Fix 42 to real logo
This commit is contained in:
Mathis Degryck
2024-10-01 23:27:18 +02:00
parent a8863ad379
commit 9465ac6f2d
5 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@
<p>Or</p> <p>Or</p>
<span></span> <span></span>
</div> </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> </form>
</div> </div>
<div class="right-side-register"> <div class="right-side-register">
@ -93,6 +93,22 @@
<section class="homeSection" id="authors"> <section class="homeSection" id="authors">
<div class="team"> <div class="team">
<div class="team-member"> <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"> <img src="/static/img/homePage/tomoron.png" alt="Tom" class="team-photo">
<h2>Tom, tomoron</h2> <h2>Tom, tomoron</h2>
<p>Backend</p> <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> <p>Tom est spécialisé en développement backend et travaille principalement avec Node.js et MongoDB.</p>
</div> </div>
</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"> <div class="team-member">
<img src="/static/img/homePage/hubourge.png" alt="Hugo" class="team-photo"> <img src="/static/img/homePage/hubourge.png" alt="Hugo" class="team-photo">
<h2>Hugo, hubourge</h2> <h2>Hugo, hubourge</h2>

2
docker-compose/requirements/djangoserver/file/server/server/templates/lobbyPage.html
View File

@ -28,7 +28,7 @@
</div> </div>
</div> </div>
<div class="popup-background" id="popup-background"> <div class="popup" id="popup-background">
<div class="popup-skin"> <div class="popup-skin">
<h1>Select your skin</h1> <h1>Select your skin</h1>
<div class="color-grid"> <div class="color-grid">

BIN
docker-compose/requirements/nginx/static/img/homePage/42logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB

10
docker-compose/requirements/nginx/static/style/homePage/home.css
View File

@ -6,7 +6,7 @@
/* By: madegryc <madegryc@student.42.fr> +#+ +:+ +#+ */ /* By: madegryc <madegryc@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/07 12:00:55 by edbernar #+# #+# */ /* 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; font-style: normal;
} }
.login-btn { .login-btn {
background-color: #fff; background-color: #fff;
margin-bottom: 20px; margin-bottom: 20px;
@ -290,9 +289,10 @@ button {
transition: background-color 0.3s ease; transition: background-color 0.3s ease;
} }
.login-42-btn span { #logo-ft {
font-size: 1.5rem; width: 40px;
font-weight: bold; height: 40px;
margin: 5px;
} }
.login-42-btn:hover { .login-42-btn:hover {

1
docker-compose/requirements/nginx/static/style/settings/settings.css
View File

@ -18,6 +18,7 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: rgba(0, 0, 0, 0.5); background-color: rgba(0, 0, 0, 0.5);
backdrop-filter: blur(5px);
justify-content: center; justify-content: center;
align-items: center; align-items: center;
z-index: 700; z-index: 700;