From bfb4fdcf10102b93ba72a2ea446de01e866fce91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20V=C3=A4nttinen?=
<31741222+eebbi@users.noreply.github.com>
Date: Tue, 26 Mar 2024 08:22:10 +0200
Subject: [PATCH 1/3] TMS-1013: Add event weekly entry dates to event partial
(#28)
* TMS-1013: Add event weekly entry dates to event partial
* TMS-1013: Update changelog
---
CHANGELOG.MD | 4 ++++
.../single-dynamic-event-info.dust | 18 ++++++++++++++----
style.css | 2 +-
3 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 41e24df..6f5f201 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [Unreleased]
+## [1.3.3] - 2024-03-26
+
+- TMS-1013: Add event weekly entry dates to event partial
+
## [1.3.2] - 2024-03-18
- TMS-1017: Add image alt-text to imported news single-article
diff --git a/partials/views/single-dynamic-event/single-dynamic-event-info.dust b/partials/views/single-dynamic-event/single-dynamic-event-info.dust
index 2075117..7c7a018 100644
--- a/partials/views/single-dynamic-event/single-dynamic-event-info.dust
+++ b/partials/views/single-dynamic-event/single-dynamic-event-info.dust
@@ -4,11 +4,21 @@
{>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.date_title template_classes=template_classes.info_group_title icon="date" /}
- {#event.normalized.dates}
-
- {date|html}
-
+ {?event.normalized.dates}
+ {#event.normalized.dates}
+
+ {date|html}
+
+ {/event.normalized.dates}
{/event.normalized.dates}
+
+ {?event.normalized.entries}
+ {#event.normalized.entries}
+
+ {date|attr}
+
+ {/event.normalized.entries}
+ {/event.normalized.entries}
{/event.normalized.date}
diff --git a/style.css b/style.css
index 678fc6f..f497754 100644
--- a/style.css
+++ b/style.css
@@ -1,7 +1,7 @@
/*
* Theme Name: TMS Theme Vapriikki
* Description: Tampere Multisite Vapriikki Theme
- * Version: 1.3.2
+ * Version: 1.3.3
* Author: Geniem
* Author URI: https://geniem.fi
* Template: tms-theme-base
From d2f63a5016b8683633cda1efaa276e49dd0cffef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20V=C3=A4nttinen?=
<31741222+eebbi@users.noreply.github.com>
Date: Tue, 26 Mar 2024 08:28:46 +0200
Subject: [PATCH 2/3] TMS-1021: Remove image carousel modal max-height (#29)
---
CHANGELOG.MD | 1 +
assets/styles/layouts/_image-carousel.scss | 27 +++++++++-------------
2 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 6f5f201..b7091af 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [1.3.3] - 2024-03-26
- TMS-1013: Add event weekly entry dates to event partial
+- TMS-1021: Remove image carousel modal max-height
## [1.3.2] - 2024-03-18
diff --git a/assets/styles/layouts/_image-carousel.scss b/assets/styles/layouts/_image-carousel.scss
index e4175fd..3df3c58 100644
--- a/assets/styles/layouts/_image-carousel.scss
+++ b/assets/styles/layouts/_image-carousel.scss
@@ -12,7 +12,7 @@
display: inline-block;
overflow: hidden;
max-width: 70vw;
-
+
img {
object-fit: contain;
clip-path: circle(closest-side);
@@ -36,11 +36,11 @@
}
- &__modal-control{
+ &__modal-control {
&.slick-arrow {
background-color: transparent;
- border:none;
+ border: none;
.icon {
fill: $white;
@@ -64,7 +64,7 @@
right: 0;
}
}
-
+
.image-carousel__item {
display: flex !important;
flex-direction: column;
@@ -76,33 +76,28 @@
width: auto;
}
}
-
- .img-wrapper{
- flex:2 1 auto;
+
+ .img-wrapper {
+ flex :2 1 auto;
max-height: 100%;
- height:auto;
+ height: auto;
min-width: 0;
min-height: 50%;
display: flex;
align-items: flex-end;
- img{
+ img {
max-width: 100%;
- max-height: 100% !important;
min-height: 100px;
object-fit: contain;
}
}
-
+
.image-block__meta {
- flex:1 1 auto;
+ flex: 1 1 auto;
width: 100%;
}
-
-
}
-
-
}
.slick-track .modal-trigger:focus {
From dc617b26a7706a52e84dbb530f239d790bee5293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20V=C3=A4nttinen?=