From fdd5d1e633621aa79a07edf1ae4f54e82d8b86c1 Mon Sep 17 00:00:00 2001 From: Sabrina Bongiovanni Date: Mon, 29 Jan 2024 12:22:58 +0100 Subject: [PATCH 1/5] fix: subsite mixin styles --- .../Subsites/ItaliaTheme/Blocks/_cta.scss | 9 ++++++++- .../ItaliaTheme/Blocks/_searchSections.scss | 9 +++++++-- .../ItaliaTheme/Subsites/ItaliaTheme/_common.scss | 13 +++++-------- src/theme/ItaliaTheme/Subsites/_mixin.scss | 8 +++++--- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/theme/ItaliaTheme/Subsites/ItaliaTheme/Blocks/_cta.scss b/src/theme/ItaliaTheme/Subsites/ItaliaTheme/Blocks/_cta.scss index 765ff5f3a..b095080d3 100644 --- a/src/theme/ItaliaTheme/Subsites/ItaliaTheme/Blocks/_cta.scss +++ b/src/theme/ItaliaTheme/Subsites/ItaliaTheme/Blocks/_cta.scss @@ -1,6 +1,6 @@ @use '../../all_variables' as *; -@mixin block($subsite-secondary) { +@mixin block($subsite-secondary, $subsite-secondary-text) { .cta-block { .cta-block-wrapper { background-color: $subsite-secondary; @@ -8,6 +8,13 @@ &.has-image { background: none; } + + a { + color: $subsite-secondary-text; + } } } + .cms-ui .cta-block .a { + color: $subsite-secondary-text; + } } diff --git a/src/theme/ItaliaTheme/Subsites/ItaliaTheme/Blocks/_searchSections.scss b/src/theme/ItaliaTheme/Subsites/ItaliaTheme/Blocks/_searchSections.scss index ae2759ca4..4e7a77fec 100644 --- a/src/theme/ItaliaTheme/Subsites/ItaliaTheme/Blocks/_searchSections.scss +++ b/src/theme/ItaliaTheme/Subsites/ItaliaTheme/Blocks/_searchSections.scss @@ -5,7 +5,8 @@ $subsite-primary-text, $subsite-secondary, $subsite-secondary-text, - $subsite-primary-a0 + $subsite-primary-a0, + $subsite-light-theme ) { .container .block { .searchSections { @@ -41,7 +42,11 @@ &.search { .search-wrapper .autocomplete-icon .icon { - fill: $subsite-primary; + @if $subsite-light-theme { + fill: $subsite-secondary; + } @else { + fill: $subsite-primary; + } } } } diff --git a/src/theme/ItaliaTheme/Subsites/ItaliaTheme/_common.scss b/src/theme/ItaliaTheme/Subsites/ItaliaTheme/_common.scss index 1a59abfe3..6cb0a9a84 100644 --- a/src/theme/ItaliaTheme/Subsites/ItaliaTheme/_common.scss +++ b/src/theme/ItaliaTheme/Subsites/ItaliaTheme/_common.scss @@ -57,7 +57,11 @@ color: $subsite-primary-text !important; } .select-pill.text-primary { - color: $subsite-primary !important; + @if ($subsite-light-theme) { + color: $subsite-secondary !important; + } @else { + color: $subsite-primary !important; + } div { color: inherit; @@ -84,13 +88,6 @@ } // icon external link - .external-link { - @if $subsite-light-theme { - fill: $subsite-link-color !important; - } @else { - fill: $subsite-primary !important; - } - } .flag-icon { background: $subsite-secondary; diff --git a/src/theme/ItaliaTheme/Subsites/_mixin.scss b/src/theme/ItaliaTheme/Subsites/_mixin.scss index 0eeb0bd93..4c6a8559c 100644 --- a/src/theme/ItaliaTheme/Subsites/_mixin.scss +++ b/src/theme/ItaliaTheme/Subsites/_mixin.scss @@ -129,7 +129,7 @@ $subsite-secondary-text ); @include it-contacts.block($subsite-primary, $subsite-primary-text); - @include it-cta.block($subsite-secondary); + @include it-cta.block($subsite-secondary, $subsite-secondary-text); @include it-form.block( $subsite-primary, $subsite-primary-text, @@ -169,7 +169,8 @@ $subsite-primary-text, $subsite-secondary, $subsite-secondary-text, - $subsite-primary-a0 + $subsite-primary-a0, + $subsite-light-theme ); @include it-table-contents.block($subsite-primary); @include it-views.common( @@ -206,7 +207,8 @@ #categoryCollapse .btn-icon.btn.btn-outline-secondary { border-color: $subsite-primary; - box-shadow: inset 0 0 0 1px $subsite-primary, + box-shadow: + inset 0 0 0 1px $subsite-primary, 0 0 0 0.2rem rgba(var($subsite-primary), 0.2); color: $subsite-primary; } From 802cf22bb75e1b1fbe0ccdcefb539dceb026a67a Mon Sep 17 00:00:00 2001 From: Sabrina Bongiovanni Date: Mon, 29 Jan 2024 12:24:32 +0100 Subject: [PATCH 2/5] chore: added release.md info --- RELEASE.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/RELEASE.md b/RELEASE.md index 2002f3d4b..99924734b 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -41,6 +41,12 @@ - ... --> +## Versione X.X.X (dd/mm/yyyy) + +### Fix + +- Sistemati problemi negli stili per i sottositi + ## Versione 11.3.2 (19/01/2023) ### Fix From 178e335036369fa3b0f450e9c8e7032a83755582 Mon Sep 17 00:00:00 2001 From: sabrina-bongiovanni <116291154+sabrina-bongiovanni@users.noreply.github.com> Date: Mon, 29 Jan 2024 15:52:12 +0100 Subject: [PATCH 3/5] Apply suggestions from code review Co-authored-by: Martina Bustacchini <41484878+deodorhunter@users.noreply.github.com> --- src/theme/ItaliaTheme/Subsites/ItaliaTheme/_common.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/theme/ItaliaTheme/Subsites/ItaliaTheme/_common.scss b/src/theme/ItaliaTheme/Subsites/ItaliaTheme/_common.scss index 6cb0a9a84..88f4cb7dc 100644 --- a/src/theme/ItaliaTheme/Subsites/ItaliaTheme/_common.scss +++ b/src/theme/ItaliaTheme/Subsites/ItaliaTheme/_common.scss @@ -87,7 +87,6 @@ } } - // icon external link .flag-icon { background: $subsite-secondary; From 52ed3d979027d2562687bf5e70e8cdcb7cb45b5e Mon Sep 17 00:00:00 2001 From: Sabrina Bongiovanni Date: Mon, 29 Jan 2024 17:43:30 +0100 Subject: [PATCH 4/5] fix: typo --- src/theme/ItaliaTheme/Subsites/ItaliaTheme/Blocks/_cta.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/theme/ItaliaTheme/Subsites/ItaliaTheme/Blocks/_cta.scss b/src/theme/ItaliaTheme/Subsites/ItaliaTheme/Blocks/_cta.scss index b095080d3..f8d760f35 100644 --- a/src/theme/ItaliaTheme/Subsites/ItaliaTheme/Blocks/_cta.scss +++ b/src/theme/ItaliaTheme/Subsites/ItaliaTheme/Blocks/_cta.scss @@ -14,7 +14,7 @@ } } } - .cms-ui .cta-block .a { + .cms-ui .cta-block a { color: $subsite-secondary-text; } } From 6eff4505ea9e31459d5d61e6f587be71f1849d91 Mon Sep 17 00:00:00 2001 From: Sabrina Bongiovanni Date: Tue, 30 Jan 2024 09:58:32 +0100 Subject: [PATCH 5/5] fix: changed select pill text color when theme is light --- src/theme/ItaliaTheme/Subsites/ItaliaTheme/_common.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/theme/ItaliaTheme/Subsites/ItaliaTheme/_common.scss b/src/theme/ItaliaTheme/Subsites/ItaliaTheme/_common.scss index 88f4cb7dc..f2f4f46ff 100644 --- a/src/theme/ItaliaTheme/Subsites/ItaliaTheme/_common.scss +++ b/src/theme/ItaliaTheme/Subsites/ItaliaTheme/_common.scss @@ -58,7 +58,7 @@ } .select-pill.text-primary { @if ($subsite-light-theme) { - color: $subsite-secondary !important; + color: $subsite-link-color !important; } @else { color: $subsite-primary !important; } @@ -87,7 +87,6 @@ } } - .flag-icon { background: $subsite-secondary; }