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

#211-product-card-in-fsd #232

Merged
merged 3 commits into from
Feb 19, 2024
Merged

#211-product-card-in-fsd #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe6a9b6
#211-product-card-in-fsd
Margarita22 Feb 9, 2024
a1bf8cc
#211-product-card-in-fsd(add storybook and typography)
Margarita22 Feb 15, 2024
9b18aef
#211-product-card-in-fsd(conflict resolution)
Margarita22 Feb 17, 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
20 changes: 9 additions & 11 deletions config/build/loaders/buildCssLoader.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
const MiniCssExtractPlugin = require('mini-css-extract-plugin')

module.exports.buildCssLoader = (isEnvProduction)=> {
module.exports.buildCssLoader = isEnvProduction => {
return {
test: /\.s[ac]ss$/i,
use: [
isEnvProduction ? MiniCssExtractPlugin.loader : 'style-loader' ,
isEnvProduction ? MiniCssExtractPlugin.loader : 'style-loader',
{
loader: 'css-loader',
options: {
modules: {
auto: (resPath) => Boolean(resPath.includes('.module.')),
localIdentName: isEnvProduction
? '[hash:base64:8]'
: '[local]--[hash:base64:5]',
},
},
auto: resPath => Boolean(resPath.includes('.module.')),
localIdentName: isEnvProduction ? '[hash:base64:8]' : '[local]--[hash:base64:5]'
}
}
},
'sass-loader',
],
};
'sass-loader'
]
}
}
14 changes: 12 additions & 2 deletions src/assets/icons/IconArrow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,25 @@ const IconArrow: FC<Props> = props => {
switch (type) {
case 'prev':
return (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 9 16" id="icon-prev" className={style}>
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 9 16"
id="icon-prev"
className={style}>
<path
d="M.244 7.376L7.062.256a.814.814 0 011.185 0l.502.524a.904.904 0 010 1.238L3.024 7.997l5.731 5.985a.89.89 0 01.245.62.89.89 0 01-.245.618l-.502.524a.815.815 0 01-1.185 0L.244 8.618A.89.89 0 010 7.998a.89.89 0 01.244-.622z"
fill="currentColor"></path>
</svg>
)
case 'next':
return (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 9 16" id="icon-next" className={style}>
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 9 16"
id="icon-next"
className={style}>
<path
d="M8.756 7.376L1.938.256a.814.814 0 00-1.185 0L.251.78a.904.904 0 000 1.238l5.725 5.979-5.731 5.985a.89.89 0 00-.245.62.89.89 0 00.245.618l.502.524a.815.815 0 001.185 0l6.824-7.126A.89.89 0 009 7.998a.89.89 0 00-.244-.622z"
fill="currentColor"></path>
Expand Down
2 changes: 0 additions & 2 deletions src/components/BlogCategories/blog-categories.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
border-radius: 10px;
background: #fff;



&__items {
margin-top: 25px;
max-width: 280px;
Expand Down
62 changes: 30 additions & 32 deletions src/entities/AdvantageCard/ui/AdvantageCard/advantageCard.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,45 +2,43 @@
@use '../../../../shared/styles/utils/variables' as var;

.card {
display: flex;
width: 100%;
min-height: 1px;
padding-left: 10px;
padding-right: 10px;
padding-bottom: 20px;

display: flex;
width: 100%;
min-height: 1px;
padding-left: 10px;
padding-right: 10px;
padding-bottom: 20px;
}

.link {
padding: 13px 20px;
background-color: var.$white;
text-decoration: none;
width: 100%;
border-radius: 10px;
height: 70px;
display: flex;
align-items: center;
justify-content: center;
color: var.$body-color;
transition: color 0.25s;
column-gap: 16px;

@include media.respond-to('middle') {
justify-content: left;
}
padding: 13px 20px;
background-color: var.$white;
text-decoration: none;
width: 100%;
border-radius: 10px;
height: 70px;
display: flex;
align-items: center;
justify-content: center;
color: var.$body-color;
transition: color 0.25s;
column-gap: 16px;

@include media.respond-to('middle') {
justify-content: left;
}
}

.text {
padding: 0;
margin: 0;
font-size: 15px;
font-style: normal;
font-weight: 500;
line-height: 19.95px;
padding: 0;
margin: 0;
font-size: 15px;
font-style: normal;
font-weight: 500;
line-height: 19.95px;
}

.image {
height: 45px;
width: 45px;
}
height: 45px;
width: 45px;
}
14 changes: 7 additions & 7 deletions src/entities/BlogCard/BlogCard.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
display: flex;
flex-direction: column;
justify-content: space-between;
gap: 15px;
gap: 15px;

&:hover {
transform: scale(1.1, 1.05);
transition: transform 0.3s ease-in-out;
transition: transform 0.3s ease-in-out;
}

.heading
.heading
{
font-size: #{'min(max(14px, 1.2vw), 16px)'};
}
Expand All @@ -29,12 +29,12 @@
}

.img {
height: 462px;
width: 100%;
height: 462px;
width: 100%;
border-radius: 6px;
transition: transform 0.3s ease-in-out;
scroll-snap-align: start;
object-fit: cover;
}
}

}
1 change: 0 additions & 1 deletion src/entities/BrandCard/BrandCard.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
width: 100%;
height: 148px;
}

}

.wrap {
Expand Down
138 changes: 69 additions & 69 deletions src/entities/CardReview/ui/CardReview/cardReview.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,87 +1,87 @@
@use '../../../../shared/styles/utils/variables' as color;

.review {
display: flex;
flex-direction: column;
min-width: 340px;
align-items: flex-start;
justify-content: space-between;
padding: 35px 30px 40px 40px;
gap: 9px;

.title {
display: flex;
align-items: center;
gap: 3px;
}
display: flex;
flex-direction: column;
min-width: 340px;
align-items: flex-start;
justify-content: space-between;
padding: 35px 30px 40px 40px;
gap: 9px;

p {
font-size: 0.9375rem;
font-weight: 400;
line-height: 1.7;
}
.title {
display: flex;
align-items: center;
gap: 3px;
}

&__header {
display: flex;
align-items: center;
line-height: 1.62;
gap: 11px;
p {
font-size: 0.9375rem;
font-weight: 400;
line-height: 1.7;
}

h3 {
font-size: 1rem;
font-weight: 500;
}
&__header {
display: flex;
align-items: center;
line-height: 1.62;
gap: 11px;

span {
font-size: 0.875rem;
font-weight: 400;
display: flex;
align-items: center;
gap: 3px;
}
h3 {
font-size: 1rem;
font-weight: 500;
}

&__initials {
width: 40px;
height: 40px;
border-radius: 50%;
background: color.$bg-gradient-green;
color: color.$white;
font-size: 1.125rem;
font-weight: 500;
line-height: 1.2;
display: flex;
align-items: center;
justify-content: center;
span {
font-size: 0.875rem;
font-weight: 400;
display: flex;
align-items: center;
gap: 3px;
}
}

&__initials {
width: 40px;
height: 40px;
border-radius: 50%;
background: color.$bg-gradient-green;
color: color.$white;
font-size: 1.125rem;
font-weight: 500;
line-height: 1.2;
display: flex;
align-items: center;
justify-content: center;
}

&__data {
font-weight: 400;
line-height: 1.7;
&__data {
font-weight: 400;
line-height: 1.7;

p {
overflow: hidden;
display: -webkit-box;
-webkit-line-clamp: 5;
-webkit-box-orient: vertical;
text-overflow: clip;
}
p {
overflow: hidden;
display: -webkit-box;
-webkit-line-clamp: 5;
-webkit-box-orient: vertical;
text-overflow: clip;
}

span {
font-size: 0.875rem;
opacity: 0.4;
}
span {
font-size: 0.875rem;
opacity: 0.4;
}
}
}

.link__text {
font-size: 0.9375rem;
line-height: 1.7;
font-weight: 500;
text-decoration: none;
color: color.$link-color;
font-size: 0.9375rem;
line-height: 1.7;
font-weight: 500;
text-decoration: none;
color: color.$link-color;

&:hover {
opacity: 0.7;
}
}
&:hover {
opacity: 0.7;
}
}
2 changes: 1 addition & 1 deletion src/entities/ContactCard/contactCard.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
width: 60px;
height: 60px;
margin-bottom: 12px;
}
}
17 changes: 8 additions & 9 deletions src/entities/NewsCard/NewsCard.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,15 @@
display: flex;
flex-direction: column;
justify-content: space-between;
gap: 15px;
gap: 15px;

&:hover {
transform: scale(1.1, 1.05);
transition: transform 0.3s ease-in-out;
transition: transform 0.3s ease-in-out;
}

.heading
{
font-size: #{'min(max(14px, 1.2vw), 16px)'};
.heading {
font-size: #{'min(max(14px, 1.2vw), 16px)'};
}

&:hover .heading {
Expand All @@ -41,13 +40,13 @@
line-height: 120%;
font-weight: 500;
}

.img {
height: 180px;
width: 100%;
height: 180px;
width: 100%;
border-radius: 6px;
transition: transform 0.3s ease-in-out;
scroll-snap-align: start;
object-fit: cover;
}
}
}
Loading
Loading