From e4042af2412898144775b524317d4430c91bd93b Mon Sep 17 00:00:00 2001
From: Olivia206 <olivia.simonet@mmibordeaux.com>
Date: Mon, 7 Nov 2022 18:19:25 +0100
Subject: [PATCH] update iut
---
assets/js/theme/nav/mainMenu.js | 2 +-
assets/sass/_theme/_configuration.sass | 1 -
assets/sass/_theme/_utils.sass | 2 +-
assets/sass/_theme/blocks/pages.sass | 25 ++++++++++++++++++-
.../sass/_theme/design-system/pagination.sass | 2 +-
assets/sass/_theme/sections/diplomas.sass | 2 ++
assets/sass/_theme/sections/programs.sass | 15 +++++------
7 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/assets/js/theme/nav/mainMenu.js b/assets/js/theme/nav/mainMenu.js
index 5d6d4f03..2fa1c1dd 100644
--- a/assets/js/theme/nav/mainMenu.js
+++ b/assets/js/theme/nav/mainMenu.js
@@ -52,7 +52,7 @@ class MainMenu {
resize () {
const isMobile = window.innerWidth <= breakpoints.md;
- // document.documentElement.style.setProperty('--header-height', this.element.offsetHeight + 'px');
+ document.documentElement.style.setProperty('--header-height', this.element.offsetHeight + 'px');
// is state changed ?
if (this.state.isMobile === isMobile) {
diff --git a/assets/sass/_theme/_configuration.sass b/assets/sass/_theme/_configuration.sass
index 726b97b7..a6bf9685 100644
--- a/assets/sass/_theme/_configuration.sass
+++ b/assets/sass/_theme/_configuration.sass
@@ -201,7 +201,6 @@ $block-key_figures-number-font-size-xxl: px2rem(80) !default
$article-title-size: $h4-size !default
$article-title-size-md: $h4-size-md !default
$article-media-background: color-contrast($main-background-color, 3%) !default
-$article-title-size: $h4-size !default
$post-media-background: $article-media-background !default
$post-media-aspect-ratio: 50% !default
diff --git a/assets/sass/_theme/_utils.sass b/assets/sass/_theme/_utils.sass
index 7d3ca441..da6ba5f2 100644
--- a/assets/sass/_theme/_utils.sass
+++ b/assets/sass/_theme/_utils.sass
@@ -144,7 +144,7 @@
object-fit: cover
.title
font-size: $article-title-size
- margin-bottom: px2rem(5)
+ margin-bottom: px2rem(5) // faire une variable ?
@include media-breakpoint-up(md)
font-size: $article-title-size-md
a
diff --git a/assets/sass/_theme/blocks/pages.sass b/assets/sass/_theme/blocks/pages.sass
index 0f03abbd..d772e46a 100644
--- a/assets/sass/_theme/blocks/pages.sass
+++ b/assets/sass/_theme/blocks/pages.sass
@@ -38,6 +38,7 @@
a
@include hover-translate-icon(before, 3)
text-decoration-color: transparent
+ line-height: px2rem(30)
&:hover
text-decoration-color: black
.page
@@ -48,6 +49,12 @@
background-color: $block-pages-card-background
padding-bottom: $grid-gutter
padding-top: $grid-gutter
+ .main-page
+ a
+ @include icon("arrow-right", after)
+ @include hover-translate-icon(before, 3)
+ &::after
+ font-size: px2rem(14)
.pages
@include grid(3, md)
margin-top: $spacing2
@@ -59,17 +66,33 @@
a
color: $block-pages-card-page-color
.more
+ @include icon("arrow-right", after)
@include link($block-pages-card-page-color)
- @extend .small
+ // @extend .small
+ font-size: px2rem(16)
+ position: relative
text-decoration-color: $block-pages-card-page-color
text-decoration-line: underline
text-decoration-thickness: 1px
text-underline-offset: 3px
+ margin-top: auto
+ &::after
+ font-size: $small-font-size
+ opacity: 0
+ position: absolute
+ right: 0
+ transform: translateX(-20px)
+ transition: 0.55s $arrow-ease-transition
+ &:hover
+ .more:after
+ opacity: 1
+ transform: translateX(0)
a,
.more
transition: text-decoration-color .3s ease, color .3s ease
> div:first-child
display: flex
+ flex: auto
flex-direction: column
.title
a
diff --git a/assets/sass/_theme/design-system/pagination.sass b/assets/sass/_theme/design-system/pagination.sass
index a0349721..e2aca22d 100644
--- a/assets/sass/_theme/design-system/pagination.sass
+++ b/assets/sass/_theme/design-system/pagination.sass
@@ -2,7 +2,7 @@
// font-family: $font-family-sans-serif
font-size: px2rem(14)
justify-content: center
- margin: #{$grid-gutter * 2.5} 0 0
+ margin: calc($grid-gutter * 2.5) 0 0
li
@include list-reset
// @extend .page-item
diff --git a/assets/sass/_theme/sections/diplomas.sass b/assets/sass/_theme/sections/diplomas.sass
index 1e9b335b..0398be1f 100644
--- a/assets/sass/_theme/sections/diplomas.sass
+++ b/assets/sass/_theme/sections/diplomas.sass
@@ -23,6 +23,8 @@ ul.diplomas
button
@include button-reset
@include icon(caret, after)
+ font-size: px2rem(6)
+ margin-left: 5px
.dropdown-menu
@include inset(100%, 0, auto, auto)
diff --git a/assets/sass/_theme/sections/programs.sass b/assets/sass/_theme/sections/programs.sass
index 1be4a7ac..3e3c6bb0 100644
--- a/assets/sass/_theme/sections/programs.sass
+++ b/assets/sass/_theme/sections/programs.sass
@@ -114,7 +114,7 @@ ol.programs
@include media-breakpoint-up(md)
font-size: $program-share-font-size-md
.lead
- padding-top: $spacing4
+ padding-top: $spacing2
aside
@include container
@include sticky
@@ -130,13 +130,14 @@ ol.programs
justify-content: space-between
white-space: nowrap
margin: 0 #{-$spacing1}
+ padding: px2rem(20) 0
li
- padding: $spacing1/2 $spacing1
+ padding: $spacing1/3 $spacing1/2
margin-bottom: 0
- .blocks
- .container
- padding-left: 0
- padding-right: 0
+ // .blocks
+ // .container
+ // padding-left: 0
+ // padding-right: 0
// .block-content
// @include media-breakpoint-up(md)
// padding-left: offset(5)
@@ -165,4 +166,4 @@ ol.programs
table
caption
- @include visually-hidden
+ @include visually-hidden
\ No newline at end of file
--
GitLab