From b1170dab92a32132838c0c9a7fed9bf7fcfc4049 Mon Sep 17 00:00:00 2001 From: mmyllynen <4696381+dire@users.noreply.github.com> Date: Thu, 19 Oct 2023 11:33:57 +0300 Subject: [PATCH] UHF-8937: CSS tweaks to the supports swedish pill and order change. --- package-lock.json | 12 ++++++------ .../06_components/navigation/_table-of-contents.scss | 3 +-- src/scss/06_components/pages/_unit.scss | 1 + templates/module/helfi_tpr/tpr-unit.html.twig | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index e1af553233..0a4f94ca01 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7769,9 +7769,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001547", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001547.tgz", - "integrity": "sha512-W7CrtIModMAxobGhz8iXmDfuJiiKg1WADMO/9x7/CLNin5cpSbuBjooyoIUVB5eyCc36QuTVlkVa1iB2S5+/eA==", + "version": "1.0.30001551", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001551.tgz", + "integrity": "sha512-vtBAez47BoGMMzlbYhfXrMV1kvRF2WP/lqiMuDu1Sb4EE4LKEgjopFDSRtZfdVnslNRpOqV/woE+Xgrwj6VQlg==", "funding": [ { "type": "opencollective", @@ -29242,9 +29242,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001547", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001547.tgz", - "integrity": "sha512-W7CrtIModMAxobGhz8iXmDfuJiiKg1WADMO/9x7/CLNin5cpSbuBjooyoIUVB5eyCc36QuTVlkVa1iB2S5+/eA==" + "version": "1.0.30001551", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001551.tgz", + "integrity": "sha512-vtBAez47BoGMMzlbYhfXrMV1kvRF2WP/lqiMuDu1Sb4EE4LKEgjopFDSRtZfdVnslNRpOqV/woE+Xgrwj6VQlg==" }, "chalk": { "version": "2.4.2", diff --git a/src/scss/06_components/navigation/_table-of-contents.scss b/src/scss/06_components/navigation/_table-of-contents.scss index 89a8eaa10b..32f5c9ce9b 100644 --- a/src/scss/06_components/navigation/_table-of-contents.scss +++ b/src/scss/06_components/navigation/_table-of-contents.scss @@ -17,8 +17,7 @@ } // Add extra margin to long description and main image if table of contents is enabled. -.table-of-contents + .long-desc, -.table-of-contents + .main-image { +.table-of-contents + * { @include component-margin-top; } diff --git a/src/scss/06_components/pages/_unit.scss b/src/scss/06_components/pages/_unit.scss index d20196811a..7b6df7690a 100644 --- a/src/scss/06_components/pages/_unit.scss +++ b/src/scss/06_components/pages/_unit.scss @@ -127,6 +127,7 @@ .unit.unit--full .content-tags { margin-bottom: $spacing-and-half; + margin-top: $spacing-and-half; @include breakpoint($breakpoint-m) { margin-bottom: $spacing-double; diff --git a/templates/module/helfi_tpr/tpr-unit.html.twig b/templates/module/helfi_tpr/tpr-unit.html.twig index 299a65db96..eacd41c8e5 100644 --- a/templates/module/helfi_tpr/tpr-unit.html.twig +++ b/templates/module/helfi_tpr/tpr-unit.html.twig @@ -33,10 +33,10 @@ {% embed "@hdbt/misc/lead-in.twig" with { content: content.description_summary } %}{% endembed %} - {{ content.toc_enabled }} - {{ supports_swedish }} + {{ content.toc_enabled }} + {# Main image #} {% if content.picture_url_override|render %} {% set main_image = content.picture_url_override %}