Skip to content

Commit

Permalink
Merge branch 'develop' into us_46339_link_esterni_smalllinksblock
Browse files Browse the repository at this point in the history
  • Loading branch information
deodorhunter authored Sep 20, 2023
2 parents 7a2d5dc + a311095 commit a9d5ff9
Show file tree
Hide file tree
Showing 9 changed files with 135 additions and 14 deletions.
17 changes: 13 additions & 4 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<!--- -----------------------------------------------------------------
Esempio:
---------------------------------------------------------------------
## Versione 7.10.9
## Versione 7.10.9 (12/09/2023)
### Migliorie
- Fissato il layout di stampa per pagine con Accordion
### Novità
Expand All @@ -19,7 +19,7 @@
TEMPLATE PER RELEASE
----------------------------------------------------------------------
## Versione X.X.X
## Versione X.X.X (dd/mm/yyyy)
### Migliorie
- ...
Expand All @@ -30,8 +30,17 @@
- ...
-->

## Versione 8.6.x

## Versione X.X.X (dd/mm/yyyy)

### Migliorie

- Fissato il layout del template Blocco link solo immagini con link esterni, icona accessibilità per link esterni ora è disattivabile attraverso opzione del template, posizionata invece in overlay se presente
- Nel template Blocco link solo immagini con link esterni, icona accessibilità per link esterni ora è disattivabile attraverso opzione del template

### 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
- Fissato il layout del template Blocco link solo immagini con link esterni, posizionata l'icona di accessibilità per link esterni in overlay se presente

10 changes: 8 additions & 2 deletions src/components/ItaliaTheme/Blocks/ContactsBlock/Edit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,15 @@ class Edit extends SubblocksEdit {
</div>

<SubblocksWrapper node={this.node}>
<Row className="justify-content-center">
<Row
className={
this.state.subblocks.length > 3
? 'justify-content-start'
: 'justify-content-center'
}
>
{this.state.subblocks.map((subblock, subindex) => (
<Col lg="4" key={subblock.id}>
<Col lg="4" key={subblock.id} className="pb-3">
<EditBlock
data={subblock}
index={subindex}
Expand Down
8 changes: 7 additions & 1 deletion src/components/ItaliaTheme/Blocks/ContactsBlock/View.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,13 @@ const AccordionView = ({ data, block }) => {
)}
</div>
</div>
<Row className="justify-content-center">
<Row
className={
data.subblocks.length > 3
? 'justify-content-start'
: 'justify-content-center'
}
>
{data.subblocks.map((subblock, index) => (
<Col lg="4" key={subblock.id} className="pb-3">
<ViewBlock
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,7 @@ const ContentInEvidenceTemplate = ({

return (
<div className="contentInEvidenceTemplate">
<Container
className={cx('', {
'px-4': isEditMode,
})}
>
<Container>
{title && (
<Row>
<Col>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const Downloads = ({ item, titleDoc }) => {
</React.Fragment>
) : (
<UniversalLink
href={flattenToAppURL(item['@id'])}
href={item.remoteUrl || flattenToAppURL(item['@id'])}
title={item.title}
className="modulistica-link"
>
Expand All @@ -59,7 +59,7 @@ const DocRow = ({ doc }) => {
})}
>
<div id={`title-${doc.id}`} className="title">
<UniversalLink href={flattenToAppURL(doc['@id'])}>
<UniversalLink href={doc.remoteUrl || flattenToAppURL(doc['@id'])}>
{doc.title}
</UniversalLink>
{doc?.description && (
Expand Down
15 changes: 15 additions & 0 deletions src/theme/ItaliaTheme/Widgets/_react-dates-override.scss
Original file line number Diff line number Diff line change
@@ -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;
}
}
1 change: 1 addition & 0 deletions src/theme/_cms-ui.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@import 'cms-ui_container';
body.cms-ui {
.block {
font-family: $font-family-serif;
Expand Down
87 changes: 87 additions & 0 deletions src/theme/_cms-ui_container.scss
Original file line number Diff line number Diff line change
@@ -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);
}
1 change: 1 addition & 0 deletions src/theme/site.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down

0 comments on commit a9d5ff9

Please sign in to comment.