From 302c36aa6259d7b1e5e0f0adc9216d88091880ef Mon Sep 17 00:00:00 2001
From: alexisben <alexiben7@gmail.com>
Date: Mon, 1 Aug 2022 17:39:57 +0200
Subject: [PATCH] some polish
---
assets/sass/_theme/_configuration.sass | 16 ++++++++--------
assets/sass/_theme/_utils.sass | 3 ++-
assets/sass/_theme/blocks/pages.sass | 23 ++++++++++++++---------
assets/sass/_theme/blocks/timeline.sass | 15 ++++++++-------
assets/sass/_theme/design-system/nav.sass | 1 +
assets/sass/_theme/sections/pages.sass | 3 ++-
6 files changed, 35 insertions(+), 26 deletions(-)
diff --git a/assets/sass/_theme/_configuration.sass b/assets/sass/_theme/_configuration.sass
index 0d55a256..90df8a91 100644
--- a/assets/sass/_theme/_configuration.sass
+++ b/assets/sass/_theme/_configuration.sass
@@ -23,15 +23,15 @@ $heading-font-family: "Helvetica Neue", "Helvetica", "Arial", sans-serif !defaul
$line-height-base: 1.4 !default
// Fonts sizes
-$body-font-size: 16px !default
-$small-font-size: 14px !default
+$body-font-size: px2rem(20) !default
+$small-font-size: px2rem(14) !default
$h1-size-md: px2rem(60) !default
-$h2-size-md: px2rem(40) !default
+$h2-size-md: px2rem(45) !default
$h3-size-md: px2rem(30) !default
-$h4-size-md: px2rem(20) !default
-$h5-size-md: px2rem(18) !default
-$h6-size-md: px2rem(16) !default
+$h4-size-md: px2rem(22) !default
+$h5-size-md: px2rem(20) !default
+$h6-size-md: px2rem(18) !default
$h1-size: px2rem(30) !default
$h2-size: px2rem(24) !default
@@ -195,8 +195,8 @@ $persons-avatar-background-color: $main-light-color !default
// Program
$program-essential-font-size: $h5-size !default
$program-essential-font-size-md: $h5-size-md !default
-$program-share-font-size: $h4-size !default
-$program-share-font-size-md: $h4-size-md !default
+$program-share-font-size: $h5-size !default
+$program-share-font-size-md: $h5-size-md !default
$program-zindex-toc: $zindex-toc !default
// MISC
diff --git a/assets/sass/_theme/_utils.sass b/assets/sass/_theme/_utils.sass
index 36fede29..1b5e5ba9 100644
--- a/assets/sass/_theme/_utils.sass
+++ b/assets/sass/_theme/_utils.sass
@@ -163,7 +163,8 @@
&:active,
&:focus
box-shadow: 0 0 0 0.25rem rgba($main-color, 0.25)
- outline: 0
+ // TODO : vérifier si l'outline 0 est vraiment nécessaire
+ // outline: 0
@mixin list-reset
list-style: none
diff --git a/assets/sass/_theme/blocks/pages.sass b/assets/sass/_theme/blocks/pages.sass
index 7c70ade7..321ff480 100644
--- a/assets/sass/_theme/blocks/pages.sass
+++ b/assets/sass/_theme/blocks/pages.sass
@@ -17,22 +17,26 @@
display: flex
> *
flex: 1
+ .main-page
+ .title
+ @extend .h4
+ margin-bottom: 0
+ p:not(.title)
+ @extend .h3
+ @include media-breakpoint-up(lg)
+ margin-top: $spacing1
.pages
- @include grid(1)
- --bs-gutter-y: 0
+ @include grid(1, false, $spacing0)
+ margin-top: $spacing1
@include media-breakpoint-up(lg)
- margin-top: 4.5rem
- > *
- margin-top: px2rem(10)
- width: 100%
-
+ margin-top: calc(#{$spacing2} + #{$h4-size-md})
.page
.title
- @extend .h4
+ margin-bottom: 0
a
@include hover-translate-icon(before, 3)
- font-size: px2rem(18)
+ @extend .h4
text-decoration-color: transparent
&:hover
text-decoration-color: black
@@ -46,6 +50,7 @@
padding-top: $grid-gutter
.pages
@include grid(3, md)
+ margin-top: $spacing2
.page
aspect-ratio: 0.887
background-color: $block-pages-card-page-background
diff --git a/assets/sass/_theme/blocks/timeline.sass b/assets/sass/_theme/blocks/timeline.sass
index c1c9bc80..4303969e 100644
--- a/assets/sass/_theme/blocks/timeline.sass
+++ b/assets/sass/_theme/blocks/timeline.sass
@@ -52,7 +52,7 @@
.timeline-arrows
display: flex
> button
- -webkit-appearance: button
+ @include button-reset
background: none
border: none
color: $block-timeline-horizontal-color
@@ -88,7 +88,7 @@
.line
background: $block-timeline-horizontal-color
height: 1px
- // margin-bottom: $paragraph-margin-bottom
+ margin-bottom: $spacing1
opacity: 1
overflow: visible
width: calc(100% + #{$grid-gutter})
@@ -109,13 +109,14 @@
padding-left: col(5)
@include media-breakpoint-down(md)
- .event
- width: 85%
- .line
- // margin-bottom: px2rem(90)
.events
position: relative
.timeline-arrows
left: 0
position: absolute
- // top: calc(#{px2gitrem(30)} + var(--min-title-height))
+ top: calc(#{$spacing2/2} + var(--min-title-height))
+ .event
+ padding-right: 0
+ width: 75%
+ .line
+ margin-bottom: calc(#{$spacing2} + var(--min-title-height))
diff --git a/assets/sass/_theme/design-system/nav.sass b/assets/sass/_theme/design-system/nav.sass
index 3d3a648c..f867bf37 100644
--- a/assets/sass/_theme/design-system/nav.sass
+++ b/assets/sass/_theme/design-system/nav.sass
@@ -181,6 +181,7 @@ body
@include media-breakpoint-up(md)
font-size: $program-share-font-size-md
@include icon(social, after)
+ font-size: px2rem(20)
margin-left: px2rem(10)
.dropdown-menu
background: invert($hero-background-color)
diff --git a/assets/sass/_theme/sections/pages.sass b/assets/sass/_theme/sections/pages.sass
index 1759a670..259d9e11 100644
--- a/assets/sass/_theme/sections/pages.sass
+++ b/assets/sass/_theme/sections/pages.sass
@@ -1,9 +1,10 @@
.page
@include article
-
.title
+ @extend .h4
a
@extend .link-more
.pages
+ @include grid(1)
@include grid(2, md)
--
GitLab