Skip to content

Commit

Permalink
Merge pull request #892 from ita-social-projects/#836-Display-Target-…
Browse files Browse the repository at this point in the history
…Audience-Section-Redesign

#836 display target audience section redesign
  • Loading branch information
KuzykY authored Nov 27, 2024
2 parents 8048b18 + 6625799 commit 402c2a5
Show file tree
Hide file tree
Showing 11 changed files with 175 additions and 135 deletions.
3 changes: 3 additions & 0 deletions FrontEnd/public/svg/baget.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions FrontEnd/public/svg/car.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions FrontEnd/public/svg/hotel.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions FrontEnd/public/svg/people.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions FrontEnd/public/svg/post.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions FrontEnd/public/svg/rocket.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions FrontEnd/public/svg/shop.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions FrontEnd/public/svg/wine.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
156 changes: 85 additions & 71 deletions FrontEnd/src/pages/LandingPage/AboutSection/AboutText/AboutText.css
Original file line number Diff line number Diff line change
@@ -1,88 +1,102 @@
.about-us-text-section {
.about-us-section-background {
display: flex;
padding: 80px 104px;
flex-direction: column;
align-items: flex-start;
gap: 80px;
background: var(--about-text-background-color);
overflow: hidden;
justify-content: center;
background-color: #f9f4ea;
width: 100vw;
height: auto;
}
.about-us-text-section__text-field {

.about-us-text-section {
display: flex;
flex-direction: column;
align-items: flex-end;
gap: 24px;
position: relative;
z-index: 1;
align-items: center;
gap :24px;
width: 375px;
padding: 40px 16px;
box-sizing: border-box;
background-color: #f9f4ea;
}

.about-us-text-section__header-text {
width: 990px;
color: var(--about-text-font-color);
font-family: var(--font-main);
font-size: 32px;
font-style: normal;
font-family: var(--font-logo);
font-size: 24px;
font-weight: 700;
line-height: 120%;
}
.about-us-text-section__text {
width: 971px;
height: 62px;
color: var(--about-text-font-color);
font-feature-settings: 'calt' off;
font-family: var(--font-main);
font-size: 16px;
font-style: normal;
font-weight: 400;
line-height: 20px; /* 125% */
letter-spacing: -0.16px;
line-height: 28px;
text-align: center;
color: #232424;
}

.about-us-text-section__paragraphs {
.about-us-text-section__card {
display: flex;
width: 1304px;
justify-content: flex-end;
align-items: flex-start;
gap: 36px;
flex-direction: column;
align-items: center;
justify-content: center;
background-color: #fff;
width: 155px;
height: 155px;
border-radius: 6px;
gap: 8px;
padding: 16px;
box-sizing: border-box;
}
.about-us-text-section__paragraph-one {
align-self: flex-start;
width: 466px;
flex-shrink: 0;
color: var(--about-text-font-color);
font-feature-settings: 'calt' off;
font-family: var(--font-main);
font-size: 16px;
font-style: normal;
font-weight: 600;
line-height: 30px; /* 187.5% */
letter-spacing: -0.16px;
/* content: "\2022"; */

.about-us-text-section__icon {
width: 36px;
height: 36px;
}
.about-us-text-section__paragraph-two {
align-self: flex-start;
width: 489px;
flex-shrink: 0;
color: var(--about-text-font-color);
font-feature-settings: 'calt' off;
font-family: var(--font-main);
font-size: 16px;
font-style: normal;

.about-us-text-section__card-text {
font-family: var(--font-logo);
font-size: 14px;
font-weight: 600;
line-height: 30px; /* 187.5% */
letter-spacing: -0.16px;
color: #232424;
line-height: 19.6px;
letter-spacing: -0.14px;
text-align: center;
}
.about-us-text-section__paragraph-one span::before,
.about-us-text-section__paragraph-two span::before {
/* content: "\2022"; */
margin-right: 8px;

@media only screen and (min-width: 768px) {
.about-us-text-section {
width: 768px;
padding: 48px 24px;
}

.about-us-text-section__header-text {
font-size: 40px;
line-height: 48px;
letter-spacing: 0.4px;
}

.about-us-text-section__card {
flex-direction: row;
height: 102px;
width: 345px;
gap: 18px;
padding: 18px;
justify-content: flex-start;
}

.about-us-text-section__card-text {
font-size: 16px;
letter-spacing: -0.16px;
line-height: 22.4px;
text-align: start;
}
}

.about-us-text-section__dots {
width: 353px;
height: auto;
padding: 50px 0 0 10px;
object-fit: cover;
position: absolute;
transform: translateX(-50%);
z-index: 0;
@media only screen and (min-width: 1512px) {
.about-us-text-section {
width: 1512px;
padding: 80px 104px;
gap: 40px;
}

.about-us-text-section__header-text {
font-size: 32px;
line-height: 36px;
}

.about-us-text-section__card {
width: 302px;
}
}
46 changes: 24 additions & 22 deletions FrontEnd/src/pages/LandingPage/AboutSection/AboutText/AboutText.jsx
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
import React from 'react';
import { Row, Col } from 'antd';
import './AboutText.css';
import AboutText from './text.js';

const AboutSectionText = () => {
const renderParagraphs = (paragraphNumber) => {
return AboutText.content
.filter(item => item.paragraph === paragraphNumber)
.map((item, index) => (
<li key={index}>{item.text}</li>
));
};

return (
<div className="about-us-text-section">
<div className="about-us-text-section__text-field">
<div className="about-us-text-section__header-text">{AboutText.title}</div>
<div className="about-us-text-section__paragraphs">
<ul className="about-us-text-section__paragraph-one">
{renderParagraphs(1)}
</ul>
<ul className="about-us-text-section__paragraph-two">
{renderParagraphs(2)}
</ul>
</div>
<div className="about-us-section-background">
<div className="about-us-text-section">
<h2 className="about-us-text-section__header-text">{AboutText.title}</h2>
<Row justify="start" gutter={[32, 32]}>
{AboutText.content.map((item) => (
<Col
key={item.id}
xs={12}
md={12}
xl={6}
>
<div className="about-us-text-section__card">
<img
src={`${process.env.REACT_APP_PUBLIC_URL}/svg/${item.icon}`}
alt={item.text}
className="about-us-text-section__icon"
/>
<p className="about-us-text-section__card-text" >{item.text}</p>
</div>
</Col>
))}
</Row>
</div>
<img className="about-us-text-section__dots"
src={`${process.env.REACT_APP_PUBLIC_URL}/img/dots_12x10.png`}
alt="dots_12x10.png" />
</div>
);
};
Expand Down
Loading

0 comments on commit 402c2a5

Please sign in to comment.