From fa5fee3b82088b18017f14bf5888469e97386d9e Mon Sep 17 00:00:00 2001
From: alexisben <alex@noesya.coop>
Date: Fri, 16 Dec 2022 18:16:29 +0100
Subject: [PATCH] fixes
---
assets/js/theme/design-system/toc.js | 1 +
assets/sass/_theme/_configuration.sass | 1 +
assets/sass/_theme/design-system/footer.sass | 17 ++++++++++----
assets/sass/_theme/design-system/hero.sass | 3 ++-
layouts/diplomas/term.html | 2 +-
layouts/partials/footer/footer-simple.html | 24 ++++++++++++--------
layouts/partials/footer/footer.html | 4 +---
7 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/assets/js/theme/design-system/toc.js b/assets/js/theme/design-system/toc.js
index 25c6927c..d95de462 100644
--- a/assets/js/theme/design-system/toc.js
+++ b/assets/js/theme/design-system/toc.js
@@ -14,6 +14,7 @@ class TableOfContents {
this.nav = this.element.querySelector('.toc');
this.links = this.element.querySelectorAll('a');
this.sections = document.querySelectorAll('section');
+ // TODO : handle sublinks update in toc
this.ctaTitle = document.querySelector('.toc-cta-title span');
this.togglers = document.querySelectorAll('.toc-cta button, .toc-container button');
this.state = {
diff --git a/assets/sass/_theme/_configuration.sass b/assets/sass/_theme/_configuration.sass
index 97275330..9a7b55c8 100644
--- a/assets/sass/_theme/_configuration.sass
+++ b/assets/sass/_theme/_configuration.sass
@@ -150,6 +150,7 @@ $zindex-body-overlay: 51 !default
$zindex-toc: 60 !default
$zindex-toc-cta: 49 !default
$zindex-aside: 48 !default
+$zindex-footer: 70 !default
// Header
$header-color: $color-text !default
diff --git a/assets/sass/_theme/design-system/footer.sass b/assets/sass/_theme/design-system/footer.sass
index e27dfe60..9512a512 100644
--- a/assets/sass/_theme/design-system/footer.sass
+++ b/assets/sass/_theme/design-system/footer.sass
@@ -3,8 +3,11 @@ footer[role="contentinfo"]
color: $footer-color
padding-bottom: $spacing3
padding-top: $spacing3
+ position: relative
+ @include media-breakpoint-down(desktop)
+ z-index: $zindex-footer
a
- color: inherit
+ @include link($footer-color)
.logo
img
height: $footer-logo-height
@@ -31,14 +34,20 @@ footer[role="contentinfo"]
@include media-breakpoint-down(desktop)
.container
+ + .container,
> * + *
margin-top: $spacing3
+
@include media-breakpoint-up(desktop)
.container
- @include grid(2, desktop, $spacing4)
+ display: flex
+ justify-content: space-between
+ padding-bottom: $spacing3
+ + .container
+ padding-top: $spacing3
+ padding-bottom: 0
.footer
&-site, &-social
text-align: right
&-social
- order: 4
- align-self: end
+ order: 2
diff --git a/assets/sass/_theme/design-system/hero.sass b/assets/sass/_theme/design-system/hero.sass
index 59bbb49f..7123223d 100644
--- a/assets/sass/_theme/design-system/hero.sass
+++ b/assets/sass/_theme/design-system/hero.sass
@@ -8,6 +8,7 @@
padding-bottom: $spacing3
padding-top: calc(2rem + var(--header-height))
position: relative
+ margin-bottom: $spacing3
@include media-breakpoint-up(desktop)
min-height: $hero-height-desktop
*:focus-visible
@@ -74,7 +75,7 @@
> h1, > hgroup
width: col(9)
&--with-image
- margin-bottom: $negative-margin-bottom
+ // margin-bottom: $negative-margin-bottom
.content
display: flex
justify-content: space-between
diff --git a/layouts/diplomas/term.html b/layouts/diplomas/term.html
index 581f0101..6e518d4f 100644
--- a/layouts/diplomas/term.html
+++ b/layouts/diplomas/term.html
@@ -13,7 +13,7 @@
</a>
<p class="description">
{{/* TODO: replace with description_short */}}
- {{- partial "PrepareHTML" .Params.description -}}
+ {{- partial "PrepareHTML" .Params.presentation -}}
</p>
</li>
{{- end -}}
diff --git a/layouts/partials/footer/footer-simple.html b/layouts/partials/footer/footer-simple.html
index d772fe82..01a5b6e0 100644
--- a/layouts/partials/footer/footer-simple.html
+++ b/layouts/partials/footer/footer-simple.html
@@ -1,12 +1,16 @@
-<div class="footer-logo">
- {{ partial "footer/logo.html" }}
+<div class="container">
+ <div class="footer-logo">
+ {{ partial "footer/logo.html" }}
+ </div>
+ <div class="footer-site">
+ {{ partial "footer/site.html" }}
+ </div>
</div>
-<div class="footer-site">
- {{ partial "footer/site.html" }}
-</div>
-<div class="footer-social">
- {{ partial "footer/social.html" }}
-</div>
-<div class="footer-legals">
- {{ partial "footer/legals.html" }}
+<div class="container">
+ <div class="footer-social">
+ {{ partial "footer/social.html" }}
+ </div>
+ <div class="footer-legals">
+ {{ partial "footer/legals.html" }}
+ </div>
</div>
diff --git a/layouts/partials/footer/footer.html b/layouts/partials/footer/footer.html
index f31398d2..f01359fe 100644
--- a/layouts/partials/footer/footer.html
+++ b/layouts/partials/footer/footer.html
@@ -1,5 +1,3 @@
<footer role="contentinfo">
- <div class="container">
- {{ partial "footer/footer-simple.html" }}
- </div>
+ {{ partial "footer/footer-simple.html" }}
</footer>
--
GitLab