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,35 +1,30 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang=""> <html lang="">
<head>
<meta charset="utf-8">
<link rel="icon" type="image/png" href="logo_noir.png">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>formulaire mémoire</title>
<link rel="stylesheet" href="style.css">
</head>
<head>
<meta charset="utf-8">
<link rel="icon" type="image/png" href="logo_noir.png">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>formulaire mémoire</title>
<link rel="stylesheet" href="style.css">
</head>
<body>
<!-- ENTÊTE -->
<header> <header>
<!-- ENTÊTE --> <a href="index.html">Mémoire post-ERG/A life after ERG</a>
</header>
<div id="header"> <!-- MENU -->
<h1><a href="index.html">Mémoire post-ERG/A life after ERG</a></h1>
</div>
</header>
<body>
<!-- MENU -->
<div class="menu">
<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 id="wrapper">
<div class="menu">
<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 id="wrapper">
<section id="main-content"> <section id="main-content">
@@ -105,8 +100,8 @@
<option value="APS">Art et pratique situé</option> <option value="APS">Art et pratique situé</option>
<option value="R&E">Récits et expérimentation</option> <option value="R&E">Récits et expérimentation</option>
<option value="PAOC">Pratique de l'art et outils critiques</option> <option value="PAOC">Pratique de l'art et outils critiques</option>
</select> </select>
</div> </div>
<div class="boutton"> <div class="boutton">
<label>Formats de fichiers de mémoire</label> <label>Formats de fichiers de mémoire</label>
@@ -124,10 +119,12 @@
</form>
</section> </form>
</section>
</div> </div>
</body> </body>
</html> </html>

View File

@@ -3,7 +3,7 @@
<head> <head>
<link href="reset.css" > <link href="reset.css">
<link href="style.css" rel="stylesheet"> <link href="style.css" rel="stylesheet">
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="author" content=""> <meta name="author" content="">
@@ -14,35 +14,34 @@
</head> </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> <body>
<!-- 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 --> <!-- MENU -->
<div class="menu">
<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>
<!-- GRILLE --> <!-- GRILLE -->
<div class="grid-section">
<div class="grille01"> <div class="grid-main">
<div class="grille_01">Colonne 1</div> <div class="grid1">Colonne 1</div>
<div class="grille_02">Colonne 2</div> <div class="grid2">Colonne 2</div>
</div>
</div> </div>
</body> </body>
</html> </html>

176
style.css
View File

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