From 74a00e829a7a7c3a03b7be07723c623f852d6544 Mon Sep 17 00:00:00 2001
From: alexisben <alex@noesya.coop>
Date: Wed, 16 Nov 2022 12:05:38 +0100
Subject: [PATCH] aside to document-nav
---
assets/sass/_theme/_utils.sass | 9 ++++-----
assets/sass/_theme/blocks/call_to_action.sass | 4 ++--
assets/sass/_theme/blocks/chapter.sass | 2 +-
assets/sass/_theme/blocks/contact.sass | 2 +-
assets/sass/_theme/blocks/definitions.sass | 2 +-
assets/sass/_theme/blocks/files.sass | 4 ++--
assets/sass/_theme/blocks/gallery.sass | 4 ++--
assets/sass/_theme/blocks/image.sass | 4 ++--
assets/sass/_theme/blocks/pages.sass | 4 ++--
assets/sass/_theme/blocks/partners.sass | 2 +-
assets/sass/_theme/blocks/testimonials.sass | 2 +-
assets/sass/_theme/blocks/video.sass | 2 +-
assets/sass/_theme/design-system/grid.sass | 6 +++---
assets/sass/_theme/design-system/hero.sass | 2 +-
assets/sass/_theme/sections/persons.sass | 2 +-
.../partials/volumes/{aside.html => document-aside.html} | 4 ++--
layouts/volumes/term.html | 6 +++---
17 files changed, 30 insertions(+), 31 deletions(-)
rename layouts/partials/volumes/{aside.html => document-aside.html} (92%)
diff --git a/assets/sass/_theme/_utils.sass b/assets/sass/_theme/_utils.sass
index a8a921dd..53a7a70e 100644
--- a/assets/sass/_theme/_utils.sass
+++ b/assets/sass/_theme/_utils.sass
@@ -8,18 +8,17 @@
$remSize: $size / 16 / 2
@return #{$remSize}rem
-@mixin in-page-with-aside
- body:not(.full-width) aside ~ .blocks &
+@mixin in-page-with-nav
+ body:not(.full-width) .document-nav ~ .blocks &
@content
-@mixin in-page-without-aside
+@mixin in-page-without-nav
main > .blocks &,
- // main > .blocks &,
body.full-width &,
@content
@mixin full-page
- @include in-page-without-aside
+ @include in-page-without-nav
@content
@mixin link($color: $link-color)
diff --git a/assets/sass/_theme/blocks/call_to_action.sass b/assets/sass/_theme/blocks/call_to_action.sass
index c1904c15..fceb1735 100644
--- a/assets/sass/_theme/blocks/call_to_action.sass
+++ b/assets/sass/_theme/blocks/call_to_action.sass
@@ -22,7 +22,7 @@
@extend .btn
background: $block-call-to-action-button-background
color: $block-call-to-action-button-color
- @include in-page-with-aside
+ @include in-page-with-nav
display: flex
flex-direction: column
> *
@@ -51,7 +51,7 @@
a
margin-right: px2rem(20)
- @include in-page-without-aside
+ @include in-page-without-nav
.block-content
background-color: $block-call-to-action-background
padding: offset(1)
diff --git a/assets/sass/_theme/blocks/chapter.sass b/assets/sass/_theme/blocks/chapter.sass
index db402412..d0d433c9 100644
--- a/assets/sass/_theme/blocks/chapter.sass
+++ b/assets/sass/_theme/blocks/chapter.sass
@@ -14,7 +14,7 @@
margin-top: 0.5rem
@include media-breakpoint-up(md)
- @include in-page-without-aside
+ @include in-page-without-nav
.block-content
> *
width: col(7)
diff --git a/assets/sass/_theme/blocks/contact.sass b/assets/sass/_theme/blocks/contact.sass
index b3cedef2..08f7a1e8 100644
--- a/assets/sass/_theme/blocks/contact.sass
+++ b/assets/sass/_theme/blocks/contact.sass
@@ -1,5 +1,5 @@
.block-contact
- @include in-page-without-aside
+ @include in-page-without-nav
@include media-breakpoint-up(md)
.block-content
display: flex
diff --git a/assets/sass/_theme/blocks/definitions.sass b/assets/sass/_theme/blocks/definitions.sass
index 91ea486c..86ad21ad 100644
--- a/assets/sass/_theme/blocks/definitions.sass
+++ b/assets/sass/_theme/blocks/definitions.sass
@@ -12,6 +12,6 @@
border-bottom: 1px solid $definition-border-color
display: block
transition: border-color 0.5s
- @include in-page-without-aside
+ @include in-page-without-nav
.definitions
@include grid(2, md)
diff --git a/assets/sass/_theme/blocks/files.sass b/assets/sass/_theme/blocks/files.sass
index 5b8f7a7d..987c962f 100644
--- a/assets/sass/_theme/blocks/files.sass
+++ b/assets/sass/_theme/blocks/files.sass
@@ -2,9 +2,9 @@
ul
@include list-reset
@include grid(1)
- @include in-page-with-aside
+ @include in-page-with-nav
@include grid(2, md)
- @include in-page-without-aside
+ @include in-page-without-nav
@include grid(3, md)
a
@include icon("download", before)
diff --git a/assets/sass/_theme/blocks/gallery.sass b/assets/sass/_theme/blocks/gallery.sass
index 5fe37c52..0f1708ae 100644
--- a/assets/sass/_theme/blocks/gallery.sass
+++ b/assets/sass/_theme/blocks/gallery.sass
@@ -35,7 +35,7 @@
&--grid
.gallery
@include grid(3, md)
- @include in-page-without-aside
+ @include in-page-without-nav
@include grid(5, md)
&--carousel
@@ -50,7 +50,7 @@
figure // TODO : affichage écrasé
max-width: 80%
min-width: 80% // to check
- @include in-page-without-aside
+ @include in-page-without-nav
min-width: 50%
// &:last-of-type
// max-width: 100%
diff --git a/assets/sass/_theme/blocks/image.sass b/assets/sass/_theme/blocks/image.sass
index 27763e47..3d365321 100644
--- a/assets/sass/_theme/blocks/image.sass
+++ b/assets/sass/_theme/blocks/image.sass
@@ -11,12 +11,12 @@
.credit
p
@extend .small
- @include in-page-with-aside
+ @include in-page-with-nav
@include media-breakpoint-up(md)
img
max-height: calc(100vh - var(--header-height))
width: auto
- @include in-page-without-aside
+ @include in-page-without-nav
@include media-breakpoint-up(md)
figcaption
align-items: baseline
diff --git a/assets/sass/_theme/blocks/pages.sass b/assets/sass/_theme/blocks/pages.sass
index 0fae92a1..320bbec1 100644
--- a/assets/sass/_theme/blocks/pages.sass
+++ b/assets/sass/_theme/blocks/pages.sass
@@ -10,7 +10,7 @@
&--grid
.main-page
margin-bottom: $spacing2
- @include in-page-without-aside
+ @include in-page-without-nav
.pages
@include grid(3, xl)
@@ -59,7 +59,7 @@
.pages
@include grid(3, md)
margin-top: $spacing2
- @include in-page-with-aside
+ @include in-page-with-nav
@include grid(2, md)
.page
aspect-ratio: 0.8
diff --git a/assets/sass/_theme/blocks/partners.sass b/assets/sass/_theme/blocks/partners.sass
index 823181d6..066638fb 100644
--- a/assets/sass/_theme/blocks/partners.sass
+++ b/assets/sass/_theme/blocks/partners.sass
@@ -1,4 +1,4 @@
.block-partners
.organizations
- @include in-page-with-aside
+ @include in-page-with-nav
@include grid(3, xl)
diff --git a/assets/sass/_theme/blocks/testimonials.sass b/assets/sass/_theme/blocks/testimonials.sass
index 79028ac1..df90abb4 100644
--- a/assets/sass/_theme/blocks/testimonials.sass
+++ b/assets/sass/_theme/blocks/testimonials.sass
@@ -89,7 +89,7 @@
i
background-color: $block-testimonials-pagination-progress-background
width: 0
- @include in-page-without-aside
+ @include in-page-without-nav
.testimonials
@include media-breakpoint-up(md)
padding-right: offset(4)
diff --git a/assets/sass/_theme/blocks/video.sass b/assets/sass/_theme/blocks/video.sass
index c05b1e94..7ea6a0e9 100644
--- a/assets/sass/_theme/blocks/video.sass
+++ b/assets/sass/_theme/blocks/video.sass
@@ -5,7 +5,7 @@
@include aspect-ratio(16, 9, 'iframe')
// @include media-breakpoint-up(md)
- // @include in-page-without-aside
+ // @include in-page-without-nav
// .block-content
// margin-left: col(2)
// width: col(8)
diff --git a/assets/sass/_theme/design-system/grid.sass b/assets/sass/_theme/design-system/grid.sass
index d0fcf193..7526586b 100644
--- a/assets/sass/_theme/design-system/grid.sass
+++ b/assets/sass/_theme/design-system/grid.sass
@@ -5,7 +5,7 @@
position: relative
@include media-breakpoint-up(md)
body:not(.full-width) &
- > aside
+ > aside, > .document-nav
@include container
pointer-events: none
height: 100%
@@ -24,9 +24,9 @@
padding-left: offset(5)
@include media-breakpoint-down(md)
- aside
+ aside, .document-nav
display: none
// TODO: mieux gérer la gestion de l'aside dans l'html
body.full-width &
- aside
+ aside, .document-nav
display: none
diff --git a/assets/sass/_theme/design-system/hero.sass b/assets/sass/_theme/design-system/hero.sass
index ecca43cc..cd5bd07f 100644
--- a/assets/sass/_theme/design-system/hero.sass
+++ b/assets/sass/_theme/design-system/hero.sass
@@ -40,7 +40,7 @@
.container
padding-bottom: $spacing1
padding-top: $spacing1
- & + aside
+ & + .document-nav
margin-top: 0
> div
position: relative
diff --git a/assets/sass/_theme/sections/persons.sass b/assets/sass/_theme/sections/persons.sass
index 574f2ba8..fc2a1751 100644
--- a/assets/sass/_theme/sections/persons.sass
+++ b/assets/sass/_theme/sections/persons.sass
@@ -34,7 +34,7 @@ div.persons
@include grid(5, xxl)
.persons__section
- @include page-without-aside
+ @include page-without-nav
.lead
padding-top: $spacing2
@include media-breakpoint-up(md)
diff --git a/layouts/partials/volumes/aside.html b/layouts/partials/volumes/document-aside.html
similarity index 92%
rename from layouts/partials/volumes/aside.html
rename to layouts/partials/volumes/document-aside.html
index 8c1e7b48..278ccbc9 100644
--- a/layouts/partials/volumes/aside.html
+++ b/layouts/partials/volumes/document-aside.html
@@ -1,4 +1,4 @@
-<aside>
+<div class="document-aside">
<dl>
{{ if .Params.keywords }}
{{ if gt ( len .Params.keywords ) 0 }}
@@ -14,4 +14,4 @@
</dd>
{{ end }}
</dl>
-</aside>
+</div>
diff --git a/layouts/volumes/term.html b/layouts/volumes/term.html
index afa660e6..dffffc52 100644
--- a/layouts/volumes/term.html
+++ b/layouts/volumes/term.html
@@ -1,7 +1,7 @@
{{ define "main" }}
{{ partial "volumes/hero.html" . }}
-<article itemscope itemtype="https://schema.org/PublicationVolume">
+<div class="document-content" itemscope itemtype="https://schema.org/PublicationVolume">
<meta itemprop="name" content="{{ partial "PrepareHTML" .Title }}">
{{- if .Params.image -}}
{{- $image := partial "GetMedia" .Params.image.id -}}
@@ -15,10 +15,10 @@
<div class="content">
{{ partial "volumes/image.html" . }}
{{ partial "volumes/description.html" . }}
- {{ partial "volumes/aside.html" . }}
+ {{ partial "volumes/document-aside.html" . }}
{{ partial "volumes/table-contents.html" . }}
</div>
</div>
-</article>
+</div>
{{ end }}
--
GitLab