Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fixed font and spaces of Card blocks #476

Merged
merged 3 commits into from
Jan 11, 2024
+61 −78
Merged

fix: fixed font and spaces of Card blocks #476

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
772d3c3
fix: fixed font and spaces of Card blocks
SaraBianchi Jan 10, 2024
5937742
chore: updated release log
SaraBianchi Jan 11, 2024
048915b
Merge branch 'main' into bug_49308_fix_card_blocks
pnicolli Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions RELEASE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@

- Diminuita la larghezza del testo nelle card che indicano i luoghi.
- Risolto un problema nel blocco Video Gallery, per cui alcuni video di youtube non erano riproducibili.
- Sistemate spaziature e font su mobile del blocco Card con Immagine e Card Semplice, migliorato il layout di quest'ultimo.

## Versione 11.1.4 (05/01/2024)

Expand Down
76 changes: 32 additions & 44 deletions src/components/ItaliaTheme/Blocks/TextCard/CardWithImage/Block.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
/* eslint-disable jsx-a11y/no-static-element-interactions */
/* eslint-disable jsx-a11y/click-events-have-key-events */
import React, { useState, useRef, useEffect } from 'react';
import {
Card,
CardBody,
CardText,
Container,
Row,
Col,
} from 'design-react-kit';
import React, { useState, useEffect } from 'react';
import { Card, CardBody, Container, Row, Col } from 'design-react-kit';
import { defineMessages, useIntl } from 'react-intl';
import PropTypes from 'prop-types';
import redraft from 'redraft';
Expand Down Expand Up @@ -113,7 +106,7 @@ const Block = ({
)}
</h2>
<Card color="white" className="card-bg rounded" noWrapper={false}>
<CardBody className="pb-0">
<CardBody>
{inEditMode ? (
<Container>
<Row
Expand All @@ -123,19 +116,20 @@ const Block = ({
})}
>
{hasImage && (
<Col className="py-4 px-0" key={'col-0'}>
<Col className="my-1 px-0" key={'col-0'}>
{renderImage(data?.image, hasImage, data?.sizeNatural)}
</Col>
)}
<div
key={'col-1'}
className={cx('p-4 mb-2', {
className={cx('px-4 mb-2', {
'col-12': !hasImage,
'col-8':
(hasImage && data?.sizeImage === 's') ||
(hasImage && !data?.sizeImage),
'col-6': hasImage && data?.sizeImage === 'm',
'col-4': hasImage && data?.sizeImage === 'l',
'ps-0': data?.rightImage,
})}
>
<div
Expand All @@ -146,29 +140,24 @@ const Block = ({
setSelectedField('content');
}}
>
<CardText
className="simple-text-card text"
style={{ padding: 0 }}
>
<TextEditorWidget
data={data}
fieldName="image_card_content"
selected={selectedField === 'content'}
block={block}
onChangeBlock={(data) => onChange(data)}
placeholder={intl.formatMessage(
messages.image_card_content,
)}
showToolbar={true}
onSelectBlock={onSelectBlock}
onAddBlock={onAddBlock}
index={index}
onFocusNextBlock={onFocusNextBlock}
onFocusPreviousBlock={() => {
setSelectedField('title');
}}
/>
</CardText>
<TextEditorWidget
data={data}
fieldName="image_card_content"
selected={selectedField === 'content'}
block={block}
onChangeBlock={(data) => onChange(data)}
placeholder={intl.formatMessage(
messages.image_card_content,
)}
showToolbar={true}
onSelectBlock={onSelectBlock}
onAddBlock={onAddBlock}
index={index}
onFocusNextBlock={onFocusNextBlock}
onFocusPreviousBlock={() => {
setSelectedField('title');
}}
/>
</div>
</div>
</Row>
Expand All @@ -180,28 +169,27 @@ const Block = ({
'revert-row': data?.rightImage,
})}
>
<Col className="py-4 px-0" key={'col-0'} data-testid={'col-0'}>
<Col className="my-1 p-0" key={'col-0'} data-testid={'col-0'}>
{renderImage(data?.image, hasImage, data?.sizeNatural)}
</Col>
<div
key={'col-1'}
data-testid={'col-1'}
className={cx('p-4', {
className={cx('px-4', {
'col-12': !hasImage,
'col-8':
(hasImage && data?.sizeImage === 's') ||
(hasImage && !data?.sizeImage),
'col-6': hasImage && data?.sizeImage === 'm',
'col-4': hasImage && data?.sizeImage === 'l',
'ps-0': data?.rightImage,
})}
>
<CardText>
{redraft(
content,
config.settings.richtextViewSettings.ToHTMLRenderers,
config.settings.richtextViewSettings.ToHTMLOptions,
)}
</CardText>
{redraft(
content,
config.settings.richtextViewSettings.ToHTMLRenderers,
config.settings.richtextViewSettings.ToHTMLOptions,
)}
</div>
</Row>
</Container>
Expand Down
62 changes: 28 additions & 34 deletions src/components/ItaliaTheme/Blocks/TextCard/SimpleCard/Block.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable jsx-a11y/no-static-element-interactions */
/* eslint-disable jsx-a11y/click-events-have-key-events */
import React, { useState, useRef, useEffect } from 'react';
import { Card, CardBody, CardTitle, CardText } from 'design-react-kit';
import React, { useState, useEffect } from 'react';
import { Card, CardBody, CardTitle } from 'design-react-kit';
import { defineMessages, useIntl } from 'react-intl';
import PropTypes from 'prop-types';
import redraft from 'redraft';
Expand Down Expand Up @@ -98,45 +98,39 @@ const Block = ({
setSelectedField('content');
}}
>
<CardText>
<TextEditorWidget
data={data}
fieldName="simple_card_content"
selected={selectedField === 'content'}
block={block}
onChangeBlock={(data) =>
onChange(data, 'simple_card_content')
}
placeholder={intl.formatMessage(
messages.simple_card_content,
)}
showToolbar={true}
onSelectBlock={onSelectBlock}
onAddBlock={onAddBlock}
index={index}
onFocusNextBlock={onFocusNextBlock}
onFocusPreviousBlock={() => {
setSelectedField('title');
}}
/>
</CardText>
<TextEditorWidget
data={data}
fieldName="simple_card_content"
selected={selectedField === 'content'}
block={block}
onChangeBlock={(data) =>
onChange(data, 'simple_card_content')
}
placeholder={intl.formatMessage(
messages.simple_card_content,
)}
showToolbar={true}
onSelectBlock={onSelectBlock}
onAddBlock={onAddBlock}
index={index}
onFocusNextBlock={onFocusNextBlock}
onFocusPreviousBlock={() => {
setSelectedField('title');
}}
/>
</div>
</>
) : (
<>
<CardTitle tag="h4" id={block.id + '-title'}>
{title}
</CardTitle>
<Divider />
<div>
<CardText>
{redraft(
content,
config.settings.richtextViewSettings.ToHTMLRenderers,
config.settings.richtextViewSettings.ToHTMLOptions,
)}
</CardText>
</div>
<hr />
{redraft(
content,
config.settings.richtextViewSettings.ToHTMLRenderers,
config.settings.richtextViewSettings.ToHTMLOptions,
)}
</>
)}
</div>
Expand Down