Skip to content

Исправляет замечания по проекту #5

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
Jan 27, 2026
Merged

Исправляет замечания по проекту #5

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
8 changes: 4 additions & 4 deletions source/catalog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,11 +322,11 @@ <h3 class="additional-product__title">Витамины</h3>
<section class="catalog__newsletter newsletter">
<h2 class="newsletter__title section-subtitle">Акции и новинки</h2>
<p class="newsletter__description">Подпишитесь на наши новости и не пропустите ни одного предложения!</p>
<form class="newsletter__form form" action="https://echo.htmlacademy.ru" method="post">
<form class="newsletter__form" action="https://echo.htmlacademy.ru" method="post">
<label class="visually-hidden" for="newsletter-email">Укажите ваш email</label>
<!-- Если поле заполнено неверно, добавить к field-input модификатор invalid -->
<input class="form__input field-input" id="newsletter-email" type="email" name="newsletter-email" placeholder="kuklachev@gmail.com" required>
<button class="form__button button" type="submit">Подписаться</button>
<input class="newsletter__input field-input" id="newsletter-email" type="email" name="newsletter-email" placeholder="kuklachev@gmail.com" required>
<button class="newsletter__button button" type="submit">Подписаться</button>
</form>
</section>
</main>
Expand Down Expand Up @@ -357,7 +357,7 @@ <h2 class="visually-hidden">Как до нас добраться</h2>
</section>
<div class="main-footer__wrap">
<a class="main-footer__logo logo" href="index.html">
<img class="logo__text" src="images/logo-text.svg" width="128" height="24" lang="en" alt="Cat Energy">
<img class="main-footer__logo-text logo__text" src="images/logo-text.svg" width="128" height="24" lang="en" alt="Cat Energy">
</a>
<ul class="main-footer__social social">
<li class="social__item">
Expand Down
2 changes: 1 addition & 1 deletion source/form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ <h2 class="visually-hidden">Как до нас добраться</h2>
</section>
<div class="main-footer__wrap">
<a class="main-footer__logo logo" href="index.html">
<img class="logo__text" src="images/logo-text.svg" width="128" height="24" lang="en" alt="Cat Energy">
<img class="main-footer__logo-text logo__text" src="images/logo-text.svg" width="128" height="24" lang="en" alt="Cat Energy">
</a>
<ul class="main-footer__social social">
<li class="social__item">
Expand Down
2 changes: 1 addition & 1 deletion source/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ <h2 class="visually-hidden">Как до нас добраться</h2>
</section>
<div class="main-footer__wrap">
<a class="main-footer__logo logo" href="index.html" aria-current="page">
<img class="logo__text" src="images/logo-text.svg" width="128" height="24" lang="en" alt="Cat Energy">
<img class="main-footer__logo-text logo__text" src="images/logo-text.svg" width="128" height="24" lang="en" alt="Cat Energy">
</a>
<ul class="main-footer__social social">
<li class="social__item">
Expand Down
2 changes: 1 addition & 1 deletion source/styles/blocks/compare-slider.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
}

@media (min-width: $desktop-width) {
background-image: linear-gradient(180deg, #ffffff 135px, #eaeaea 135px 100%);
background-image: linear-gradient(180deg, #ffffff 135px, #f2f2f2 135px 100%);
}
}

Expand Down
6 changes: 5 additions & 1 deletion source/styles/blocks/example.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
@media (min-width: $desktop-width) {
grid-template-columns: 1fr 660px minmax(calc(1280px - 720px), 1fr) 1fr;
column-gap: 0;
background-image: linear-gradient(180deg, #ffffff 135px, #eaeaea 135px 100%);
background-image: linear-gradient(180deg, #ffffff 135px, #f2f2f2 135px 100%);
}
}

Expand Down Expand Up @@ -101,6 +101,10 @@
position: relative;
width: max-content;

@media (min-width: $tablet-width) {
margin-top: 80px;
}

@media (min-width: $desktop-width) {
margin: 0 0 10px;
}
Expand Down
2 changes: 1 addition & 1 deletion source/styles/blocks/infographic.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@
}

@media (min-width: $desktop-width) {
background-color: $bg-color-secondary-darken;
background-color: $bg-color-secondary;
}
}
10 changes: 10 additions & 0 deletions source/styles/blocks/logo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,13 @@
opacity: 0.6;
}
}

.logo__text {
@media (max-width: $mobile-width-only) {
transform: translate(50%);
}

@media (min-width: $desktop-width) {
width: 118px;
}
}
10 changes: 10 additions & 0 deletions source/styles/blocks/main-footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,23 @@
margin-bottom: 18px;
display: block;

@media (max-width: $mobile-width-only) {
transform: translateX(-64px);
}

@media (min-width: $tablet-width) {
margin-bottom: 0;
padding-top: 5px;
flex-shrink: 0;
}
}

.main-footer__logo-text {
@media (min-width: $desktop-width) {
width: 128px;
}
}

.main-footer__social {
@include list-reset;
margin-bottom: 18px;
Expand Down
10 changes: 0 additions & 10 deletions source/styles/blocks/main-header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,6 @@
}
}

.main-header__logo .logo__text {
@media (max-width: $mobile-width-only) {
transform: translate(50%);
}

@media (min-width: $desktop-width) {
width: 118px;
}
}

.main-header__nav {
@media (max-width: $mobile-width-only) {
width: 100%;
Expand Down
4 changes: 2 additions & 2 deletions source/styles/blocks/newsletter.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
}
}

.newsletter__form .form__input {
.newsletter__input {
margin-bottom: 16px;
width: 100%;
padding: 12px;
Expand All @@ -51,7 +51,7 @@
}
}

.newsletter__form .form__button {
.newsletter__button {
margin: 0;
padding: 15px;
width: 100%;
Expand Down