From d52a02d7218d6ccfcfa13a1b66993887820f7114 Mon Sep 17 00:00:00 2001 From: Giulia Ghisini <51911425+giuliaghisini@users.noreply.github.com> Date: Mon, 18 Sep 2023 13:23:32 +0200 Subject: [PATCH 1/5] fix: fix container in edit mode (#328) --- .../Listing/ContentInEvidenceTemplate.jsx | 6 +- src/theme/_cms-ui.scss | 1 + src/theme/_cms-ui_container.scss | 87 +++++++++++++++++++ 3 files changed, 89 insertions(+), 5 deletions(-) create mode 100644 src/theme/_cms-ui_container.scss diff --git a/src/components/ItaliaTheme/Blocks/Listing/ContentInEvidenceTemplate.jsx b/src/components/ItaliaTheme/Blocks/Listing/ContentInEvidenceTemplate.jsx index 19fdf51f2..586e577d3 100644 --- a/src/components/ItaliaTheme/Blocks/Listing/ContentInEvidenceTemplate.jsx +++ b/src/components/ItaliaTheme/Blocks/Listing/ContentInEvidenceTemplate.jsx @@ -46,11 +46,7 @@ const ContentInEvidenceTemplate = ({ return (
- + {title && ( diff --git a/src/theme/_cms-ui.scss b/src/theme/_cms-ui.scss index 954fc360a..167967a92 100644 --- a/src/theme/_cms-ui.scss +++ b/src/theme/_cms-ui.scss @@ -1,3 +1,4 @@ +@import 'cms-ui_container'; body.cms-ui { .block { font-family: $font-family-serif; diff --git a/src/theme/_cms-ui_container.scss b/src/theme/_cms-ui_container.scss new file mode 100644 index 000000000..2eed80ace --- /dev/null +++ b/src/theme/_cms-ui_container.scss @@ -0,0 +1,87 @@ +$maxWidth: 100%; +$emSize: 14px; +$scrollbarWidth: 17px; +$toolbarWidth: 80px; +$sidebarWidth: 375px; +$collapsedWidth: 20px; + +$tabletBreakpoint: 768px; +$largeMonitorBreakpoint: 1200px; +$computerBreakpoint: 992px; + +$largestTabletScreen: ($computerBreakpoint - 1px); + +/* Devices */ +$mobileMinimumGutter: 0em; +$mobileWidth: auto; +$mobileGutter: 1em; + +$tabletMinimumGutter: ($emSize * 1); +$tabletWidth: $tabletBreakpoint - ($tabletMinimumGutter * 2) - $scrollbarWidth; +$tabletGutter: auto; + +$computerMinimumGutter: ($emSize * 1.5); +$computerWidth: $computerBreakpoint - ($computerMinimumGutter * 2) - + $scrollbarWidth; +$computerGutter: auto; + +$largeMonitorMinimumGutter: ($emSize * 2); +$largeMonitorWidth: $largeMonitorBreakpoint - ($largeMonitorMinimumGutter * 2) - + $scrollbarWidth; +$largeMonitorGutter: auto; + +@mixin contentWidthMedia($width, $gutter, $offset) { + .public-ui .container { + width: $width !important; + margin-right: $gutter !important; + margin-left: $gutter !important; + } + .public-ui .full-width > .px-4.container { + padding-left: 0 !important; + padding-right: 0 !important; + } +} + +@mixin contentWidth($offset) { + @media only screen and (max-width: #{map-get($grid-breakpoints, sm)} + $offset) { + @include contentWidthMedia($mobileWidth, $mobileGutter, -12px); + } + @media only screen and (min-width: $tabletBreakpoint + $offset) and (max-width: $largestTabletScreen + $offset) { + @include contentWidthMedia($tabletWidth, $tabletGutter, -30px); + } + @media only screen and (min-width: $computerBreakpoint + $offset) { + @include contentWidthMedia($computerWidth, $computerGutter, -30px); + } + + @media only screen and (min-width: $largeMonitorBreakpoint + $offset) { + @include contentWidthMedia($largeMonitorWidth, $largeMonitorGutter, -30px); + } +} + +body.cms-ui:not(.has-toolbar):not(.has-sidebar):not(.has-toolbar-collapsed):not(.has-sidebar-collapsed) { + @include contentWidth(0); +} + +body.cms-ui.has-toolbar:not(.has-sidebar):not(.has-sidebar-collapsed) { + @include contentWidth($toolbarWidth); +} + +body.cms-ui.has-toolbar.has-sidebar { + @include contentWidth($toolbarWidth + $sidebarWidth); +} + +body.cms-ui.has-toolbar.has-sidebar-collapsed { + @include contentWidth($toolbarWidth + $collapsedWidth); +} + +body.cms-ui.has-toolbar-collapsed:not(.has-sidebar):not(.has-sidebar-collapsed) { + @include contentWidth($collapsedWidth); +} + +body.cms-ui.has-toolbar-collapsed.has-sidebar { + @include contentWidth($collapsedWidth + $sidebarWidth); +} + +body.cms-ui.has-toolbar-collapsed.has-sidebar-collapsed { + @include contentWidth($collapsedWidth + $collapsedWidth); +} From 9e8579ba2f19b6436d004879b0bfb07a1a727637 Mon Sep 17 00:00:00 2001 From: Giulia Ghisini <51911425+giuliaghisini@users.noreply.github.com> Date: Tue, 19 Sep 2023 09:04:19 +0200 Subject: [PATCH 2/5] Update RELEASE.md (#335) --- RELEASE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 21b276f99..492a759a8 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -6,7 +6,7 @@ + +## Versione X.X.X + +### Fix + +- Sistemato l'allineamento degli elementi nel blocco Contatti: se ci sono meno di tre elementi l'allineamento è centrato, se ce ne sono più di 3 l'allineamento è a sinistra. diff --git a/src/components/ItaliaTheme/Blocks/ContactsBlock/Edit.jsx b/src/components/ItaliaTheme/Blocks/ContactsBlock/Edit.jsx index 2627edb3d..5540daa4d 100644 --- a/src/components/ItaliaTheme/Blocks/ContactsBlock/Edit.jsx +++ b/src/components/ItaliaTheme/Blocks/ContactsBlock/Edit.jsx @@ -106,9 +106,15 @@ class Edit extends SubblocksEdit {
- + 3 + ? 'justify-content-start' + : 'justify-content-center' + } + > {this.state.subblocks.map((subblock, subindex) => ( - + { )} - + 3 + ? 'justify-content-start' + : 'justify-content-center' + } + > {data.subblocks.map((subblock, index) => ( Date: Tue, 19 Sep 2023 16:42:44 +0200 Subject: [PATCH 4/5] Us 42249 v3 a11y react dates focus date (#344) * fix: fixed focus styles for CalendarMonth * chore: added release info --- RELEASE.md | 1 + .../Widgets/_react-dates-override.scss | 15 +++++++++++++++ src/theme/site.scss | 1 + 3 files changed, 17 insertions(+) create mode 100644 src/theme/ItaliaTheme/Widgets/_react-dates-override.scss diff --git a/RELEASE.md b/RELEASE.md index 732987272..10bbbb86c 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -35,3 +35,4 @@ ### Fix - Sistemato l'allineamento degli elementi nel blocco Contatti: se ci sono meno di tre elementi l'allineamento è centrato, se ce ne sono più di 3 l'allineamento è a sinistra. +- Migliorata accessibilità del calendario nel blocco ricerca Eventi e ricerca Bandi diff --git a/src/theme/ItaliaTheme/Widgets/_react-dates-override.scss b/src/theme/ItaliaTheme/Widgets/_react-dates-override.scss new file mode 100644 index 000000000..ba97a5789 --- /dev/null +++ b/src/theme/ItaliaTheme/Widgets/_react-dates-override.scss @@ -0,0 +1,15 @@ +table.CalendarMonth_table { + border-collapse: separate; + + td.CalendarDay__selected:focus { + border: 1px solid white; + border-radius: 100%; + outline: 2px solid $focus-outline-color; + } + + td.CalendarDay__default:focus { + border: none !important; + box-shadow: none !important; + outline: 2px solid $focus-outline-color !important; + } +} diff --git a/src/theme/site.scss b/src/theme/site.scss index 9257da174..70e4fe563 100644 --- a/src/theme/site.scss +++ b/src/theme/site.scss @@ -113,6 +113,7 @@ @import 'ItaliaTheme/Widgets/blocksWidget'; @import 'ItaliaTheme/Widgets/subsiteSocialLinks'; @import 'ItaliaTheme/Widgets/reactSelect'; +@import 'ItaliaTheme/Widgets/react-dates-override'; @import 'ItaliaTheme/Widgets/textInput'; @import 'ItaliaTheme/Widgets/dataGridWidget'; @import 'ItaliaTheme/Widgets/canaleDigitaleWidget'; From a3110953b2e99425e864eed8eeb870fe9eab3acb Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Wed, 20 Sep 2023 09:00:57 +0200 Subject: [PATCH 5/5] fix: i link in modulistica devono far vedere la remoteUrl e non il link (#336) * * fix: i link in modulistica devono far vedere la remoteUrl e non il link * Update RELEASE.md --- RELEASE.md | 4 +++- .../ItaliaTheme/View/CartellaModulisticaView/DocRow.jsx | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 10bbbb86c..3046d0cbc 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -30,9 +30,11 @@ - ... --> -## Versione X.X.X +## Versione X.X.X (dd/mm/yyyy) ### Fix +- sistemati gli oggetti link che puntano a file nella Cartella Modulistica + - Sistemato l'allineamento degli elementi nel blocco Contatti: se ci sono meno di tre elementi l'allineamento è centrato, se ce ne sono più di 3 l'allineamento è a sinistra. - Migliorata accessibilità del calendario nel blocco ricerca Eventi e ricerca Bandi diff --git a/src/components/ItaliaTheme/View/CartellaModulisticaView/DocRow.jsx b/src/components/ItaliaTheme/View/CartellaModulisticaView/DocRow.jsx index 1bda02752..9c8f6d028 100644 --- a/src/components/ItaliaTheme/View/CartellaModulisticaView/DocRow.jsx +++ b/src/components/ItaliaTheme/View/CartellaModulisticaView/DocRow.jsx @@ -34,7 +34,7 @@ const Downloads = ({ item, titleDoc }) => { ) : ( @@ -59,7 +59,7 @@ const DocRow = ({ doc }) => { })} >
- + {doc.title} {doc?.description && (