Skip to content

Правки для второй попытки (#15) #9

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

Merged
keksobot merged 1 commit into from
Feb 8, 2026
Merged

Правки для второй попытки (#15) #9

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
2 changes: 1 addition & 1 deletion source/styles/blocks/advertising-example.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
min-width: 280px;
max-width: 280px;
margin: 0 auto;
padding: 25px 20px 40px;
padding: 25px 20px 50px;
}

@media (min-width: $tablet-width) {
Expand Down
9 changes: 6 additions & 3 deletions source/styles/blocks/extra-product-card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
@media (min-width: $tablet-width) {
.extra-product-card {
grid-template-columns: 285px 254px 91px;
grid-template-rows: auto 70px;
padding-top: 26px;
grid-template-rows: auto auto;
padding-top: 23px;
border-left: 1px solid #ebebeb;
border-right: 1px solid #ebebeb;
padding-bottom: 32px;
Expand All @@ -34,7 +34,7 @@
text-decoration: none;
grid-column: 1/2;
grid-row: 1/2;
margin-top: auto;
margin-top: 12px;
}

@media (min-width: $tablet-width) {
Expand Down Expand Up @@ -79,6 +79,8 @@
align-items: end;
grid-column: 1/4;
grid-row: 2/3;
margin-top: 10px;
margin-bottom: 17px;
}

@media (min-width: $tablet-width) {
Expand All @@ -91,6 +93,7 @@
margin-top: auto;
text-align: end;
align-items: start;
margin-bottom: 22px;
}
}

Expand Down
3 changes: 1 addition & 2 deletions source/styles/blocks/links.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
min-width: 280px;
max-width: 280px;
margin: 0 auto;
padding: 40px 20px;
padding: 50px 20px;
}

@media (min-width: $tablet-width) {
Expand All @@ -14,7 +14,6 @@
display: flex;
justify-content: space-between;
align-items: center;
padding-top: 42px;
}
}

Expand Down
2 changes: 1 addition & 1 deletion source/styles/blocks/main-footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@

.main-footer__contacts {
margin: 0 auto;
padding: 26px 20px;
padding: 15px 20px;
}

@media (min-width: $tablet-width) {
Expand Down
5 changes: 4 additions & 1 deletion source/styles/blocks/main-nav.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@
&--nojs .main-nav__toggle {
display: none;
}

&--nojs .main-nav__list {
display: block;
}
}
}


.main-nav__toggle {
position: absolute;
top: 12px;
Expand Down
3 changes: 2 additions & 1 deletion source/styles/blocks/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,13 @@

.main__promos-and-new {
margin: 0 auto;
padding: 40px 20px;
padding: 45px 20px;
}

@media (width >= 768px) {
.main__promos-and-new {
padding: 0 38px;
padding-bottom: 20px;
}
}

Expand Down
8 changes: 7 additions & 1 deletion source/styles/blocks/program-card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,12 +229,18 @@
height: 12px;
background-color: $color-text-dark;
mask-image: url("../../icons/arrow.svg");
mask-size: 24px 12px;
mask-size: 32px 10px;
mask-repeat: no-repeat;
mask-position: center;
margin-top: 1px;
margin-left: 5px;
}

@media (min-width: $tablet-width) {
.program-card__link::after {
margin-left: 0;
}
}

.program-card__link:hover,
.program-card__link:focus-visible {
Expand Down
8 changes: 6 additions & 2 deletions source/styles/blocks/promos-and-new.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
color: #000000;
background-color: #ffffff;
width: fit-content;
margin: 0 0 32px;
margin: 0 0 30px;
padding-right: 40px;
font-family: "Oswald", sans-serif;
font-size: 24px;
Expand Down Expand Up @@ -97,6 +97,10 @@
}
}

.promos-and-new__form {
margin-bottom: 5px;
}

@media (width >= 768px) {
.promos-and-new__form {
justify-content: center;
Expand All @@ -121,6 +125,6 @@

@media (width >= 1340px) {
.promos-and-new__form {
margin-bottom: 0;
margin-bottom: 17px;
}
}
2 changes: 1 addition & 1 deletion source/styles/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
@import "./blocks/program-card.scss";
@import "./blocks/advantages.scss";
@import "./blocks/benefits.scss";
@import "./blocks/advertising-example.scss";
@import "./blocks/definition-list.scss";
@import "./blocks/slider.scss";
@import "./blocks/advertising-example.scss";
@import "./blocks/main-footer.scss";
@import "./blocks/social-list.scss";
@import "./blocks/developer-info.scss";
Expand Down