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

330-fix: no gap in merch section #340

Merged
merged 4 commits into from
Jun 25, 2024
Merged

330-fix: no gap in merch section #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2efd8b5
fix: 330 - no gap in merch section
Wystov Jun 24, 2024
66ee4af
refactor: styles to module
Wystov Jun 24, 2024
f391a3f
Merge branch 'main' into fix/330-no-gap-in-merch-section
Wystov Jun 25, 2024
481f4a7
Merge branch 'main' into fix/330-no-gap-in-merch-section
Wystov Jun 25, 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
39 changes: 39 additions & 0 deletions src/widgets/merch/ui/merch.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
.merch {
gap: 50px;

@include media-laptop {
flex-direction: column;
}

.info {
@include media-laptop {
width: 100%;
}

width: 600px;
text-align: left;

> :nth-child(2),
> :nth-child(3),
> :nth-child(4) {
margin-top: 16px;
}
}

.picture {
@include media-laptop {
width: 680px;
height: 618px;
margin-top: 24px;
}

@include media-tablet {
width: 100%;
height: auto;
}

width: 680px;
height: 700px;
margin: 0 auto;
}
}
43 changes: 0 additions & 43 deletions src/widgets/merch/ui/merch.scss
View file
Open in desktop

This file was deleted.

19 changes: 11 additions & 8 deletions src/widgets/merch/ui/merch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import classNames from 'classnames/bind';
import { LINKS } from '@/app/const';
import image from '@/shared/assets/merch.webp';
import { ArrowIcon } from '@/shared/icons';
Expand All @@ -8,19 +9,21 @@ import { SectionLabel } from '@/shared/ui/section-label';
import { Subtitle } from '@/shared/ui/subtitle';
import { Title } from '@/shared/ui/title';

import './merch.scss';
import styles from './merch.module.scss';

const cx = classNames.bind(styles);

export const Merch = () => (
<div id="merch" className="merch container">
<div className="merch content column-2">
<div className="info">
<div id="merch" className={cx('container')}>
<div className={cx('content', 'merch', 'column-2')}>
<div className={cx('info')}>
<SectionLabel label="merch" />
<Title text="RS merch" hasAsterisk />
<Subtitle text="Are you an RS sloth fan and looking for RS merch?" />
<Paragraph>
The wait is almost over as we&apos;re gearing up for the catalog of free web and print assets
where you will find all merch collections and can print your own Rolling Scopes t-shirts,
stickers etc.
The wait is almost over as we&apos;re gearing up for the catalog of free web and print
assets where you will find all merch collections and can print your own Rolling Scopes
t-shirts, stickers etc.
</Paragraph>
<LinkCustom
href={LINKS.MERCH}
Expand All @@ -32,7 +35,7 @@ export const Merch = () => (
Discover merch assets
</LinkCustom>
</div>
<Image className="right picture" src={image} alt="speakers-wanted" />
<Image className={cx('right', 'picture')} src={image} alt="speakers-wanted" />
</div>
</div>
);
Loading