From 8fd1447ccaa09f9e1d3a7d2e61e16d16ef9b339c Mon Sep 17 00:00:00 2001 From: Pontoporeia Date: Fri, 16 Dec 2022 16:41:24 +0100 Subject: [PATCH 1/2] refactorisation du css et index.html --- index.html | 14 ++--- style.css | 168 +++++++++++++++++++++++++++++------------------------ 2 files changed, 96 insertions(+), 86 deletions(-) diff --git a/index.html b/index.html index e9d958b..8d57f58 100644 --- a/index.html +++ b/index.html @@ -14,16 +14,12 @@ -
- - - - -
+ +
+ Mémoire post-ERG/A life after ERG +
@@ -45,4 +41,4 @@ - \ No newline at end of file + diff --git a/style.css b/style.css index 9a6fc23..c999908 100644 --- a/style.css +++ b/style.css @@ -1,89 +1,103 @@ -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%;} + html { + display: block; + } -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; + body { + background-color: white; + /* overflow-x: hidden; */ + /* width: 100%; */ + } + + /* 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 { - 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; -} + .menu { + display: flex; + flex-direction: row; + justify-content: left; + align-items: flex-start; + margin-top: 6vh; + padding: 2em; + gap: 0.3em; + align-self: flex-start; + width: 70vw; + } -.boutton { - /* border: none; */ - margin: 0; - width: auto; - padding: 0.8rem; - text-align: center; - text-decoration: none; - font-size: 0.8rem; - font-family: police1; - transition-duration: 0.4s; - cursor: pointer; - border-radius: 16px;} -.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;} + .boutton { + margin: 0; + width: auto; + padding: 0.8rem; + text-align: center; + text-decoration: none; + font-size: 0.8rem; + font-family: police1; + transition-duration: 0.4s; + cursor: pointer; + border-radius: 16px; + } + + .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 */ -.grille01 { - display: grid; - margin-top: 40vh; - margin-right: 1vw; - grid-template-columns: repeat(5, 1fr); - grid-gap: 10px; - grid-auto-rows: minmax(100px, auto); -} -.grille_01 { - grid-column: 1 / 5; - grid-row: 1 / 12; - background-color: #c104fc; -} -.grille_02 { - grid-column: 5 / 5; - grid-row: 1 / 12; - background-color: #4da870;} \ No newline at end of file + .grille01 { + display: grid; + margin-top: 40vh; + margin-right: 1vw; + grid-template-columns: repeat(5, 1fr); + grid-gap: 10px; + grid-auto-rows: minmax(100px, auto); + } + + .grille_01 { + grid-column: 1 / 5; + grid-row: 1 / 12; + background-color: #c104fc; + } + + .grille_02 { + grid-column: 5 / 5; + grid-row: 1 / 12; + background-color: #4da870; + } \ No newline at end of file From 56e5e234d2be90f12fade9770b4346c199dd936e Mon Sep 17 00:00:00 2001 From: Pontoporeia Date: Wed, 21 Dec 2022 14:15:36 +0100 Subject: [PATCH 2/2] refactor et travail css --- formulaire.html | 201 ++++++++++++++++++++++++------------------------ index.html | 39 +++++----- style.css | 38 +++++---- 3 files changed, 143 insertions(+), 135 deletions(-) diff --git a/formulaire.html b/formulaire.html index 05972a3..b32c9f0 100644 --- a/formulaire.html +++ b/formulaire.html @@ -1,85 +1,81 @@ - - - - - formulaire mémoire - - + + + + + formulaire mémoire + + + + +
- + Mémoire post-ERG/A life after ERG +
- - - + - - - - -
- - Partager un mémoire - À propos - Contact - Licences -
-
- +
+ + Partager un mémoire + À propos + Contact + Licences +
+
-
- - -

Partager son mémoire

-
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + -
- -
- - +
+ +
+ + -
+ +
-
- - -
- -
- - -
+
+ + +
-
- -
- +
+ + +
+ +
+ +
- - - -
- - + + + + + + + + \ No newline at end of file diff --git a/index.html b/index.html index 8d57f58..281191f 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - + @@ -17,28 +17,31 @@ -
- Mémoire post-ERG/A life after ERG -
+
+ Mémoire post-ERG / A life after ERG +
+
+ + Partager un mémoire + À propos + Contact + Licences +
+
+
- -
- - Partager un mémoire - À propos - Contact - Licences -
+ + - -
-
Colonne 1
-
Colonne 2
+
+
+
Colonne 1
+
Colonne 2
+
- - + \ No newline at end of file diff --git a/style.css b/style.css index c999908..e23ff98 100644 --- a/style.css +++ b/style.css @@ -3,10 +3,6 @@ src: url("fonts/Combinedd.otf"); } - html { - display: block; - } - body { background-color: white; /* overflow-x: hidden; */ @@ -43,15 +39,21 @@ /* MENU */ .menu { + position: inherit; + width: 100vw; + left: 0; + } + + .menu-content{ display: flex; flex-direction: row; - justify-content: left; - align-items: flex-start; - margin-top: 6vh; - 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 { @@ -65,6 +67,7 @@ transition-duration: 0.4s; cursor: pointer; border-radius: 16px; + background-color: white; } .boutton1 { @@ -80,23 +83,28 @@ /* 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;