Merge branch 'main' into slate

RedTurtle · Jan 31, 2024 · 0c964fe · 0c964fe
2 parents 29c30da + bdb53b9
commit 0c964fe
Show file tree

Hide file tree

Showing 23 changed files with 267 additions and 73 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,29 @@
 ## [11.0.0-alpha.2](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.0.0-alpha.1...v11.0.0-alpha.2) (2023-11-29)
 
+## [11.3.3](https://github.com/redturtle/design-comuni-plone-theme/compare/v11.3.2...v11.3.3) (2024-01-30)
+
+
+### Bug Fixes
+
+* alignment of CardPersona images and better layout for tablets, 2 cards max per row at this screen size ([#501](https://github.com/redturtle/design-comuni-plone-theme/issues/501)) ([8a8fe7a](https://github.com/redturtle/design-comuni-plone-theme/commit/8a8fe7af3f4c93036579ff200a69b65dfe19b478))
+* color contrast in icons block ([#498](https://github.com/redturtle/design-comuni-plone-theme/issues/498)) ([2099b12](https://github.com/redturtle/design-comuni-plone-theme/commit/2099b12b535610eee1b5be0382e7e6d58582a91b))
+* ct Cartella Modulistica layout fixes, handle long text and fix mobile layout ([#497](https://github.com/redturtle/design-comuni-plone-theme/issues/497)) ([40ca2c9](https://github.com/redturtle/design-comuni-plone-theme/commit/40ca2c98645f28bafaf65b67929fbf8d67c649d5))
+* gallery grid block scale for index 3 ([#492](https://github.com/redturtle/design-comuni-plone-theme/issues/492)) ([2800f1d](https://github.com/redturtle/design-comuni-plone-theme/commit/2800f1d50f3f158af19b817d6403cee88bba173b))
+* layout and link color for BandiInEvidence ([e064d22](https://github.com/redturtle/design-comuni-plone-theme/commit/e064d22ea57561dcaa92f4a58bd249ad1337ceec))
+* layout for LocationItem and VenuesSmall fixed for tablet ([#505](https://github.com/redturtle/design-comuni-plone-theme/issues/505)) ([656238a](https://github.com/redturtle/design-comuni-plone-theme/commit/656238a82ec88ea9cab6dfc92171fd9b92690655))
+* layout of OfficeCard component in tablet resolutions, fix wrapper of Office cards in all views that can have multiple OfficeCards ([#506](https://github.com/redturtle/design-comuni-plone-theme/issues/506)) ([aa7a1e9](https://github.com/redturtle/design-comuni-plone-theme/commit/aa7a1e9baa71fe1d63b4b28ab734cf0c7d89202a))
+* removed unnecessary link color variable ([a60599a](https://github.com/redturtle/design-comuni-plone-theme/commit/a60599a873992e0a7254e261540fd63cc83ce042))
+* removed width style from card-body, added align-items style to overwrite listing-item style ([aad1c80](https://github.com/redturtle/design-comuni-plone-theme/commit/aad1c800705e0e3d3bc1ad3abdc0a369bba42b3b))
+* styles for highlitedContent block for subsites ([#503](https://github.com/redturtle/design-comuni-plone-theme/issues/503)) ([d51135e](https://github.com/redturtle/design-comuni-plone-theme/commit/d51135e356a7a1203e706f48781fb3ff11392ee9))
+* **subsites:** changed select pill text color when theme is light ([#494](https://github.com/redturtle/design-comuni-plone-theme/issues/494)) ([2421e20](https://github.com/redturtle/design-comuni-plone-theme/commit/2421e202274b0376b1e12ca16f586502a3d2830a))
+* the default maximum b_size allowed in redturtle.volto is 500, this fix remove annoying log warning ([#499](https://github.com/redturtle/design-comuni-plone-theme/issues/499)) ([970e4f4](https://github.com/redturtle/design-comuni-plone-theme/commit/970e4f401f16c4b1fda7cbe2b0ed9a158445ffa9))
+* visualizzazione altri argomenti in blocco argomenti quando il loro numero è esiguo ([#493](https://github.com/redturtle/design-comuni-plone-theme/issues/493)) ([9644292](https://github.com/redturtle/design-comuni-plone-theme/commit/96442927aa9ac3cc85fcf90c8aa64e204231f61b))
+
+
+### Maintenance
+
+* preparing release v11.3.3 ([4ccd4e2](https://github.com/redturtle/design-comuni-plone-theme/commit/4ccd4e26bd61f84df4d90059862f510b40d44913))
+
 ## [11.3.2](https://github.com/redturtle/design-comuni-plone-theme/compare/v11.3.1...v11.3.2) (2024-01-19)
 
 

diff --git a/RELEASE.md b/RELEASE.md
@@ -55,6 +55,26 @@
 
 
 ## Versione 11.3.2 (19/01/2023)
+## Versione 11.3.3 (30/01/2024)
+
+### Migliorie
+
+- Migliorato il focus sulle immagini in edit del blocco Immagine quando queste sono allineate a sinistra o a destra.
+### Fix
+
+- Sistemato il layout del blocco elenco per i Bandi
+- Sistemato il layout del template Galliery a griglia per il blocco elenco, le immagini più piccole ora sono correttamente contenute dentro il loro riquadro e il titolo non fuoriesce più
+- Sistemati problemi negli stili per i sottositi
+- Risolto un problema di visualizzazione degli argomenti indicati come altri argomenti nel blocco Argomenti quando il loro numero è esiguo
+- Sistemato il layout e la visualizzazione della vista del CT Cartella Modulistica per gestire al meglio gli elementi
+  titolo, titolo del modulo e link al download in caso di testi lunghi, specialmente su mobile
+- Colore di sfondo per il blocco icone impostato sul colore primario. Sistemato il contrasto tra descrizione e lo sfondo
+- Sistemata la visualizzazione delle card Uffici (card Unità Organizzativa) nelle risoluzioni tablet più comuni
+- Layout delle card per i luoghi migliorato per dispositivi tablet
+- Risolto un problema di visualizzazione e allineamento delle immagini per le card dei blocchi elenco che rappresentano Persone,
+  migliorata la visualizzazione e il layout su dispositivi tablet (intervallo dimensioni: 992px-1199px)
+
+## Versione 11.3.2 (19/01/2024)
 
 ### Fix
 

diff --git a/publiccode.yml b/publiccode.yml
@@ -227,9 +227,9 @@ maintenance:
 name: io-Comune - Il sito AgID per Comuni ed Enti Pubblici
 platforms:
   - web
-releaseDate: '2024-01-19'
+releaseDate: '2024-01-30'
 softwareType: standalone/web
-softwareVersion: 11.3.2
+softwareVersion: 11.3.3
 url: 'https://github.com/italia/design-comuni-plone-theme'
 usedBy:
   - ASP Comuni Modenesi Area Nord

diff --git a/src/components/ItaliaTheme/Blocks/ArgumentsInEvidence/BottomBody.jsx b/src/components/ItaliaTheme/Blocks/ArgumentsInEvidence/BottomBody.jsx
@@ -17,13 +17,13 @@ const messages = defineMessages({
 const BottomBody = ({ data, intl }) => {
   return data?.arguments?.length > 0 ? (
     <Container className="text-center">
-      <div className="row d-lg-inline-flex pt-5">
-        <div className="col-lg-3">
+      <div className="row d-lg-inline-flex align-items-center pt-5">
+        <div className="col-lg-auto">
           <h6 className="text-uppercase text-center mt-1">
             {intl?.formatMessage(messages.otherArguments)}
           </h6>
         </div>
-        <div className="col-lg-9 text-start">
+        <div className="col-lg-auto">
           {data?.arguments?.map((argument, index) => (
             <Chip
               color="primary"

diff --git a/src/components/ItaliaTheme/Blocks/Listing/CardWithImageTemplate.jsx b/src/components/ItaliaTheme/Blocks/Listing/CardWithImageTemplate.jsx
@@ -104,17 +104,19 @@ const CardWithImageTemplate = (props) => {
               name: 'BlockExtraTags',
               dependencies: ['CardWithImageTemplate', item['@type']],
             }).component;
+            const layoutSelected = set_four_columns ? '3' : '4';
 
             return (
               <Col
-                lg={set_four_columns ? '3' : '4'}
+                xl={layoutSelected}
+                lg={item['@type'] === 'Persona' ? 6 : layoutSelected}
                 key={item['@id']}
                 className="col-item mb-3"
               >
                 {item['@type'] === 'Persona' ? (
                   <CardPersona
                     item={item}
-                    className="listing-item card-bg shadow-sm"
+                    className="card-bg shadow-sm"
                     showImage={showImage}
                     natural_image_size={natural_image_size}
                     show_description={show_description}

diff --git a/src/components/ItaliaTheme/Blocks/Listing/GridGalleryTemplate.jsx b/src/components/ItaliaTheme/Blocks/Listing/GridGalleryTemplate.jsx
@@ -35,7 +35,6 @@ const GridGalleryTemplate = ({
   linkmore_id_lighthouse,
 }) => {
   const intl = useIntl();
-
   return (
     <div className="grid-gallery-template">
       <Container className="px-4">
@@ -60,9 +59,8 @@ const GridGalleryTemplate = ({
               item,
               className: '',
             });
-
             let scale = null;
-            if (index % 7 === 0 || index % 7 === 6) {
+            if (index % 7 === 0 || index % 7 === 6 || index % 7 === 3) {
               scale = 'great';
             }
             if (index % 7 === 1 || index % 7 === 5) {
@@ -71,21 +69,18 @@ const GridGalleryTemplate = ({
             if (index % 7 === 2 || index % 7 === 4) {
               scale = 'large';
             }
-
             if (scale && item?.image?.scales?.[scale]) {
               image = (
-                <picture className="volto-image responsive">
-                  <img
-                    src={flattenToAppURL(item.image.scales[scale].download)}
-                    width={item.image.scales[scale].width}
-                    height={item.image.scales[scale].height}
-                    alt=""
-                    role="presentation"
-                    aria-hidden="true"
-                    title={item.title}
-                    loading={critical ? 'eager' : 'lazy'}
-                  />
-                </picture>
+                <img
+                  src={flattenToAppURL(item.image.scales[scale].download)}
+                  width={item.image.scales[scale].width}
+                  height={item.image.scales[scale].height}
+                  alt=""
+                  role="presentation"
+                  aria-hidden="true"
+                  title={item.title}
+                  loading={critical ? 'eager' : 'lazy'}
+                />
               );
             }
 
@@ -98,7 +93,11 @@ const GridGalleryTemplate = ({
                   item={!isEditMode ? item : null}
                   href={isEditMode ? '#' : null}
                 >
-                  {image && image}
+                  {image && (
+                    <picture className="volto-image responsive">
+                      {image}
+                    </picture>
+                  )}
                   <h3>{item.title}</h3>
                 </UniversalLink>
               </div>

diff --git a/src/components/ItaliaTheme/View/Commons/Attachments.jsx b/src/components/ItaliaTheme/View/Commons/Attachments.jsx
@@ -53,7 +53,8 @@ const Attachments = ({
             'path.depth': 1,
             sort_on: 'getObjPositionInParent',
             fullobjects: 1,
-            b_size: 900,
+            // the default maximum b_size allowed in redturtle.volto is 500
+            b_size: 499,
           },
           key,
         ),

diff --git a/src/components/ItaliaTheme/View/Commons/OfficeCard.jsx b/src/components/ItaliaTheme/View/Commons/OfficeCard.jsx
@@ -29,7 +29,7 @@ const OfficeCard = ({
   return (
     <div
       className={cx(
-        'card card-teaser preview-image-card border-left-card rounded shadow p-3 ',
+        'card card-teaser office-card preview-image-card border-left-card rounded shadow p-3 ',
         size === 'big' ? 'card-big-io-comune' : 'card-small',
         {
           'mb-3': margin_bottom,

diff --git a/src/components/ItaliaTheme/View/Commons/VenuesSmall.jsx b/src/components/ItaliaTheme/View/Commons/VenuesSmall.jsx
@@ -29,7 +29,7 @@ const Location = ({ location, show_icon }) => {
   const image = Image({ item: location, loading: 'lazy', sizes: '80px' });
   return (
     location && (
-      <div className="card card-teaser shadow border-left-card mt-3 rounded">
+      <div className="card card-teaser shadow border-left-card mt-3 rounded location-item">
         {show_icon && <Icon icon={'it-pin'} />}
         <div className="card-body">
           <div className="card-title h5">{location.title}</div>

diff --git a/src/components/ItaliaTheme/View/IncaricoView/IncaricoView.jsx b/src/components/ItaliaTheme/View/IncaricoView/IncaricoView.jsx
@@ -127,19 +127,23 @@ const IncaricoView = (props) => {
             tag_id="ufficio"
             title={intl.formatMessage(messages.ufficio)}
           >
-            {content.unita_organizzativa?.map((item) => (
-              <OfficeCard key={flattenToAppURL(item['@id'])} office={item} />
-            ))}
+            <div className="card-wrapper card-teaser-wrapper card-teaser-wrapper-equal">
+              {content.unita_organizzativa?.map((item) => (
+                <OfficeCard key={flattenToAppURL(item['@id'])} office={item} />
+              ))}
+            </div>
           </RichTextSection>
         )}
         {content.responsabile_struttura?.length > 0 && (
           <RichTextSection
             tag_id="responsabile"
             title={intl.formatMessage(messages.responsabile)}
           >
-            {content.responsabile_struttura?.map((item) => (
-              <OfficeCard key={flattenToAppURL(item['@id'])} office={item} />
-            ))}
+            <div className="card-wrapper card-teaser-wrapper card-teaser-wrapper-equal">
+              {content.responsabile_struttura?.map((item) => (
+                <OfficeCard key={flattenToAppURL(item['@id'])} office={item} />
+              ))}
+            </div>
           </RichTextSection>
         )}
         {content.atto_nomina?.length > 0 && (

diff --git a/src/components/ItaliaTheme/View/ServizioView/ServizioAccedi.jsx b/src/components/ItaliaTheme/View/ServizioView/ServizioAccedi.jsx
@@ -55,14 +55,15 @@ const ServizioAccedi = ({ content }) => {
           title={intl.formatMessage(messages.dove_rivolgersi)}
           lighthouseId="service-generic-access"
         >
-          {content.dove_rivolgersi?.map?.((dove) => (
-            <div
-              key={dove['@id']}
-              className="card-wrapper card-teaser-wrapper card-teaser-wrapper-equal"
-            >
-              <OfficeCard office={dove} data-element="service-generic-access" />
-            </div>
-          ))}
+          <div className="card-wrapper card-teaser-wrapper card-teaser-wrapper-equal">
+            {content.dove_rivolgersi?.map?.((dove) => (
+              <OfficeCard
+                office={dove}
+                data-element="service-generic-access"
+                key={dove['@id']}
+              />
+            ))}
+          </div>
           <RichText
             data={content.dove_rivolgersi_extra}
             lighthouseId="service-generic-access"

diff --git a/src/theme/ItaliaTheme/Blocks/_bandiInEvidenceTemplate.scss b/src/theme/ItaliaTheme/Blocks/_bandiInEvidenceTemplate.scss
@@ -19,12 +19,16 @@
       grid-row: 1;
     }
 
-    .card-body {
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-      padding: 2.5rem;
-      padding-bottom: 0rem;
+    .listing-item {
+      align-items: normal;
+
+      .card-body {
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        padding: 2.5rem;
+        padding-bottom: 0rem;
+      }
     }
   }
 
@@ -122,7 +126,6 @@
       @media (max-width: #{map-get($grid-breakpoints, sm)}) {
         display: flex;
         align-items: center;
-        color: $analogue-1-a7;
         font-size: 0.77778rem;
         font-weight: bold;
         letter-spacing: 0.9px;

diff --git a/src/theme/ItaliaTheme/Blocks/_iconBlocks.scss b/src/theme/ItaliaTheme/Blocks/_iconBlocks.scss
@@ -34,7 +34,7 @@
       position: absolute;
       width: 100%;
       height: 100%;
-      background-color: rgba($primary, 0.85);
+      background-color: $primary;
       content: '';
     }
   }