Merge branch 'master' of codeberg.org:memoireERG/posterg-front-end

This commit is contained in:
Olivia Marly
2022-12-21 14:24:12 +01:00
3 changed files with 151 additions and 133 deletions

View File

@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html lang="">
<head>
<meta charset="utf-8">
<link rel="icon" type="image/png" href="logo_noir.png">
@@ -8,16 +9,11 @@
<link rel="stylesheet" href="style.css">
</head>
<header>
<!-- ENTÊTE -->
<div id="header">
<h1><a href="index.html">Mémoire post-ERG/A life after ERG</a></h1>
</div>
</header>
<body>
<!-- ENTÊTE -->
<header>
<a href="index.html">Mémoire post-ERG/A life after ERG</a>
</header>
<!-- MENU -->
@@ -30,7 +26,6 @@
</div>
<div id="wrapper">
<section id="main-content">
@@ -124,10 +119,12 @@
</form>
</section>
</div>
</body>
</html>

View File

@@ -14,34 +14,33 @@
</head>
<header>
<!-- ENTÊTE -->
<div id="header">
<h1><a href="index.html">Mémoire post-ERG/A life after ERG</a></h1>
</div>
</header>
<body>
<!-- MENU -->
<!-- ENTÊTE -->
<header>
<a href="index.html">Mémoire post-ERG / A life after ERG</a>
<div class="menu">
<div class="menu-content">
<input type="search" name="search" placeholder="Recherche..." button class="boutton boutton1"></input>
<a href="formulaire.html" button class="boutton boutton1">Partager un mémoire</a>
<a href="apropos.html" button class="boutton boutton1">À propos</a>
<a href="contact.html" button class="boutton boutton1">Contact</a>
<a href="licences.html" button class="boutton boutton1">Licences</a>
</div>
</div>
</header>
<!-- MENU -->
<!-- GRILLE -->
<div class="grille01">
<div class="grille_01">Colonne 1</div>
<div class="grille_02">Colonne 2</div>
<div class="grid-section">
<div class="grid-main">
<div class="grid1">Colonne 1</div>
<div class="grid2">Colonne 2</div>
</div>
</div>
</body>

100
style.css
View File

@@ -1,54 +1,62 @@
html{
display: block;
@font-face {
font-family: police1;
src: url("fonts/Combinedd.otf");
}
header{
position: fixed;
background: rgb(77,168,112);
background: linear-gradient(315deg, rgba(77,168,112,1) 0%, rgba(193,4,252,1) 66%);
top: 0;
left: 0;
margin: 0;
height: 10vh;
width: 100%;}
body {
background-color: white;
/* overflow-x: hidden; */
/* width: 100%; */
margin-top: 8vh;
margin-left: 0s;
}
@font-face{
font-family:police1;
src:url("fonts/Combinedd.otf");}
h1{
font-family:police1;
/* ENTÊTE */
header {
font-family: 'police1';
position: fixed;
background: linear-gradient(315deg, rgba(77, 168, 112, 1) 0%, rgba(193, 4, 252, 1) 66%);
top: 0;
left: 0;
margin: 0;
padding: 1.2rem;
height: auto;
width: 100%;
text-decoration: none;
outline: none;
font-size: 2rem;
color: white;
margin-left: 1.5vw;
margin-top: 4vh;
}
header a {
text-decoration: none;
color: white;
outline: none;
}
header a:hover {
color: rgba(77, 168, 112, 1);
}
/* MENU */
.menu {
position: inherit;
width: 100vw;
left: 0;
}
.menu-content{
display: flex;
flex-direction: row;
justify-content:left;
align-items: flex-start;
margin: 0;
padding: 2em;
gap: 0.3em;
align-self: flex-start;
width: 70vw;
justify-content: center;
/* align-items: flex; */
/* margin-top: 8vh; */
padding: 2rem;
gap: 1rem;
/* align-self: flex-start; */
}
.boutton {
/* border: none; */
margin: 0;
width: auto;
padding: 0.8rem;
@@ -58,32 +66,46 @@ h1{
font-family: police1;
transition-duration: 0.4s;
cursor: pointer;
border-radius: 16px;}
border-radius: 16px;
background-color: white;
}
.boutton1 {
background-color: none;
color: rgb(193, 4, 252);
border: 1px solid rgb(193,4,252);}
border: 1px solid rgb(193, 4, 252);
}
.boutton1:hover {
background-color: rgb(193, 4, 252);
color: white;}
color: white;
}
/* GRILLE */
.grid-section{
display: block;
/* position: fixed; */
margin: 30%;
}
.grille01 {
.grid-main {
display: grid;
margin-top: 40vh;
/* margin-top:20vh; */
margin-right: 1vw;
grid-template-columns: repeat(5, 1fr);
grid-gap: 10px;
grid-auto-rows: minmax(100px, auto);
}
.grille_01 {
.grid1 {
grid-column: 1 / 5;
grid-row: 1 / 12;
background-color: #c104fc;
}
.grille_02 {
.grid2 {
grid-column: 5 / 5;
grid-row: 1 / 12;
background-color: #4da870;}
background-color: #4da870;
}