From c312ebbc134c18c197b544b5854366669b466a83 Mon Sep 17 00:00:00 2001 From: Gaetan Janssens Date: Wed, 17 Jun 2020 23:53:48 +0200 Subject: [PATCH 1/5] Simon's fixes --- assets/styles/content.sass | 2 ++ assets/styles/html.sass | 6 +++++- assets/styles/main.sass | 5 ++--- assets/styles/menu.sass | 25 ++++++++++++++++--------- assets/styles/variables.sass | 3 +++ content/outils-ressources.md | 2 +- 6 files changed, 29 insertions(+), 14 deletions(-) diff --git a/assets/styles/content.sass b/assets/styles/content.sass index 461e8f1..8c7dd9a 100644 --- a/assets/styles/content.sass +++ b/assets/styles/content.sass @@ -1,2 +1,4 @@ .container padding: 1rem +main + padding-bottom: 2*$space \ No newline at end of file diff --git a/assets/styles/html.sass b/assets/styles/html.sass index 67f92a5..ae6a203 100644 --- a/assets/styles/html.sass +++ b/assets/styles/html.sass @@ -1,9 +1,13 @@ +/* Box sizing rules */ +*,*::before,*::after + box-sizing: border-box + html /*-webkit-font-smoothing: antialiased*/ /*--moz-osx-font-smoothing: grayscale*/ scroll-behavior: smooth /* 18px */ - font-size: 112.5% + font-size: $font-size body font-weight: 400 diff --git a/assets/styles/main.sass b/assets/styles/main.sass index 1940868..027c3ea 100644 --- a/assets/styles/main.sass +++ b/assets/styles/main.sass @@ -11,15 +11,14 @@ body .layout background-color: white - min-height: 100vh + min-height: 105vh position: relative padding: 1rem - h1 text-align: center @media screen and (min-width: 60rem) .layout - width: 800px + width: $content-width margin: 0 auto box-shadow: 8px 0 6px #ddd diff --git a/assets/styles/menu.sass b/assets/styles/menu.sass index 38be455..0ae44e5 100644 --- a/assets/styles/menu.sass +++ b/assets/styles/menu.sass @@ -1,12 +1,17 @@ nav position: absolute - top: 10rem - left: -15rem + top: 4*$space + right: 50% + margin-right: $content-width/2 + width: 6*$space + font-family: $font-family-monospace ul list-style: none li border-left: 1px solid $color-primary padding-left: 15px + text-transform: capitalize + font-size: 0.8*$font-size &.active font-weight: $active a @@ -40,9 +45,11 @@ nav right: 0 width: 100% li - line-height: 1.8*$space - font-size: 0.7*$space + line-height: 1.5*$space + font-size: 1.2*$font-size text-align: right + border-left: 0 + padding: 0 a text-decoration: none color: $color-primary @@ -62,7 +69,6 @@ nav background: transparent !important &:before content: 'menu' - padding: 0 2em text-transform: uppercase background: $color-secondary position: fixed @@ -70,9 +76,10 @@ nav width: 100% height: 2*$space bottom: 0 - padding: 0.5*$space 3*$space 0.5*$space 0 - line-height: $space + padding: 0.9*$space 2*$space 0.6*$space 0 + line-height: 0.5*$space text-align: right + font-size: 0.8*$font-size &.is-active:before content: '' & > * @@ -81,8 +88,8 @@ nav flex-direction: column justify-content: space-between align-items: stretch - height: 2.6rem - width: 3.6rem + height: 0.4*$space + width: 0.6*$space background-image: linear-gradient(#333,#333) background-position: 50% background-repeat: no-repeat diff --git a/assets/styles/variables.sass b/assets/styles/variables.sass index cedb777..2c163b5 100644 --- a/assets/styles/variables.sass +++ b/assets/styles/variables.sass @@ -1,4 +1,7 @@ $color-primary: black $color-secondary: white $space: 2.75rem +$font-size: 112.5% +$font-family-monospace: Courier New,Courier,Lucida Sans Typewriter,Lucida Typewriter,monospace +$content-width: 800px $active: 600 diff --git a/content/outils-ressources.md b/content/outils-ressources.md index e0eca85..18d3d2e 100644 --- a/content/outils-ressources.md +++ b/content/outils-ressources.md @@ -2,7 +2,7 @@ title: Outils et ressources menu: main: - name: 🛠 Outils et ressources + name: 🛠 Outils & ressources weight: 30 --- From e0f1dc57fafc0657f011949f1881e43d0ee391a2 Mon Sep 17 00:00:00 2001 From: Simon C Date: Tue, 21 Jul 2020 10:37:01 +0200 Subject: [PATCH 2/5] =?UTF-8?q?fix=20layout:=20La=20taille=20de=20la=20pag?= =?UTF-8?q?e=20ne=20doit=20pas=20faire=20plus=20de=20100vh=20par=20d=C3=A9?= =?UTF-8?q?faut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/styles/main.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/styles/main.sass b/assets/styles/main.sass index 027c3ea..f1a272a 100644 --- a/assets/styles/main.sass +++ b/assets/styles/main.sass @@ -11,7 +11,7 @@ body .layout background-color: white - min-height: 105vh + min-height: 100vh position: relative padding: 1rem h1 From 79dbc4a3126e6817072dceb65a081c84c21f5296 Mon Sep 17 00:00:00 2001 From: Simon C Date: Tue, 21 Jul 2020 10:37:38 +0200 Subject: [PATCH 3/5] =?UTF-8?q?Fix=20title:=20Le=20titre=20doit=20=C3=AAtr?= =?UTF-8?q?e=20plus=20petit=20en=20mobile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/styles/main.sass | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/styles/main.sass b/assets/styles/main.sass index f1a272a..c857b14 100644 --- a/assets/styles/main.sass +++ b/assets/styles/main.sass @@ -16,6 +16,7 @@ body padding: 1rem h1 text-align: center + font-size: 1rem @media screen and (min-width: 60rem) .layout From ceaef3e18fe286badf5a0a28870b0e0e4a0c1221 Mon Sep 17 00:00:00 2001 From: Simon C Date: Tue, 21 Jul 2020 10:39:17 +0200 Subject: [PATCH 4/5] =?UTF-8?q?Permet=20de=20fixer=20le=20menu=20=C3=A0=20?= =?UTF-8?q?gauche?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/styles/menu.sass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/assets/styles/menu.sass b/assets/styles/menu.sass index 0ae44e5..4d282e5 100644 --- a/assets/styles/menu.sass +++ b/assets/styles/menu.sass @@ -1,5 +1,5 @@ nav - position: absolute + position: fixed top: 4*$space right: 50% margin-right: $content-width/2 @@ -28,7 +28,6 @@ nav padding-bottom: 2*$space nav display: none - position: fixed z-index: 10 top: 0 left: 0 From 99e9b6fc79506a269a6b25e8e9f41f257271a6c1 Mon Sep 17 00:00:00 2001 From: Simon C Date: Tue, 21 Jul 2020 10:39:48 +0200 Subject: [PATCH 5/5] Supprime la bar du menu --- assets/styles/menu.sass | 1 - 1 file changed, 1 deletion(-) diff --git a/assets/styles/menu.sass b/assets/styles/menu.sass index 4d282e5..3bad445 100644 --- a/assets/styles/menu.sass +++ b/assets/styles/menu.sass @@ -8,7 +8,6 @@ nav ul list-style: none li - border-left: 1px solid $color-primary padding-left: 15px text-transform: capitalize font-size: 0.8*$font-size