From 375e50e3b38ca0c158f9e240a603f2af24550b14 Mon Sep 17 00:00:00 2001
From: alexisben <alex@noesya.coop>
Date: Wed, 27 Dec 2023 21:22:43 +0100
Subject: [PATCH] add buttons and handle raw ics data
---
assets/sass/_theme/_configuration.sass | 7 ++++
.../sass/_theme/design-system/typography.sass | 14 +++++++-
assets/sass/_theme/sections/events.sass | 35 +++++++++++--------
layouts/partials/events/event-infos.html | 20 +++++++----
layouts/partials/posts/post-infos.html | 2 +-
5 files changed, 56 insertions(+), 22 deletions(-)
diff --git a/assets/sass/_theme/_configuration.sass b/assets/sass/_theme/_configuration.sass
index f33cd9d0..52139be9 100644
--- a/assets/sass/_theme/_configuration.sass
+++ b/assets/sass/_theme/_configuration.sass
@@ -147,6 +147,13 @@ $btn-border-radius: px2rem(4) !default
$btn-border: 1px solid $color-text !default
$btn-hover-background: $color-background-alt !default
+// Chip
+$chip-background: $color-background !default
+$chip-background-hover: $color-background-alt !default
+$chip-border: 1px solid $color-border !default
+$chip-border-radius: $btn-border-radius !default
+$chip-color: $color-text !default
+
// Form
$form-btn-color: $color-background !default
$form-btn-background-color: $color-accent !default
diff --git a/assets/sass/_theme/design-system/typography.sass b/assets/sass/_theme/design-system/typography.sass
index bbd9a4bb..b17ab94d 100644
--- a/assets/sass/_theme/design-system/typography.sass
+++ b/assets/sass/_theme/design-system/typography.sass
@@ -269,7 +269,19 @@ a,
@include icon-block(link-blank-block, after)
&:hover
background: $btn-hover-background
-
+
+.chip
+ @include meta
+ background: $chip-background
+ border: $chip-border
+ border-radius: $chip-border-radius
+ color: $chip-color
+ text-decoration: none
+ padding: space(1) space(4)
+ transition: background 0.3s
+ &:hover
+ background: $chip-background-hover
+
.link-more
@include link
@include icon(arrow, before)
diff --git a/assets/sass/_theme/sections/events.sass b/assets/sass/_theme/sections/events.sass
index 0f4a8123..377c0c52 100644
--- a/assets/sass/_theme/sections/events.sass
+++ b/assets/sass/_theme/sections/events.sass
@@ -6,12 +6,13 @@
.lead
@include h3
// Safe spacing if post is empty
- .document-content
- min-height: 350px
- &::after
- content: ''
- display: block
- height: 1px
+ @include media-breakpoint-up(desktop)
+ .document-content
+ min-height: 600px
+ &::after
+ content: ''
+ display: block
+ height: 1px
.events__section
.archive-link
@@ -27,10 +28,8 @@
text-align: left
.event-infos
- margin-bottom: 0
- @include meta
@include list-reset
- font-size: $table-body-size
+ padding-bottom: $spacing3
@include media-breakpoint-up(desktop)
font-size: $table-body-size-desktop
.event-date
@@ -39,9 +38,8 @@
@include list-reset
> li
padding-top: $spacing0
- padding-bottom: $spacing0
- padding: 1rem 0
- font-family: $body-font-family
+ &:not(:last-child)
+ padding-bottom: $spacing0
> span
@include meta
color: $color-text-alt
@@ -52,11 +50,20 @@
@include icon(arrow)
&::before
padding-right: 0.3rem
- a
- @include link($color-accent)
.events-categories
display: flex
gap: space(2)
+ a
+ @include link($color-accent)
+ .events-actions
+ align-items: start
+ display: flex
+ flex-direction: column
+ gap: space(1)
+ padding-bottom: 0
+ a
+ &::after
+ display: none
.share
a
color: inherit
diff --git a/layouts/partials/events/event-infos.html b/layouts/partials/events/event-infos.html
index 19c250c8..9c5b2364 100644
--- a/layouts/partials/events/event-infos.html
+++ b/layouts/partials/events/event-infos.html
@@ -21,7 +21,7 @@
{{ end }}
{{ if .Params.events_categories }}
<li>
- <span>{{ i18n "events.category" (dict "Count" ( len .Params.events_categories )) }}</span>
+ <span>{{ i18n "events.category" ( len .Params.events_categories ) }}</span>
{{ partial "events/categories.html" . }}
</li>
{{ end }}
@@ -32,13 +32,21 @@
{{ with .Params.dates.add_to_calendar }}
{{ $links := . }}
- <li class="events-calendar">
+ <li class="events-actions">
<span>{{ i18n "events.add_to_calendar.title" }}</span>
{{- $types := slice "ical" "google" "office" "outlook" "yahoo" -}}
- {{- range $types -}}
- {{ $label := i18n (printf "events.add_to_calendar.%s" .) }}
- {{ with index $links . }}
- <a href="{{ . }}" class="chip">{{ $label }}</a>
+ {{- range $type := $types -}}
+ {{ $label := i18n (printf "events.add_to_calendar.%s" $type) }}
+ {{ with index $links $type }}
+ <a class="chip"
+ {{ if eq $type "ical" -}}
+ {{ printf `href="%s"` . | safeHTMLAttr }} download
+ {{ else }}
+ href="{{ . }}"
+ target="_blank"
+ {{ end }} >
+ {{- $label -}}
+ </a>
{{- end }}
{{- end }}
</li>
diff --git a/layouts/partials/posts/post-infos.html b/layouts/partials/posts/post-infos.html
index 6ecc0e9a..47b8b35b 100644
--- a/layouts/partials/posts/post-infos.html
+++ b/layouts/partials/posts/post-infos.html
@@ -1,7 +1,7 @@
<ul class="post-infos">
{{ if .Params.posts_categories }}
<li>
- <span>{{ i18n "posts.categories" ( len .Params.posts_categories ) }}</span>
+ <span>{{ i18n "posts.category" ( len .Params.posts_categories ) }}</span>
{{ partial "posts/categories.html" . }}
</li>
{{ end }}
--
GitLab