Skip to content

Remove image placeholder in cms blocks #980

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

Draft
ateamcms wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Remove image placeholder in cms blocks #980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions react/assets/forus-webshop/scss/includes/blocks/block-cms-funds.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
.fund-item {
width: 100%;
display: flex;
gap: 100px;
padding: 0 0 40px;
border-bottom: 1px solid var(--border-color);
transition: box-shadow 0.4s;

.fund-media {
width: 52%;
width: 42%;
order: 1;

img {
Expand All @@ -22,13 +23,12 @@
}

.fund-information {
width: 50%;
padding-left: 100px;
text-align: left;
order: 2;
display: flex;
flex-direction: column;
align-self: center;
flex: 1;

.fund-label {
margin: 0 0 5px;
Expand Down Expand Up @@ -70,8 +70,6 @@

.fund-information {
order: 1;
padding-left: 0;
padding-right: 100px;
}
}

Expand All @@ -96,6 +94,7 @@

.fund-item {
display: flex;
gap: 0;
flex-wrap: wrap;
flex-direction: column;
flex: 0 1 calc((100% - (calc(var(--gap) * 2))) / 3);
Expand Down Expand Up @@ -138,8 +137,7 @@
.fund-description {
margin: 0 0 0;
display: flex;
flex-grow: 1;


.block.block-markdown ul, .block.block-markdown p {
&:last-child {
margin-bottom: 0;
Expand Down Expand Up @@ -184,8 +182,11 @@
}

&.block-cms-funds-2-in-row {
--gap: 60px;
gap: var(--gap);

.fund-item {
width: calc(calc(100% / 2) - var(--padding));
flex: 0 1 calc((100% - (calc(var(--gap) * 2))) / 2);
}
}
}
Expand All @@ -195,6 +196,7 @@
gap: 30px;

.fund-item {
gap: 0;
padding: 0 0 30px;
flex-direction: column;

Expand All @@ -205,7 +207,6 @@

.fund-information {
width: 100%;
padding: 0;

.fund-title {
font: 400 20px/26px var(--base-font);
Expand Down Expand Up @@ -238,7 +239,6 @@

.fund-information {
order: 2;
padding: 0;
}
}
}
Expand Down
14 changes: 5 additions & 9 deletions react/src/webshop/components/elements/cms-blocks/CmsBlocksItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React from 'react';
import Markdown from '../markdown/Markdown';
import ImplementationPageBlock from '../../../props/models/ImplementationPageBlock';
import useAssetUrl from '../../../hooks/useAssetUrl';
import Label from '../label/Label';

export default function CmsBlocksItem({
Expand All @@ -11,16 +10,13 @@ export default function CmsBlocksItem({
block: ImplementationPageBlock;
blocksPerRow: number;
}) {
const assetUrl = useAssetUrl();

return (
<div className="fund-item">
<div className="fund-media">
<img
src={block.media?.sizes?.public || assetUrl('/assets/img/placeholders/product-small.png')}
alt=""
/>
</div>
{block.media?.sizes?.public && (
<div className="fund-media">
<img src={block.media.sizes.public} alt="" />
</div>
)}
<div className="fund-information">
{block.title && <h2 className="fund-title">{block.title}</h2>}
{block.label && (
Expand Down
14 changes: 5 additions & 9 deletions react/src/webshop/components/elements/cms-blocks/CmsBlocksItemLink.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
import React from 'react';
import Markdown from '../markdown/Markdown';
import ImplementationPageBlock from '../../../props/models/ImplementationPageBlock';
import useAssetUrl from '../../../hooks/useAssetUrl';
import Label from '../label/Label';

export default function CmsBlocksItemLink({ block }: { block: ImplementationPageBlock }) {
const assetUrl = useAssetUrl();

return (
<a
target={block.button_target_blank ? '_blank' : '_self'}
rel={block.button_target_blank ? 'noreferrer' : ''}
href={block.button_link}
className="fund-item">
<div className="fund-media">
<img
src={block.media?.sizes?.public || assetUrl('/assets/img/placeholders/product-small.png')}
alt=""
/>
</div>
{block.media?.sizes?.public && (
<div className="fund-media">
<img src={block.media.sizes.public} alt="" />
</div>
)}
<div className="fund-information">
{block.title && <h2 className="fund-title">{block.title}</h2>}
{block.label && (
Expand Down