From 81090ca6400bc3186c8d39ec91cdd82be1982949 Mon Sep 17 00:00:00 2001 From: Giulia Ghisini <51911425+giuliaghisini@users.noreply.github.com> Date: Thu, 19 Dec 2024 15:13:41 +0100 Subject: [PATCH 01/11] fix: table styles in edit mode (#826) --- src/theme/_cms-ui.scss | 42 +++++++++++++++++++++++++++++++++++ src/theme/extras/_tables.scss | 25 ++++++++++----------- 2 files changed, 54 insertions(+), 13 deletions(-) diff --git a/src/theme/_cms-ui.scss b/src/theme/_cms-ui.scss index 393b63b3a..b083b24ad 100644 --- a/src/theme/_cms-ui.scss +++ b/src/theme/_cms-ui.scss @@ -74,6 +74,48 @@ body.cms-ui { .block.text { line-height: 1.555; } + + &.table { + @import 'bootstrap/scss/reboot'; + @import 'bootstrap/scss/tables'; + @import 'bootstrap-italia/src/scss/custom/tables'; + @import 'extras/tables'; + + .ui.table { + &.inverted { + th, + td { + border-color: inherit !important; + } + } + thead th { + font-weight: bold; + text-transform: unset; + color: var(--bs-table-color); + } + + &.very.basic { + &:not(.sortable):not(.striped) { + th:first-child, + td:first-child { + padding-left: 0.5rem; + } + thead tr:first-child th { + padding-top: 0.5rem; + } + td:last-child { + padding-right: 0.5rem; + } + } + } + + &.striped { + tbody tr:nth-child(2n) { + background-color: rgba(0, 0, 50, 0.02) !important; + } + } + } + } } &.contenttype-document, diff --git a/src/theme/extras/_tables.scss b/src/theme/extras/_tables.scss index d0cb834e5..17573f205 100644 --- a/src/theme/extras/_tables.scss +++ b/src/theme/extras/_tables.scss @@ -20,31 +20,30 @@ &.very.basic { border: none; - tbody > tr { + th, + td { &:first-of-type { - th, - td { - border-top: none; - } + border-left: none; } &:last-of-type { + border-right: none; + } + } + + tbody > tr { + &:first-of-type { th, td { - border-bottom: none; + border-top: none; } } th, td { - &:first-of-type { - border-left: none; - } - - &:last-of-type { - border-right: none; - } + border-bottom: none; } + border-width: 0; } } From f558351d59750bc347a6841bffc7437636fd71bc Mon Sep 17 00:00:00 2001 From: sabrina-bongiovanni <116291154+sabrina-bongiovanni@users.noreply.github.com> Date: Thu, 19 Dec 2024 15:37:14 +0100 Subject: [PATCH 02/11] fix: removed no_value option from recurrence widget (#828) Co-authored-by: Piero Nicolli --- RELEASE.md | 14 ++++++++++++++ .../Widgets/RecurrenceWidget/RecurrenceWidget.jsx | 1 + 2 files changed, 15 insertions(+) diff --git a/RELEASE.md b/RELEASE.md index 8ad7c3aa6..ca8a71a31 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -41,6 +41,20 @@ - ... --> +## Versione X.X.X (dd/mm/yyyy) + +### Migliorie + +- ... + +### Novità + +- ... + +### Fix + +- Rimossa l'opzione non selezionabile "nessun valore" dal widget ricorrenza. + ## Versione 11.25.3 (12/12/2024) ### Migliorie diff --git a/src/customizations/volto/components/manage/Widgets/RecurrenceWidget/RecurrenceWidget.jsx b/src/customizations/volto/components/manage/Widgets/RecurrenceWidget/RecurrenceWidget.jsx index 7f80eee13..912dacfd0 100644 --- a/src/customizations/volto/components/manage/Widgets/RecurrenceWidget/RecurrenceWidget.jsx +++ b/src/customizations/volto/components/manage/Widgets/RecurrenceWidget/RecurrenceWidget.jsx @@ -990,6 +990,7 @@ class RecurrenceWidget extends Component { )} value={formValues.freq} onChange={this.onChangeRule} + noValueOption={false} /> {OPTIONS.frequences[formValues.freq].interval && ( Date: Thu, 19 Dec 2024 15:52:41 +0100 Subject: [PATCH 03/11] feat: added information on recurrence exception dates in event subtitle (#829) * feat: added information on recurrence exception dates in event subtitle * fix: show condition * fix: additional dates string --- RELEASE.md | 2 +- locales/de/LC_MESSAGES/volto.po | 5 ++++ locales/en/LC_MESSAGES/volto.po | 5 ++++ locales/es/LC_MESSAGES/volto.po | 5 ++++ locales/fr/LC_MESSAGES/volto.po | 5 ++++ locales/it/LC_MESSAGES/volto.po | 5 ++++ locales/volto.pot | 7 +++++- .../ItaliaTheme/View/Commons/Dates.jsx | 21 ++++++++-------- .../PageHeader/PageHeaderEventDates.jsx | 24 ++++++++++++++++--- src/helpers/dates.js | 19 +++++++++++++++ src/helpers/index.js | 1 + 11 files changed, 83 insertions(+), 16 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index ca8a71a31..b2fcfa1a2 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -45,7 +45,7 @@ ### Migliorie -- ... +- Se vengono aggiunte o rimosse date dalla ricorrenza di un CT evento, nel sottotitolo viene aggiunta l'indicazione di controllare le eccezioni nella sezione apposita. ### Novità diff --git a/locales/de/LC_MESSAGES/volto.po b/locales/de/LC_MESSAGES/volto.po index a18e2c44f..97f8d6659 100644 --- a/locales/de/LC_MESSAGES/volto.po +++ b/locales/de/LC_MESSAGES/volto.po @@ -2070,6 +2070,11 @@ msgstr "" msgid "exceeded_chars" msgstr "" +#: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderEventDates +# defaultMessage: con alcune eccezioni. Per maggiori informazioni controllare la sezione dedicata. +msgid "exceptionDates" +msgstr "" + #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderDates # defaultMessage: Scadenza msgid "expire" diff --git a/locales/en/LC_MESSAGES/volto.po b/locales/en/LC_MESSAGES/volto.po index 5f6855478..e4212452e 100644 --- a/locales/en/LC_MESSAGES/volto.po +++ b/locales/en/LC_MESSAGES/volto.po @@ -2055,6 +2055,11 @@ msgstr "Read more" msgid "exceeded_chars" msgstr "" +#: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderEventDates +# defaultMessage: con alcune eccezioni. Per maggiori informazioni controllare la sezione dedicata. +msgid "exceptionDates" +msgstr "with some exceptions. Please see the dedicated section for more information." + #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderDates # defaultMessage: Scadenza msgid "expire" diff --git a/locales/es/LC_MESSAGES/volto.po b/locales/es/LC_MESSAGES/volto.po index d96c9403d..524c0bfa7 100644 --- a/locales/es/LC_MESSAGES/volto.po +++ b/locales/es/LC_MESSAGES/volto.po @@ -2064,6 +2064,11 @@ msgstr "" msgid "exceeded_chars" msgstr "El texto excede la longitud recomendada" +#: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderEventDates +# defaultMessage: con alcune eccezioni. Per maggiori informazioni controllare la sezione dedicata. +msgid "exceptionDates" +msgstr "" + #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderDates # defaultMessage: Scadenza msgid "expire" diff --git a/locales/fr/LC_MESSAGES/volto.po b/locales/fr/LC_MESSAGES/volto.po index 476780847..278aad804 100644 --- a/locales/fr/LC_MESSAGES/volto.po +++ b/locales/fr/LC_MESSAGES/volto.po @@ -2072,6 +2072,11 @@ msgstr "" msgid "exceeded_chars" msgstr "" +#: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderEventDates +# defaultMessage: con alcune eccezioni. Per maggiori informazioni controllare la sezione dedicata. +msgid "exceptionDates" +msgstr "" + #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderDates # defaultMessage: Scadenza msgid "expire" diff --git a/locales/it/LC_MESSAGES/volto.po b/locales/it/LC_MESSAGES/volto.po index fef305eeb..d41ec64e6 100644 --- a/locales/it/LC_MESSAGES/volto.po +++ b/locales/it/LC_MESSAGES/volto.po @@ -2055,6 +2055,11 @@ msgstr "Leggi di più" msgid "exceeded_chars" msgstr "Il testo supera la lunghezza consigliata perciò verrà tagliato." +#: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderEventDates +# defaultMessage: con alcune eccezioni. Per maggiori informazioni controllare la sezione dedicata. +msgid "exceptionDates" +msgstr "con alcune eccezioni. Per maggiori informazioni controllare la sezione dedicata." + #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderDates # defaultMessage: Scadenza msgid "expire" diff --git a/locales/volto.pot b/locales/volto.pot index d634cbff4..d5eb58465 100644 --- a/locales/volto.pot +++ b/locales/volto.pot @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Plone\n" -"POT-Creation-Date: 2024-11-25T15:31:18.424Z\n" +"POT-Creation-Date: 2024-12-12T10:59:56.243Z\n" "Last-Translator: Plone i18n \n" "Language-Team: Plone i18n \n" "MIME-Version: 1.0\n" @@ -2057,6 +2057,11 @@ msgstr "" msgid "exceeded_chars" msgstr "" +#: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderEventDates +# defaultMessage: con alcune eccezioni. Per maggiori informazioni controllare la sezione dedicata. +msgid "exceptionDates" +msgstr "" + #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderDates # defaultMessage: Scadenza msgid "expire" diff --git a/src/components/ItaliaTheme/View/Commons/Dates.jsx b/src/components/ItaliaTheme/View/Commons/Dates.jsx index fc25e542c..718cc6d2e 100644 --- a/src/components/ItaliaTheme/View/Commons/Dates.jsx +++ b/src/components/ItaliaTheme/View/Commons/Dates.jsx @@ -4,7 +4,11 @@ import { rrulei18n } from '@plone/volto/components/manage/Widgets/RecurrenceWidg import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable'; import { Card, CardTitle, CardBody } from 'design-react-kit'; import PropTypes from 'prop-types'; -import { viewDate, getRealEventEnd } from 'design-comuni-plone-theme/helpers'; +import { + viewDate, + getRealEventEnd, + getRecurrenceExceptionDates, +} from 'design-comuni-plone-theme/helpers'; const messages = defineMessages({ start: { @@ -87,14 +91,9 @@ const Dates = ({ content, show_image, moment: momentlib, rrule }) => { const end = viewDate(intl.locale, actualEndDate); const openEnd = content?.open_end; const wholeDay = content?.whole_day; - const rdates = rruleSet?.rdates() ?? []; - const exdates = rruleSet?.exdates() ?? []; - const additionalDates = rdates.reduce((acc, curr) => { - const isExdate = exdates.some((b) => b.toString() === curr.toString()); - if (!isExdate) { - return [...acc, curr]; - } else return acc; - }, []); + + const { additionalDates, removedDates } = + getRecurrenceExceptionDates(rruleSet); return content ? ( <> @@ -172,10 +171,10 @@ const Dates = ({ content, show_image, moment: momentlib, rrule }) => { ))} )} - {exdates.length > 0 && ( + {removedDates.length > 0 && (
{intl.formatMessage(messages.excluded_dates)}
- {exdates.map((exDate) => ( + {removedDates.map((exDate) => (
{viewDate(intl.locale, exDate, 'dddd DD MMMM YYYY')}
diff --git a/src/components/ItaliaTheme/View/Commons/PageHeader/PageHeaderEventDates.jsx b/src/components/ItaliaTheme/View/Commons/PageHeader/PageHeaderEventDates.jsx index d9ebda30c..5f2ad864d 100644 --- a/src/components/ItaliaTheme/View/Commons/PageHeader/PageHeaderEventDates.jsx +++ b/src/components/ItaliaTheme/View/Commons/PageHeader/PageHeaderEventDates.jsx @@ -4,13 +4,21 @@ import PropTypes from 'prop-types'; import { rrulei18n } from '@plone/volto/components/manage/Widgets/RecurrenceWidget/Utils'; import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable'; -import { getRealEventEnd } from 'design-comuni-plone-theme/helpers'; +import { + getRealEventEnd, + getRecurrenceExceptionDates, +} from 'design-comuni-plone-theme/helpers'; const messages = defineMessages({ dateStart: { id: 'dal {dateStart} fino a conclusione', defaultMessage: 'dal {dateStart} fino a conclusione', }, + exceptionDates: { + id: 'exceptionDates', + defaultMessage: + 'con alcune eccezioni. Per maggiori informazioni controllare la sezione dedicata.', + }, }); /** @@ -36,7 +44,7 @@ const PageHeaderEventDates = ({ content, moment, rrule }) => { const actualEndDate = getRealEventEnd(content, rruleSet); - const wholeDay = content?.whole_day; + // const wholeDay = content?.whole_day; const openEnd = content?.open_end; // show only start when event starts and ends in same day or if a recurrence is set // because to set a recurrence, the event must have the same date as start and end date @@ -75,6 +83,11 @@ const PageHeaderEventDates = ({ content, moment, rrule }) => { // format and save date into new variable depending on recurrence of event const endDate = Moment(actualEndDate).format('DD-MM-Y'); + + // check if there are exception dates added to the recurrence to add info + const { additionalDates, removedDates } = + getRecurrenceExceptionDates(rruleSet); + return content['@type'] === 'Event' ? (

{!Moment(content.end).isSame(actualEndDate) && @@ -89,7 +102,12 @@ const PageHeaderEventDates = ({ content, moment, rrule }) => { dateStart: `${Moment(content.start).format('DD-MM-Y')}`, })} {eventRecurrenceText && ( -

{eventRecurrenceText}
+
+ {eventRecurrenceText} + {(additionalDates.length > 0 || removedDates.length > 0) && ( + {intl.formatMessage(messages.exceptionDates)} + )} +
)}

) : null; diff --git a/src/helpers/dates.js b/src/helpers/dates.js index bf7fde920..aadf08db1 100644 --- a/src/helpers/dates.js +++ b/src/helpers/dates.js @@ -53,3 +53,22 @@ export const getRealEventEnd = (content, rruleSet) => { } return actualEndDate; }; + +export const getRecurrenceExceptionDates = (rruleSet) => { + const rdates = rruleSet?.rdates() ?? []; + const exdates = rruleSet?.exdates() ?? []; + + const additionalDates = rdates.reduce((acc, curr) => { + const isExdate = exdates.some((b) => b.toString() === curr.toString()); + if (!isExdate) { + return [...acc, curr]; + } else return acc; + }, []); + + const exceptionDates = { + additionalDates: additionalDates, + removedDates: exdates, + }; + + return exceptionDates; +}; diff --git a/src/helpers/index.js b/src/helpers/index.js index e0a387cf2..6cdc5915f 100644 --- a/src/helpers/index.js +++ b/src/helpers/index.js @@ -24,6 +24,7 @@ export { viewDate, getRealStartAndEndWithRecurrence, getRealEventEnd, + getRecurrenceExceptionDates, } from 'design-comuni-plone-theme/helpers/dates'; export { getSiteProperty } from 'design-comuni-plone-theme/helpers/config'; export { useDebouncedEffect } from 'design-comuni-plone-theme/helpers/debounce'; From 4c35b9050ebc699200d7ff1ea8925a5c0e40c42d Mon Sep 17 00:00:00 2001 From: Andrea Cecchi Date: Fri, 20 Dec 2024 10:59:54 +0100 Subject: [PATCH 04/11] fix: set icon title in CardCategory with content-type name (#831) --- src/components/ItaliaTheme/Cards/CardCategory.jsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/ItaliaTheme/Cards/CardCategory.jsx b/src/components/ItaliaTheme/Cards/CardCategory.jsx index 49dfc8582..7d675752f 100644 --- a/src/components/ItaliaTheme/Cards/CardCategory.jsx +++ b/src/components/ItaliaTheme/Cards/CardCategory.jsx @@ -38,9 +38,8 @@ const CardCategory = (props) => { const categoryText = !href && children && ( {children} ); - const categoryIcon = iconName && ( - - ); + const iconTitle = rest.title || intl.formatMessage(messages.categoryIcon); + const categoryIcon = iconName && ; return (
From 4fda9e123a9400b19b5398fda8c5511910344744 Mon Sep 17 00:00:00 2001 From: Giulia Ghisini <51911425+giuliaghisini@users.noreply.github.com> Date: Fri, 20 Dec 2024 11:01:04 +0100 Subject: [PATCH 05/11] fix: default volto-blocks-widget text block if slate enabled (#832) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 26f50907b..5c128cd5c 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "typeface-lora": "0.0.72", "typeface-roboto-mono": "0.0.75", "typeface-titillium-web": "0.0.72", - "volto-blocks-widget": "3.4.1", + "volto-blocks-widget": "3.4.3", "volto-data-grid-widget": "2.3.1", "volto-dropdownmenu": "4.1.3", "volto-editablefooter": "5.1.7", diff --git a/yarn.lock b/yarn.lock index 11af1b717..bc07b1715 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8246,7 +8246,7 @@ __metadata: typeface-lora: 0.0.72 typeface-roboto-mono: 0.0.75 typeface-titillium-web: 0.0.72 - volto-blocks-widget: 3.4.1 + volto-blocks-widget: 3.4.3 volto-data-grid-widget: 2.3.1 volto-dropdownmenu: 4.1.3 volto-editablefooter: 5.1.7 @@ -16118,12 +16118,12 @@ __metadata: languageName: node linkType: hard -"volto-blocks-widget@npm:3.4.1": - version: 3.4.1 - resolution: "volto-blocks-widget@npm:3.4.1" +"volto-blocks-widget@npm:3.4.3": + version: 3.4.3 + resolution: "volto-blocks-widget@npm:3.4.3" peerDependencies: "@plone/volto": ">=16.0.0-alpha.38" - checksum: 4f5c183698e38edd40f24d7f35d3d59745c67b77ffaf0b2e448d8c7696453e9c83bbcd1b3c91599e6ccb77d64177fd7923d9ad36607dc1a41cba7fa9b20029b2 + checksum: 68490569a49d79c4a7921af19d00225325b206992faf7d94b96a320266cf4679341e65e9472993039302aecaeceacfce4804f9ca12abe9222605438281ad2898 languageName: node linkType: hard From ca794659edb0e163571a326fe450c7a798612918 Mon Sep 17 00:00:00 2001 From: Andrea Cecchi Date: Fri, 20 Dec 2024 11:08:08 +0100 Subject: [PATCH 06/11] fix: backport from https://github.com/collective/volto-form-block/pull/122 (#834) --- .../volto-form-block/components/View.jsx | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/customizations/volto-form-block/components/View.jsx b/src/customizations/volto-form-block/components/View.jsx index e48b80141..4ebce2c85 100644 --- a/src/customizations/volto-form-block/components/View.jsx +++ b/src/customizations/volto-form-block/components/View.jsx @@ -1,5 +1,6 @@ // CUSTOMIZATION: // - added warning state to form +// - backport for https://github.com/collective/volto-form-block/pull/122 import React, { useState, useEffect, useReducer, useRef } from 'react'; import { useSelector, useDispatch } from 'react-redux'; @@ -8,7 +9,6 @@ import { useIntl, defineMessages } from 'react-intl'; import { submitForm, resetOTP } from 'volto-form-block/actions'; import { getFieldName } from 'volto-form-block/components/utils'; import FormView from 'volto-form-block/components/FormView'; -import { formatDate } from '@plone/volto/helpers/Utils/Date'; import config from '@plone/volto/registry'; import { Captcha } from 'volto-form-block/components/Widget'; import { isValidEmail } from 'volto-form-block/helpers/validators'; @@ -260,20 +260,21 @@ const View = ({ data, id, path }) => { config.blocks.blocksConfig.form.attachment_fields.includes( subblock.field_type, ); - const isDate = subblock.field_type === 'date'; + // const isDate = subblock.field_type === 'date'; if (isAttachment) { attachments[name] = formattedFormData[name].value; delete formattedFormData[name]; } - if (isDate) { - formattedFormData[name].value = formatDate({ - date: formattedFormData[name].value, - format: 'DD-MM-YYYY', - locale: intl.locale, - }); - } + // XXX: dates should be sent as ISO format, not DD-MM-YYYY ! + // if (isDate) { + // formattedFormData[name].value = formatDate({ + // date: formattedFormData[name].value, + // format: 'DD-MM-YYYY', + // locale: intl.locale, + // }); + // } } }); dispatch( From 07617a29ef8e46af2466d20adbdc58201ca19bf8 Mon Sep 17 00:00:00 2001 From: Andrea Cecchi Date: Fri, 20 Dec 2024 11:08:59 +0100 Subject: [PATCH 07/11] fix: read waiting_list from right data structure (#835) --- src/customizations/volto-form-block/components/View.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/customizations/volto-form-block/components/View.jsx b/src/customizations/volto-form-block/components/View.jsx index 4ebce2c85..3fb0a7f4f 100644 --- a/src/customizations/volto-form-block/components/View.jsx +++ b/src/customizations/volto-form-block/components/View.jsx @@ -324,7 +324,7 @@ const View = ({ data, id, path }) => { useEffect(() => { if (submitResults?.loaded) { - if (submitResults?.result?.data?.waiting_list) { + if (submitResults?.result?.waiting_list) { setFormState({ type: FORM_STATES.warning, result: { From 6282e2b5426f4fe1738f37dfc4b23dfc79969216 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Dec 2024 11:09:38 +0100 Subject: [PATCH 08/11] chore(deps): bump nanoid from 3.3.6 to 3.3.8 (#837) Bumps [nanoid](https://github.com/ai/nanoid) from 3.3.6 to 3.3.8. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.3.6...3.3.8) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index bc07b1715..7761ca125 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12134,11 +12134,11 @@ __metadata: linkType: hard "nanoid@npm:^3.3.6": - version: 3.3.6 - resolution: "nanoid@npm:3.3.6" + version: 3.3.8 + resolution: "nanoid@npm:3.3.8" bin: nanoid: bin/nanoid.cjs - checksum: 7d0eda657002738aa5206107bd0580aead6c95c460ef1bdd0b1a87a9c7ae6277ac2e9b945306aaa5b32c6dcb7feaf462d0f552e7f8b5718abfc6ead5c94a71b3 + checksum: dfe0adbc0c77e9655b550c333075f51bb28cfc7568afbf3237249904f9c86c9aaaed1f113f0fddddba75673ee31c758c30c43d4414f014a52a7a626efc5958c9 languageName: node linkType: hard From 2374b47b4c9ed1dbc97eac47319643fb917af447 Mon Sep 17 00:00:00 2001 From: Sara Bianchi <43245702+SaraBianchi@users.noreply.github.com> Date: Fri, 20 Dec 2024 11:11:28 +0100 Subject: [PATCH 09/11] fix: updated print styles (#838) --- src/theme/ItaliaTheme/Blocks/_contacts.scss | 23 +- src/theme/ItaliaTheme/Print/_all_pages.scss | 107 ++++-- src/theme/ItaliaTheme/Print/_bandi.scss | 9 - src/theme/ItaliaTheme/Print/_blocks.scss | 335 ++++++++++++++++-- src/theme/ItaliaTheme/Print/_news_items.scss | 19 - src/theme/ItaliaTheme/Print/_page.scss | 6 - .../bootstrap-italia/_card.scss | 14 +- .../bootstrap-override/bootstrap/_print.scss | 1 + src/theme/site.scss | 2 - 9 files changed, 410 insertions(+), 106 deletions(-) delete mode 100644 src/theme/ItaliaTheme/Print/_bandi.scss delete mode 100644 src/theme/ItaliaTheme/Print/_news_items.scss diff --git a/src/theme/ItaliaTheme/Blocks/_contacts.scss b/src/theme/ItaliaTheme/Blocks/_contacts.scss index a5e93d21c..22d97a909 100644 --- a/src/theme/ItaliaTheme/Blocks/_contacts.scss +++ b/src/theme/ItaliaTheme/Blocks/_contacts.scss @@ -91,15 +91,16 @@ } .contact-title { + + margin-bottom: 1rem; font-size: 1.35rem; font-weight: bold; line-height: 1.4em; - - margin-bottom: 1rem; } .contact-text { font-size: 0.9rem; + .detached-slate-editor { margin-bottom: 1rem; } @@ -107,32 +108,22 @@ .contact-info { display: flex; - - &:first-of-type { - align-items: center; - - .icon-wrapper { - margin-top: 0; - } - } - - &:not(:last-of-type) { - margin-bottom: 1rem; - } + align-items: center; [role='textbox'] { //slate editor width: 100%; + &[data-slate-editor='true'] { min-height: 1em; } } .icon-wrapper { - margin-top: 0.2rem; - margin-right: 1rem; display: flex; align-items: center; + margin-top: 0.2rem; + margin-right: 1rem; } .tel { diff --git a/src/theme/ItaliaTheme/Print/_all_pages.scss b/src/theme/ItaliaTheme/Print/_all_pages.scss index deb3eada2..1e7c8e154 100644 --- a/src/theme/ItaliaTheme/Print/_all_pages.scss +++ b/src/theme/ItaliaTheme/Print/_all_pages.scss @@ -1,6 +1,6 @@ @media print { @page { - margin: 0.2cm; /* 1 inch margin for all sides */ + margin: 0 !important; } body { @@ -8,16 +8,19 @@ } .public-ui { - h2 { - font-size: 1.5rem; - } - } - - .public-ui { - // removed underlining from links a { font-weight: 600 !important; - text-decoration: none !important; + // text-decoration: none !important; + /* i link che non devono essere sottolineati hanno già regole specifiche, + a video è necessario mostare che i tag a sono link */ + + &.read-more { + display: none !important; // omesso il read more nelle card + } + } + + .text-secondary { + color: $body-color !important; } .content-area, @@ -27,6 +30,24 @@ page-break-inside: avoid; } + .container { + max-width: 98%; + } + + // padding/margin + .py-5 { + padding-top: 20px !important; + padding-bottom: 20px !important; + } + + .pb-5 { + padding-bottom: 20px !important; + } + + .pt-5 { + padding-top: 20px !important; + } + // removed part of header header .it-header-slim-wrapper { display: none; @@ -51,10 +72,8 @@ } .it-brand-text { - .no_toc { - color: $link-color; - font-size: 2rem !important; - } + color: $link-color; + font-size: 2rem !important; } } } @@ -86,6 +105,10 @@ } } + .section { + padding: 1.2rem; + } + /* Removed shadow and card's padding. Add border*/ .card { border: 1px solid $gray-border !important; @@ -99,15 +122,34 @@ border: none !important; border-left-width: 0 !important; } + + &::after { + display: none; + } + + &.card-bg { + background-color: white !important; + color: $body-color !important; + } } - //card teaser 3 + // Card teaser .card-wrapper.card-teaser-wrapper.card-teaser-block-3 { > .card-teaser { - flex: 0 0 32%; + flex: 0 0 32.5%; } } + .card.card-teaser.simple-card-default-item .card-body .card-title a, + .card.card-teaser .card-body .card-title a, + .card .card-title a { + font-size: 1.1rem !important; + } + + .card .card-body .category-top { + flex-wrap: wrap; + } + #text-tempi_e_scadenze > div > p { padding: 1rem 0 0 0 !important; box-shadow: none !important; @@ -165,7 +207,7 @@ .it-page-sections-container { border-top: none; - .it-carousel-wrapper { + .it-carousel-wrapper:not(#galleria) { display: none; } @@ -236,6 +278,7 @@ .callout { page-break-inside: avoid; + .callout-inner { // padding-top: 0px; p { @@ -243,18 +286,38 @@ } } } + // buttons + button.btn, + .btn.btn-primary, + .draftjs-buttons a { + padding: 0.5rem 1rem; + border: 1px solid $link-color; + background-color: white; + color: $link-color; + + svg.icon { + color: $link-color; + fill: $link-color; + } + } + + // blockquote text + blockquote.blockquote-card.dark, + .blockquote.blockquote-card.dark { + border: 1px solid $body-color; + background-color: white; + color: $body-color; + + a:not(.btn) { + color: $body-color; + } + } } .draft-text-larger { font-size: 1.2rem; } - .public-ui .draftjs-buttons a { - padding: 0rem; - background-color: white; - color: $link-color; - } - //external link icon svg.external-link { display: none; diff --git a/src/theme/ItaliaTheme/Print/_bandi.scss b/src/theme/ItaliaTheme/Print/_bandi.scss deleted file mode 100644 index deffd9b76..000000000 --- a/src/theme/ItaliaTheme/Print/_bandi.scss +++ /dev/null @@ -1,9 +0,0 @@ -.contenttype-bando { - @media print { - .it-page-sections-container { - #allegati { - display: none; - } - } - } -} diff --git a/src/theme/ItaliaTheme/Print/_blocks.scss b/src/theme/ItaliaTheme/Print/_blocks.scss index 386e18459..018311e86 100644 --- a/src/theme/ItaliaTheme/Print/_blocks.scss +++ b/src/theme/ItaliaTheme/Print/_blocks.scss @@ -1,5 +1,30 @@ @media print { .block { + color: $body-color; + + .bg-primary, + .bg-secondary, + .bg-tertiary { + border: 1px solid $gray-border; + background-color: white !important; + + .card .card-body { + .category-top, + .category-top .text, + .card-text, + .card-text a, + .card-title a, + .card-title { + color: $body-color !important; + } + + .category-top .icon { + color: $body-color !important; + fill: $body-color !important; + } + } + } + &.full-width, .full-width { right: unset !important; @@ -19,9 +44,25 @@ .col-item { max-width: 33%; + padding-right: 0; + padding-left: 0; } } } + + .bg-gradient { + border: 1px solid $gray-border; + background-color: white !important; + background-image: none !important; + opacity: 1 !important; + } + + div:has(.bg-gradient) { + .title { + color: $body-color; + font-size: 1.1rem; + } + } } .section.section-inset-shadow { @@ -33,10 +74,15 @@ .bg-alert-danger, .bg-alert-info, .bg-alert-warning { - color: #000; + border: 1px solid $gray-border; + background-color: white !important; + + a:not(.btn) { + color: #000; + } + .container { - padding-top: 1rem !important; - padding-bottom: 1rem !important; + padding: 1rem !important; } } } @@ -58,6 +104,57 @@ margin: 0 auto; } + .block.numbersBlock { + .block-number .subblock-title p { + font-size: 3.5rem; + } + } + + // rimozione delle immagini/colori di sfondo come default, applicato colore del testo + .block.iconBlocks, + .block.numbersBlock, + .block.contacts .bg-primary, + .block.contacts .bg-secondary { + color: $body-color; + + .block-header { + .title, + .description, + a { + color: $body-color !important; + } + } + + .background-image::after, + .background-image.no-image::after { + border: 1px solid $gray-border; + background-color: white; + background-image: none; + } + } + + .block.iconBlocks, + .block.numbersBlock { + div:not(.title) p { + font-size: 1.5rem; + } + } + + .block.contacts { + div:not(.title) p { + font-size: 1.5rem; + } + + .card-wrapper .contact-title, + .card-wrapper .contact-text, + .card-wrapper .contact-info { + p { + margin-bottom: 0.3rem; + font-size: 1rem !important; + } + } + } + .block.highlitedContent { .col-lg-6 { flex: 1 1 30%; @@ -107,6 +204,7 @@ .section.full-width { padding: 0px !important; + .card { .card-body .accordion-item { .accordion-header { @@ -116,6 +214,7 @@ } } } + .accordion-content { max-height: unset; @@ -133,14 +232,16 @@ } .block.numbersBlock { - page-break-inside: avoid; color: #000; + page-break-inside: avoid; + .section.py-5 { padding: 12px !important; page-break-inside: avoid; .container { page-break-inside: avoid; + .title, .subblock-title { font-size: 1.5rem; @@ -165,15 +266,17 @@ .block.iconBlocks { .section.full-width { padding: 12px !important; + .block-header { .title { - font-size: 1.5rem; margin: 0px; + font-size: 1.5rem; line-height: 1.5rem; } .description { margin-bottom: 10px; + p { margin-top: 10px; } @@ -188,6 +291,7 @@ .iconblock-icon { margin-bottom: 1rem; + .icon { height: 2rem; } @@ -224,11 +328,22 @@ } } } + + .calendar .calendar-header { + border-bottom: 1px solid $gray-border; + background-color: white; + + h3 { + color: black !important; + } + } } .container { .block { .searchSections { + border: 1px solid $gray-border; + .searchSections-background { display: none; } @@ -236,8 +351,6 @@ h2.text-secondary { color: $link-color !important; } - - border: 1px solid $gray-border; } } } @@ -245,16 +358,16 @@ // listing variations div.block.listing { page-break-inside: avoid; + .full-width { - page-break-inside: avoid; right: unset !important; left: unset !important; width: 100% !important; - margin-right: 0 !important; - margin-left: 0 !important; - padding-top: 10px !important; padding-bottom: 10px !important; + margin-right: 0 !important; + margin-left: 0 !important; + page-break-inside: avoid; .container { max-width: 100% !important; @@ -281,16 +394,18 @@ &.inEvidenceTemplate { .in-evidence-cards-wrapper { display: flex; + flex-direction: column; flex-wrap: wrap; justify-content: space-between; - flex-direction: column; gap: 10px; + .card-wrapper { flex: 0 0 30%; page-break-inside: avoid; .card { page-break-inside: avoid; + .img-responsive-wrapper { height: 150px; @@ -334,6 +449,7 @@ .rassegna-info { margin-bottom: 0px !important; } + &:after { display: none; } @@ -342,6 +458,7 @@ .card .card-body { .category-top { margin-bottom: 10px; + .icon { height: 1rem; } @@ -352,6 +469,7 @@ &.simpleCard { .simple-card-compact-template { page-break-inside: avoid; + .card-teaser-wrapper { flex-direction: column; margin-bottom: none; @@ -369,14 +487,17 @@ // simple card template - default .simple-card-default { page-break-inside: avoid; + .template-header.with-filters .path-filter-buttons { display: none; } + .card-teaser-wrapper { flex-direction: column; .card-body { padding-bottom: 0px !important; + .category-top { // margin-bottom: 0px; .icon { @@ -402,9 +523,10 @@ flex-direction: column; .col-item.col-xl-4 { - max-width: 100%; width: 100%; + max-width: 100%; margin-bottom: 5px !important; + .card-wrapper { .card { page-break-inside: avoid; @@ -425,6 +547,7 @@ .card-persona.card-flex { .card-body { padding: 10px; + .card-title { margin-bottom: 0px; } @@ -433,6 +556,7 @@ margin-top: 5px; } } + .card-image img { height: 120px !important; } @@ -443,6 +567,7 @@ &.contentInEvidenceTemplate { .content-in-evidence { page-break-inside: avoid; + .item-image { height: 100px; } @@ -467,17 +592,18 @@ flex-direction: column; .col-lg-4 { - max-width: 100%; width: 100%; + max-width: 100%; flex: 0 0 100%; .card { .flag-icon { display: none; } + .etichetta { - right: 10px; top: 10px; + right: 10px; } .read-more { @@ -494,16 +620,18 @@ .grid { display: flex; flex-direction: column; - gap: 10px 0px; margin-top: 0px !important; + gap: 10px 0px; + .listing-item.box { height: auto; padding: 10px; - margin-bottom: 10px; border: 1px solid #c5c7c9; + margin-bottom: 10px; + .category { - background-color: transparent; padding: 0px; + background-color: transparent; &:after { border-top: 0px; @@ -511,8 +639,8 @@ } .title { - font-size: 1.2rem; margin-bottom: 0px; + font-size: 1.2rem; } } } @@ -527,6 +655,7 @@ flex-direction: column; margin-top: 0px !important; gap: 10px; + .box { height: auto; padding: 10px; @@ -543,9 +672,10 @@ .col-item { margin-bottom: 10px; + &.col-lg-3 { - max-width: 100%; width: 100%; + max-width: 100%; } .card { @@ -572,9 +702,23 @@ .slick-track { min-height: auto; } + .play-pause-wrapper { display: none; } + + .slide-wrapper { + border: 1px solid $gray-border; + + .slide-title { + border-top: 1px solid $gray-border; + background-color: white; + + a { + color: $link-color; + } + } + } } } @@ -584,6 +728,90 @@ .read-more { display: none; } + + .card-wrapper { + flex: 0 0 33%; + } + } + } + + &.contentInEvidenceTemplate { + .img-wrapper img { + max-height: 200px; + } + + .card-body { + padding-bottom: 24px !important; + } + } + + &.ribbonCardTemplate { + .card-wrapper .card.card-big { + position: relative; + margin: 0; + + .etichetta { + position: relative; + top: 10px; + right: 0px; + left: 0; + width: 100%; + max-width: 100%; + justify-content: flex-start; + + .icon { + margin-left: 5px; + } + } + + .card-body { + padding: 20px; + + .dates { + margin: 7px 0 10px; + } + } + } + } + + &.cardSlideUpTextTemplate .box { + height: auto; + + .category { + border: 1px solid black; + background-color: white; + color: $body-color; + + &::after { + top: -1px; + border-top-color: black; + } + } + } + + &.quaresImageTemplate { + .squares-image-template .grid { + gap: 1rem 1.4rem; + } + + .box .title { + color: $body-color; + font-size: 1.1rem; + } + + .box.bg-img::before { + border: 1px solid $gray-border; + background-color: white !important; + } + } + + &.completeBlockLinksTemplate { + .col-item.col-lg-3 { + width: 33%; + } + + .card-wrapper { + padding: 0.5rem; } } } @@ -592,17 +820,19 @@ .block.video, .block.video_gallery { max-width: 50%; + &, & .video-wrapper { .ui.embed .icon-play { + display: flex; width: 2rem; height: 2rem; - display: flex; align-items: center; justify-content: center; + svg { - fill: #000; height: 1rem; + fill: #000; } } } @@ -622,6 +852,7 @@ .search-results { .template-wrapper { padding: 10px !important; + .card-wrapper { flex-direction: column; } @@ -637,8 +868,16 @@ } .table, - .slate-table.block { - width: 100%; + .slate-table-block { + display: table !important; + + &.ui.table.inverted { + color: $body-color; + + & > :not(caption) > * > * { + background-color: white; + } + } } .block.rssBlock { @@ -649,16 +888,24 @@ .block.cta-block .cta-block-wrapper.full-width { padding: 10px 0px; + border: 1px solid $gray-border; + background-color: white !important; .title { - font-size: 1.2rem; margin-bottom: 10px; + font-size: 1.2rem; } p { margin-top: 10px; } + .title, + p, + p a { + color: $body-color !important; + } + // cta button div .mt-5 { margin-top: 10px !important; @@ -667,9 +914,29 @@ .block.count_down { .public-ui .block-content { - padding: 10px 0px; + padding: 1rem; + + .background-image { + border: 1px solid $gray-border; + background-color: white !important; + + &::after { + display: none; + } + } + + p, + p a:not(.btn), + .countdown { + color: $body-color; + } .count-down-timer { + padding-bottom: 1rem; + border: 1px solid $gray-border; + page-break-after: avoid; + page-break-before: avoid; + .expired { padding: 10px; font-size: 1.5rem; @@ -687,8 +954,10 @@ &:after { display: none; } + .category-top { margin-bottom: 10px; + .icon { height: 1rem; } @@ -696,6 +965,7 @@ .card-title { margin-bottom: 10px !important; + a { font-size: 1.2rem; } @@ -714,13 +984,15 @@ .calendar { .template-header { h2 { - font-size: 1.5rem; margin-top: 10px !important; + font-size: 1.5rem; } } + .calendar-body { padding: 0rem; } + .link-more-container { display: none; } @@ -730,32 +1002,34 @@ .argumentInEvidence-background { + .argumentsCardsWrapper { padding-top: 10px !important; + h2 { color: #000 !important; } .grid.mt-5 { - margin-top: 10px !important; display: flex; flex-direction: column; + margin-top: 10px !important; .card { &:after { display: none; } + .card-body { padding: 10px; .icon-argument-container { - height: 1rem; width: 1rem; min-width: 1rem; + height: 1rem; min-height: 1rem; } .card-title { - font-size: 1.2rem; margin-bottom: 10px !important; + font-size: 1.2rem; } .card-text { @@ -777,6 +1051,7 @@ .slick-arrow { display: none !important; } + .slick-dots { display: none !important; } diff --git a/src/theme/ItaliaTheme/Print/_news_items.scss b/src/theme/ItaliaTheme/Print/_news_items.scss deleted file mode 100644 index f9924deb9..000000000 --- a/src/theme/ItaliaTheme/Print/_news_items.scss +++ /dev/null @@ -1,19 +0,0 @@ -.contenttype-news-item { - @media print { - .it-page-sections-container { - #documenti-allegati { - display: none; - } - - #luoghi { - .card-teaser { - .card-body { - .card-text { - display: none; - } - } - } - } - } - } -} diff --git a/src/theme/ItaliaTheme/Print/_page.scss b/src/theme/ItaliaTheme/Print/_page.scss index 122b917d7..61b1cd716 100644 --- a/src/theme/ItaliaTheme/Print/_page.scss +++ b/src/theme/ItaliaTheme/Print/_page.scss @@ -11,11 +11,5 @@ } } } - - p { - margin-top: 1rem; - margin-bottom: 0rem; - font-size: 1rem; - } } } diff --git a/src/theme/bootstrap-override/bootstrap-italia/_card.scss b/src/theme/bootstrap-override/bootstrap-italia/_card.scss index 3d6bd113a..0f5ca4bb7 100644 --- a/src/theme/bootstrap-override/bootstrap-italia/_card.scss +++ b/src/theme/bootstrap-override/bootstrap-italia/_card.scss @@ -5,8 +5,18 @@ max-width: 100%; } - .icon + .card-body { - max-width: calc(100% - 112px - 1em); + .icon { + //to do: forse da spostare nel file degli attachment + min-width: 32px; + max-width: 32px; + + & + .card-body { + max-width: calc(100% - 1em - 32px); + + .card-title a { + max-width: 100%; + } + } } } //Landscape diff --git a/src/theme/bootstrap-override/bootstrap/_print.scss b/src/theme/bootstrap-override/bootstrap/_print.scss index 4c836c1b3..eace576c9 100644 --- a/src/theme/bootstrap-override/bootstrap/_print.scss +++ b/src/theme/bootstrap-override/bootstrap/_print.scss @@ -145,6 +145,7 @@ // We don't set margin here because it breaks `size` in Chrome. We also // don't use `!important` on `size` as it breaks in Chrome. @page { + margin: 0rem; size: $print-page-size; } } diff --git a/src/theme/site.scss b/src/theme/site.scss index 4bffb1899..2a24ded1a 100644 --- a/src/theme/site.scss +++ b/src/theme/site.scss @@ -136,8 +136,6 @@ @import 'ItaliaTheme/Components/customerSatisfaction'; @import 'ItaliaTheme/Print/all_pages'; @import 'ItaliaTheme/Print/page'; -@import 'ItaliaTheme/Print/news_items'; -@import 'ItaliaTheme/Print/bandi'; @import 'ItaliaTheme/Print/persona'; @import 'ItaliaTheme/Print/event'; @import 'ItaliaTheme/Print/servizio'; From 2e7c5ebe9387c47ad99444bf32329087f0cd353f Mon Sep 17 00:00:00 2001 From: Giulia Ghisini <51911425+giuliaghisini@users.noreply.github.com> Date: Fri, 20 Dec 2024 11:14:33 +0100 Subject: [PATCH 10/11] fix: ssr conditional embed (#839) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 5c128cd5c..8e95f8368 100644 --- a/package.json +++ b/package.json @@ -153,7 +153,7 @@ "volto-editablefooter": "5.1.7", "volto-feedback": "0.3.2", "volto-form-block": "3.10.0", - "volto-gdpr-privacy": "2.2.9", + "volto-gdpr-privacy": "2.2.12", "volto-google-analytics": "2.0.0", "volto-multilingual-widget": "3.2.1", "volto-querywidget-with-browser": "0.4.2", diff --git a/yarn.lock b/yarn.lock index 7761ca125..6c081f520 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8252,7 +8252,7 @@ __metadata: volto-editablefooter: 5.1.7 volto-feedback: 0.3.2 volto-form-block: 3.10.0 - volto-gdpr-privacy: 2.2.9 + volto-gdpr-privacy: 2.2.12 volto-google-analytics: 2.0.0 volto-multilingual-widget: 3.2.1 volto-querywidget-with-browser: 0.4.2 @@ -16186,15 +16186,15 @@ __metadata: languageName: node linkType: hard -"volto-gdpr-privacy@npm:2.2.9": - version: 2.2.9 - resolution: "volto-gdpr-privacy@npm:2.2.9" +"volto-gdpr-privacy@npm:2.2.12": + version: 2.2.12 + resolution: "volto-gdpr-privacy@npm:2.2.12" dependencies: react-focus-lock: 2.9.4 volto-multilingual-widget: 3.2.1 peerDependencies: "@plone/volto": ">=16.0.0-alpha.38" - checksum: fe530fe8ee3213d566f54b02da39be5cfbfedcdba456085426620cc288f3cc1b5b11181226dee337a8b25cd143050a5184a7ee4e97b61c43d3e2f0b6946a414b + checksum: ba1b9c012716b325e29fa5764f319bdb339a81424b292f30331695d5f940b4db17ccffffd59ecd17ff5058899c8b53f0f0cacd30e2e9927e35fa5c6907136635 languageName: node linkType: hard From 1f7a8a1b44d727f58101c3140825f55eb2fdd68a Mon Sep 17 00:00:00 2001 From: Giulia Ghisini <51911425+giuliaghisini@users.noreply.github.com> Date: Fri, 20 Dec 2024 11:17:34 +0100 Subject: [PATCH 11/11] fix: a11y in cms-ui and links color in cms-ui (#840) * fix: a11y focus cms-ui * chore: updated volto-feedback for a11y --- RELEASE.md | 3 +++ package.json | 2 +- src/theme/ItaliaTheme/_main.scss | 4 ++++ src/theme/_cms-ui.scss | 8 ++++++++ yarn.lock | 10 +++++----- 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index b2fcfa1a2..3d8054a76 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -41,11 +41,13 @@ - ... --> + ## Versione X.X.X (dd/mm/yyyy) ### Migliorie - Se vengono aggiunte o rimosse date dalla ricorrenza di un CT evento, nel sottotitolo viene aggiunta l'indicazione di controllare le eccezioni nella sezione apposita. +- sistemata l'accessibilità riguardante il focus lato operatore. ### Novità @@ -55,6 +57,7 @@ - Rimossa l'opzione non selezionabile "nessun valore" dal widget ricorrenza. + ## Versione 11.25.3 (12/12/2024) ### Migliorie diff --git a/package.json b/package.json index 8e95f8368..68eb960be 100644 --- a/package.json +++ b/package.json @@ -151,7 +151,7 @@ "volto-data-grid-widget": "2.3.1", "volto-dropdownmenu": "4.1.3", "volto-editablefooter": "5.1.7", - "volto-feedback": "0.3.2", + "volto-feedback": "0.5.2", "volto-form-block": "3.10.0", "volto-gdpr-privacy": "2.2.12", "volto-google-analytics": "2.0.0", diff --git a/src/theme/ItaliaTheme/_main.scss b/src/theme/ItaliaTheme/_main.scss index 6941a1c94..5b943b182 100644 --- a/src/theme/ItaliaTheme/_main.scss +++ b/src/theme/ItaliaTheme/_main.scss @@ -157,6 +157,10 @@ iframe { // margin-right: 0.5rem; // } +svg.external-link { + fill: currentColor; +} + .slate-editor-link { clear: both; diff --git a/src/theme/_cms-ui.scss b/src/theme/_cms-ui.scss index b083b24ad..1145e1159 100644 --- a/src/theme/_cms-ui.scss +++ b/src/theme/_cms-ui.scss @@ -4,6 +4,14 @@ body.cms-ui { font-size: 16px; line-height: 1.5; + :focus:not(.focus--mouse), + input[type='checkbox']:focus + label:before { + outline: 2px solid #000 !important; + outline-offset: 2px; + border: none !important; + box-shadow: 0 0 0 2px #fff !important; + } + @include media-breakpoint-up(sm) { font-size: 18px; line-height: 1.555; diff --git a/yarn.lock b/yarn.lock index 6c081f520..3cea39245 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8250,7 +8250,7 @@ __metadata: volto-data-grid-widget: 2.3.1 volto-dropdownmenu: 4.1.3 volto-editablefooter: 5.1.7 - volto-feedback: 0.3.2 + volto-feedback: 0.5.2 volto-form-block: 3.10.0 volto-gdpr-privacy: 2.2.12 volto-google-analytics: 2.0.0 @@ -16159,15 +16159,15 @@ __metadata: languageName: node linkType: hard -"volto-feedback@npm:0.3.2": - version: 0.3.2 - resolution: "volto-feedback@npm:0.3.2" +"volto-feedback@npm:0.5.2": + version: 0.5.2 + resolution: "volto-feedback@npm:0.5.2" dependencies: react-google-recaptcha-v3: 1.9.5 semantic-ui-css: 2.5.0 peerDependencies: "@plone/volto": ">=16.0.0" - checksum: bfc7951ca5761640896e54fbe84c612176f95bad06682b198596425905b592bf1a287664cc1a8ebade814325c4514313043e62568ae3ac2325a18a43d2c43722 + checksum: 48c07636787d4422fdf58e03953860bb6359da47dd34861ad8bf876b7f5ce00425fdd6f28c0334508b79c257e6fb9484e3be06bce296e2a27c98be7cd94e1d84 languageName: node linkType: hard