From 3aa5cef42516ede881ac3c2ab933aa85f86a96da Mon Sep 17 00:00:00 2001 From: Olivia206 Date: Thu, 29 Jan 2026 17:09:12 +0100 Subject: [PATCH 1/5] added subtitle to pages block --- assets/sass/_theme/blocks/pages.sass | 3 ++- assets/sass/_theme/design-system/article.sass | 4 ++++ .../sass/_theme/design-system/layouts/cards.sass | 6 +++--- .../sass/_theme/design-system/layouts/large.sass | 6 ++++-- assets/sass/_theme/sections/pages.sass | 9 +++++++-- assets/sass/_theme/sections/posts.sass | 10 ++-------- assets/sass/_theme/sections/projects.sass | 2 -- .../partials/layouts/alternate/alternate.html | 15 ++++++--------- .../pages/partials/layouts/cards/cards.html | 15 ++++++--------- .../pages/partials/layouts/grid/grid.html | 15 ++++++--------- .../pages/partials/layouts/large/large.html | 15 ++++++--------- .../pages/partials/layouts/list/list.html | 15 ++++++--------- layouts/partials/pages/partials/page/heading.html | 1 + 13 files changed, 53 insertions(+), 63 deletions(-) create mode 100644 layouts/partials/pages/partials/page/heading.html diff --git a/assets/sass/_theme/blocks/pages.sass b/assets/sass/_theme/blocks/pages.sass index 7de51eb6b..9e4d6e01a 100644 --- a/assets/sass/_theme/blocks/pages.sass +++ b/assets/sass/_theme/blocks/pages.sass @@ -149,7 +149,8 @@ &--alternate .pages @include layout-alternate - .page-title + hgroup, + > .page-title + p margin-top: $spacing-1 &--large diff --git a/assets/sass/_theme/design-system/article.sass b/assets/sass/_theme/design-system/article.sass index 943ef633d..546a4fd9e 100644 --- a/assets/sass/_theme/design-system/article.sass +++ b/assets/sass/_theme/design-system/article.sass @@ -4,6 +4,8 @@ position: relative display: flex flex-direction: column + [class$="-subtitle"] + color: var(--color-text-alt) .media margin-bottom: $spacing-3 order: -1 @@ -33,3 +35,5 @@ @include stretched-link(before) display: block text-decoration: none + + [class$="-subtitle"] + @include h3 \ No newline at end of file diff --git a/assets/sass/_theme/design-system/layouts/cards.sass b/assets/sass/_theme/design-system/layouts/cards.sass index a99d66c22..8151902ae 100644 --- a/assets/sass/_theme/design-system/layouts/cards.sass +++ b/assets/sass/_theme/design-system/layouts/cards.sass @@ -8,9 +8,9 @@ color: $color padding: $spacing-3 position: relative - transition: background $background-duration, color $background-duration + transition: background $background-duration [class$="-title"] - @include h3 + @include article-title a color: inherit [class$="-content"] @@ -29,7 +29,7 @@ padding-top: $spacing-4 margin-top: auto a, p - transition: text-decoration-color .3s ease, color .3s ease + transition: text-decoration-color $background-duration ease, color $background-duration ease &:hover background-color: $background-hover &, a, p diff --git a/assets/sass/_theme/design-system/layouts/large.sass b/assets/sass/_theme/design-system/layouts/large.sass index fb8e8f6c8..5c6a567b2 100644 --- a/assets/sass/_theme/design-system/layouts/large.sass +++ b/assets/sass/_theme/design-system/layouts/large.sass @@ -6,7 +6,8 @@ @include article @include layout-item @include small-arrow-right-hover('.more') - [class$="-title"] + [class$="-title"], + [class$="-subtitle"] @include h2 @include media-breakpoint-down(desktop) .media @@ -26,7 +27,8 @@ @include in-page-without-sidebar article align-items: center - [class$="-title"] + [class$="-title"], + [class$="-subtitle"] @include lead [class$="-content"] width: columns(6) diff --git a/assets/sass/_theme/sections/pages.sass b/assets/sass/_theme/sections/pages.sass index 24846162a..4fe9ae10e 100644 --- a/assets/sass/_theme/sections/pages.sass +++ b/assets/sass/_theme/sections/pages.sass @@ -1,6 +1,7 @@ .page @include article($aspect-ratio: $page-media-aspect-ratio) - .page-title + .page-title, + .page-subtitle @include h4 .more @include icon(arrow-right-line, after, true) @@ -22,11 +23,15 @@ .pages &--grid @include layout-grid + .page .page-title - @include h3 + @include article-title a @include icon(arrow-right-line, after, true) @include hover-translate-icon(after) + + hgroup, + > .page-title + p margin-top: $spacing-1 diff --git a/assets/sass/_theme/sections/posts.sass b/assets/sass/_theme/sections/posts.sass index 28238282e..78a525bab 100644 --- a/assets/sass/_theme/sections/posts.sass +++ b/assets/sass/_theme/sections/posts.sass @@ -1,14 +1,8 @@ .post @include article .post-title - @include h3 - a - @include stretched-link - display: block - text-decoration: none - .post-subtitle - @include h3 - color: var(--color-text-alt) + @include article-title + .federated order: -1 .post-meta, diff --git a/assets/sass/_theme/sections/projects.sass b/assets/sass/_theme/sections/projects.sass index e4eed974c..7cd2a6539 100644 --- a/assets/sass/_theme/sections/projects.sass +++ b/assets/sass/_theme/sections/projects.sass @@ -11,8 +11,6 @@ .project-title, .project-subtitle @include article-title - .project-subtitle - color: var(--color-text-alt) .project-summary margin-top: $spacing-2 .project-categories diff --git a/layouts/partials/pages/partials/layouts/alternate/alternate.html b/layouts/partials/pages/partials/layouts/alternate/alternate.html index 4bf3cfc2a..61aaf142c 100644 --- a/layouts/partials/pages/partials/layouts/alternate/alternate.html +++ b/layouts/partials/pages/partials/layouts/alternate/alternate.html @@ -1,8 +1,5 @@ {{ $options := .options }} -{{ $heading_tag := partial "GetHeadingTag" (dict - "level" ( .heading_level | default 3 ) - "attributes" "class='page-title'" -) }} +{{ $heading_level := .heading_level }}