Skip to content

Commit

Permalink
Merge branch 'TMS-1092' into stage
Browse files Browse the repository at this point in the history
  • Loading branch information
eebbi committed Dec 18, 2024
2 parents e4713e7 + 3d32c53 commit fdf96c6
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 16 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.MD
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]

- TMS-1092: Move page heading from over hero image to content area & remove hero overlay

## [1.15.1] - 2024-09-25

- TMS-1067: Show price-info for event in listing if it's free

## [1.15.0] - 2024-08-21
Expand Down
48 changes: 48 additions & 0 deletions partials/page.dust
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{>"shared/base" /}

{<content}
<main class="main-content" id="main-content">
{?Page.hero_image}
{>"views/page/page-hero" /}
{/Page.hero_image}

{?Header.breadcrumbs}
<div class="breadcrumbs-container section pt-6 pb-7">
<div class="container">
<div class="columns">
<div class="column">
{>"ui/breadcrumbs" breadcrumbs=Header.breadcrumbs /}
</div>
</div>
</div>
</div>
{/Header.breadcrumbs}

<section class="page__hero-heading section pt-5-desktop pt-0 pb-0">
{>"ui/entry-title" class="mt-0 has-text-centered is-uppercase" /}
</section>

<section class="section {?Header.hero_image}pt-7{:else}{?Header.breadcrumbs}pt-0{:else}pt-10{/Header.breadcrumbs}{/Header.hero_image}">
<div class="container">
<div class="columns">
<div class="column is-12">
<article class="entry">
{>"ui/entry-title" class="mt-0 has-text-centered" hero_image=Page.hero_image /}
<div class="entry__content is-content-grid keep-vertical-spacing">
{@content /}
</div>
</article>
</div>
</div>
</div>
</section>

{>"ui/components" components=Page.components /}
</main>

{#Page}
{?post_siblings}
{>"ui/sibling-navigation" /}
{/post_siblings}
{/Page}
{/content}
16 changes: 1 addition & 15 deletions partials/views/page/page-hero.dust
Original file line number Diff line number Diff line change
@@ -1,15 +1 @@
<section class="page__hero section is-relative pt-0 pb-0 has-background-cover" {@inlinebg id=Page.hero_image size="fullhd" /}>
{?Page.use_overlay}
<div class="overlay overlay--dark-50"></div>
{/Page.use_overlay}

<div class="is-absolute has-bottom-2 has-right-0 has-left-0 ">
<div class="container">
<div class="columns">
<div class="column is-8 is-offset-2">
{>"ui/entry-title" class="mt-0 has-text-centered has-text-white mb-0 is-uppercase" /}
</div>
</div>
</div>
</div>
</section>
<section class="page__hero section is-relative pt-0 pb-0 has-background-cover" {@inlinebg id=Page.hero_image size="fullhd" /}></section>
2 changes: 1 addition & 1 deletion style.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Theme Name: TMS Theme Filharmonia
* Description: Tampere Multisite Filharmonia Theme
* Version: 1.14.0
* Version: 1.15.1
* Author: Geniem
* Author URI: https://geniem.fi
* Template: tms-theme-base
Expand Down

0 comments on commit fdf96c6

Please sign in to comment.