Skip to content

Commit

Permalink
Merge branch 'main' into blocco-icone-bg
Browse files Browse the repository at this point in the history
  • Loading branch information
pnicolli authored Jan 29, 2024
2 parents c852b31 + 40ca2c9 commit 57ccd84
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 6 deletions.
3 changes: 3 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@

### Fix

- 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

## Versione 11.3.2 (19/01/2023)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const GridGalleryTemplate = ({
});

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) {
Expand All @@ -71,7 +71,6 @@ const GridGalleryTemplate = ({
if (index % 7 === 2 || index % 7 === 4) {
scale = 'large';
}

if (scale && item?.image?.scales?.[scale]) {
image = (
<picture className="volto-image responsive">
Expand Down
13 changes: 12 additions & 1 deletion src/theme/ItaliaTheme/Views/_cartellaModulistica.scss
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ $docs-section-margin: 3em;
justify-content: space-between;
padding: 0.4em 0;
gap: 4rem;

.title {
flex: 1;
}
.title-wrap {
flex: 1;

Expand Down Expand Up @@ -182,6 +184,14 @@ $docs-section-margin: 3em;
.documents-section,
.document-row-section {
.doc-row {
.doc:not(.modulo) {
flex-direction: column;
align-items: flex-start;
justify-content: center;
.downloads {
width: 100%;
}
}
.doc {
flex-wrap: wrap;
align-items: center;
Expand Down Expand Up @@ -211,6 +221,7 @@ $docs-section-margin: 3em;

&.modulo {
justify-content: space-between;
flex-wrap: nowrap;

.title,
.downloads {
Expand Down

0 comments on commit 57ccd84

Please sign in to comment.