Merge branch 'main' into bug_51207_layout_link_bandiInEvidence

RedTurtle · Jan 30, 2024 · c61f94b · c61f94b
2 parents aad1c80 + bb25a58
commit c61f94b
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 31 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -46,6 +46,8 @@
 ### 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

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,7 +59,6 @@ const GridGalleryTemplate = ({
               item,
               className: '',
             });
-
             let scale = null;
             if (index % 7 === 0 || index % 7 === 6 || index % 7 === 3) {
               scale = 'great';
@@ -73,18 +71,16 @@ const GridGalleryTemplate = ({
             }
             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'}
+                />
               );
             }
 
@@ -97,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/theme/ItaliaTheme/Subsites/ItaliaTheme/Blocks/_cta.scss b/src/theme/ItaliaTheme/Subsites/ItaliaTheme/Blocks/_cta.scss
@@ -1,13 +1,20 @@
 @use '../../all_variables' as *;
 
-@mixin block($subsite-secondary) {
+@mixin block($subsite-secondary, $subsite-secondary-text) {
   .cta-block {
     .cta-block-wrapper {
       background-color: $subsite-secondary;
 
       &.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
@@ -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
@@ -57,7 +57,11 @@
     color: $subsite-primary-text !important;
   }
   .select-pill.text-primary {
-    color: $subsite-primary !important;
+    @if ($subsite-light-theme) {
+      color: $subsite-link-color !important;
+    } @else {
+      color: $subsite-primary !important;
+    }
 
     div {
       color: inherit;
@@ -83,15 +87,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
@@ -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;
       }