Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TMS-970: Add image meta to cta and content-columns components #36

Merged
merged 2 commits into from
Oct 23, 2023
Merged

TMS-970: Add image meta to cta and content-columns components #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fbd6f4
TMS-970: Add image meta to cta and content-columns components
eebbi Oct 16, 2023
b85fa1e
1.1.7
eebbi Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.MD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [1.1.7] - 2023-10-23

- TMS-970: Add image meta to call-to-action and content-columns components

## [1.1.6] - 2023-10-12

- TMS-936: Image carousel accessibility fixes
Expand Down
11 changes: 9 additions & 2 deletions partials/layouts/layout-call-to-action.dust
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div {?anchor}id="{anchor|attr}"{/anchor} class="call-to-action {accent_color|attr}">
<div class="keep-vertical-spacing">

{#rows}
<div class="call-to-action__item section is-flex is-justify-content-center pt-6 pb-6 {bg_style|attr}">
<div class="container columns is-variable is-6 is-vcentered {container_class|attr}">
Expand All @@ -11,6 +11,14 @@
{@image id=image.id size="large" class="objectfit-image" /}
</div>
{>"shared/layout-before-main-content" /}

{@isset key1=display_caption key2=image.caption method="and" }
{>"ui/image/image-caption" /}
{/isset}

{?display_artist}
{>"ui/image/image-meta-minimal" /}
{/display_artist}
</div>
{/image}

Expand All @@ -33,6 +41,5 @@
</div>
{/rows}


</div>
</div>
8 changes: 8 additions & 0 deletions partials/layouts/layout-content-columns.dust
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@
<div class="image">
{@image id=image.id size="large" class="objectfit-image" /}
</div>

{@isset key1=display_caption key2=image.caption method="AND" }
{>"ui/image/image-caption" /}
{/isset}

{?display_artist}
{>"ui/image/image-meta-minimal" /}
{/display_artist}
</div>
{/image}

Expand Down
Loading