From c1b3c6fba7b4ae2f20e25da6acfc320287eca905 Mon Sep 17 00:00:00 2001
From: alexisben <alex@noesya.coop>
Date: Wed, 28 Dec 2022 10:41:37 +0100
Subject: [PATCH] organization
---
assets/sass/_theme/_configuration.sass | 1 -
.../sass/_theme/design-system/typography.sass | 12 ++++
.../sass/_theme/sections/organizations.sass | 67 ++++++++++++++++---
i18n/en.yml | 2 +
i18n/fr.yml | 2 +
layouts/organizations/single.html | 10 ++-
layouts/partials/organizations/content.html | 2 +-
layouts/partials/organizations/logo.html | 5 +-
8 files changed, 80 insertions(+), 21 deletions(-)
diff --git a/assets/sass/_theme/_configuration.sass b/assets/sass/_theme/_configuration.sass
index 8dd0f422..8cfe6e28 100644
--- a/assets/sass/_theme/_configuration.sass
+++ b/assets/sass/_theme/_configuration.sass
@@ -195,7 +195,6 @@ $breadcrumb-color: $hero-color !default
$breadcrumb-icon: "caret-right" !default
$breadcrumb-icon-color: $color-text-alt !default
-
// Icons
$icons: ()
$icons: map-merge($icons, ("arrow": "\e905"))
diff --git a/assets/sass/_theme/design-system/typography.sass b/assets/sass/_theme/design-system/typography.sass
index 9444b346..dfb770e0 100644
--- a/assets/sass/_theme/design-system/typography.sass
+++ b/assets/sass/_theme/design-system/typography.sass
@@ -179,18 +179,30 @@ small, .small
@mixin blockquote
margin: 0
+ font-family: $quote-font-family
+ font-size: $quote-size
+ font-weight: $quote-weight
+ font-style: $quote-style
+ line-height: $quote-line-height
+ @include media-breakpoint-up(desktop)
+ font-size: $quote-size-desktop-long
cite
font-size: px2rem(18)
font-style: normal
blockquote, .blockquote
@include blockquote
+ font-style: italic
p
margin-top: 0
margin-bottom: 0
+ p
margin-top: $spacing0
+
+p:empty
+ display: none
+
p + ul
margin-top: 0
diff --git a/assets/sass/_theme/sections/organizations.sass b/assets/sass/_theme/sections/organizations.sass
index a28002ca..07465175 100644
--- a/assets/sass/_theme/sections/organizations.sass
+++ b/assets/sass/_theme/sections/organizations.sass
@@ -35,14 +35,59 @@
margin-top: $spacing2
.organizations__page
- .content
- margin-top: $spacing2
- @include grid(2, md)
- .media
- max-width: 200px
- .contacts-list
- padding-left: 0
- li
- list-style-type: none
- span
- display: block
\ No newline at end of file
+ .document-content
+ padding-bottom: $spacing3
+ .organization-meta
+ .logo
+ figcaption
+ text-align: right
+ @include meta
+ margin-bottom: $spacing0
+ picture
+ aspect-ratio: 1/1
+ background: $color-background-alt
+ display: block
+ padding: $spacing2
+ margin-bottom: half($spacing0)
+ img
+ width: 100%
+ height: 100%
+ object-fit: contain
+ object-position: center
+ .contacts-list
+ @include list-reset
+ padding-left: 0
+ text-align: right
+ margin-top: $spacing1
+ li
+ list-style-type: none
+ + li
+ margin-top: $spacing1
+ span
+ @include meta
+ display: block
+ @include media-breakpoint-down(desktop)
+ .document-content
+ .organization-meta
+ margin-top: $spacing3
+ .logo
+ display: flex
+ justify-content: space-between
+ picture
+ width: 66.6%
+ .contacts-list
+ li
+ display: flex
+ justify-content: space-between
+ align-items: baseline
+
+ @include media-breakpoint-up(desktop)
+ .document-content
+ > .container
+ display: flex
+ justify-content: space-between
+ gap: $grid-gutter
+ [itemprop="articleBody"]
+ width: col(8)
+ .organization-meta
+ width: col(3)
\ No newline at end of file
diff --git a/i18n/en.yml b/i18n/en.yml
index b5a6b2ad..d3afd31f 100644
--- a/i18n/en.yml
+++ b/i18n/en.yml
@@ -97,6 +97,8 @@ formats:
zip: Compressed archive
gz: Compressed archive
tar: Compressed archive
+organizations:
+ logo: Logo
page_not_found: 404 page not found
pages:
details: Details
diff --git a/i18n/fr.yml b/i18n/fr.yml
index be465580..a58c40bf 100644
--- a/i18n/fr.yml
+++ b/i18n/fr.yml
@@ -97,6 +97,8 @@ formats:
zip: Compressed archive
gz: Compressed archive
tar: Compressed archive
+organizations:
+ logo: Logo
page_not_found: 404 page non trouvée
pages:
details: En détail
diff --git a/layouts/organizations/single.html b/layouts/organizations/single.html
index 9037b15d..8945b9f1 100644
--- a/layouts/organizations/single.html
+++ b/layouts/organizations/single.html
@@ -1,13 +1,11 @@
{{ define "main" }}
{{ partial "organizations/hero.html" . }}
- <div class="document-content container">
- <div class="content">
- <div>
+ <div class="document-content">
+ <div class="container">
+ {{ partial "organizations/content.html" . }}
+ <div class="organization-meta">
{{ partial "organizations/logo.html" . }}
- </div>
- <div>
- {{ partial "organizations/content.html" . }}
{{ partial "organizations/contacts.html" . }}
</div>
</div>
diff --git a/layouts/partials/organizations/content.html b/layouts/partials/organizations/content.html
index 106b53e6..ea9983dd 100644
--- a/layouts/partials/organizations/content.html
+++ b/layouts/partials/organizations/content.html
@@ -1,5 +1,5 @@
{{ if (partial "GetTextFromHTML" .Content) }}
- <div itemprop="articleBody">
+ <div itemprop="articleBody" class="rich-text">
{{
partial "PrepareHTML" (
partial "H2AddId" .Content
diff --git a/layouts/partials/organizations/logo.html b/layouts/partials/organizations/logo.html
index 01d6597f..b4fff2e0 100644
--- a/layouts/partials/organizations/logo.html
+++ b/layouts/partials/organizations/logo.html
@@ -1,5 +1,6 @@
{{- if .Params.logo -}}
- <div class="media">
+ <figure class="logo">
+ <figcaption>{{ i18n "organizations.logo" }}</figcaption>
{{- partial "commons/image.html"
(dict
"image" .Params.logo
@@ -8,5 +9,5 @@
"tablet" "196"
"desktop" "396"
) -}}
- </div>
+ </figure>
{{- end -}}
--
GitLab