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

Вносит правки для защиты #2 (#18) #3

Merged
merged 1 commit into from
Dec 9, 2024
Merged

Вносит правки для защиты #2 (#18) #3

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
6 changes: 3 additions & 3 deletions source/catalog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
<picture>
<source type="image/svg+xml" media="(min-width: 1440px)" srcset="images/logo-cat-energy-img-desktop.svg" width="70" height="59">
<source type="image/svg+xml" media="(min-width: 768px)" srcset="images/logo-cat-energy-img-tablet.svg" width="60" height="50">
<img class="logo-image_picture" src="images/logo-cat-energy-img-mobile.svg" alt="Логотип Cat Energy" width="33" height="38">
<img class="logo-image__picture" src="images/logo-cat-energy-img-mobile.svg" alt="Логотип Cat Energy" width="33" height="38">
</picture>
</a>
<a class="header__logo-text logo-text" tabindex="-1" href="index.html">
<img class="logo-text_picture" src="images/logo-cat-energy-text.svg" alt="Текстовый вариант логотипа Cat Energy" width="101" height="18">
<img class="logo-text__picture" src="images/logo-cat-energy-text.svg" alt="Текстовый вариант логотипа Cat Energy" width="101" height="18">
</a>
<button class="header__toggle button-toggle button-toggle--nojs" type="button">
<span class="visually-hidden">Открыть меню</span>
Expand Down Expand Up @@ -328,7 +328,7 @@ <h2 class="address__title">Приглашаем к&nbsp;сотрудничест
<footer class="footer">
<div class="footer__wrapper wrapper">
<a class="footer__logo-text logo-text" href="index.html">
<img class="logo-text_picture" src="images/logo-cat-energy-text.svg" alt="Текстовый вариант логотипа Cat Energy" width="101" height="18">
<img class="logo-text__picture" src="images/logo-cat-energy-text.svg" alt="Текстовый вариант логотипа Cat Energy" width="128" height="24">
</a>
<section class="footer__social social">
<h2 class="visually-hidden">Давайте дружить!</h2>
Expand Down
8 changes: 4 additions & 4 deletions source/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
<picture>
<source type="image/svg+xml" media="(min-width: 1440px)" srcset="images/logo-cat-energy-img-desktop.svg" width="70" height="59">
<source type="image/svg+xml" media="(min-width: 768px)" srcset="images/logo-cat-energy-img-tablet.svg" width="60" height="50">
<img class="logo-image_picture" src="images/logo-cat-energy-img-mobile.svg" alt="Логотип Cat Energy" width="33" height="38">
<img class="logo-image__picture" src="images/logo-cat-energy-img-mobile.svg" alt="Логотип Cat Energy" width="33" height="38">
</picture>
</a>
<a class="header__logo-text logo-text" tabindex="-1" href="index.html">
<img class="logo-text_picture" src="images/logo-cat-energy-text.svg" alt="Текстовый вариант логотипа Cat Energy" width="101" height="18">
<img class="logo-text__picture" src="images/logo-cat-energy-text.svg" alt="Текстовый вариант логотипа Cat Energy" width="101" height="18">
</a>
<button class="header__toggle button-toggle button-toggle--nojs" type="button">
<span class="visually-hidden">Открыть меню</span>
Expand Down Expand Up @@ -55,7 +55,7 @@ <h1 class="intro__title">Функциональное питание для ко
<source type="image/webp" srcset="images/[email protected] 1x, images/[email protected] 2x" width="280" height="270">
<source type="image/png" media="(min-width: 1440px)" srcset="images/[email protected] 1x, images/[email protected] 2x" width="552" height="449">
<source type="image/png" media="(min-width: 768px)" srcset="images/[email protected] 1x, images/[email protected] 2x" width="709" height="609">
<img class="intro_picture" src="images/[email protected]" srcset="images/[email protected] 2x" alt="Баночка корма Car Energy" width="280" height="270">
<img class="intro__picture" src="images/[email protected]" srcset="images/[email protected] 2x" alt="Баночка корма Car Energy" width="280" height="270">
</picture>
<a class="intro__button button button--primary" href="#">Подобрать программу</a>
</div>
Expand Down Expand Up @@ -155,7 +155,7 @@ <h2 class="address__title">Приглашаем к&nbsp;сотрудничест
<footer class="footer" data-test="footer">
<div class="footer__wrapper wrapper">
<a class="footer__logo-text logo-text" href="index.html">
<img class="logo-text_picture" src="images/logo-cat-energy-text.svg" alt="Текстовый вариант логотипа Cat Energy" width="101" height="18">
<img class="logo-text__picture" src="images/logo-cat-energy-text.svg" alt="Текстовый вариант логотипа Cat Energy" width="128" height="24">
</a>
<section class="footer__social social">
<h2 class="visually-hidden">Давайте дружить!</h2>
Expand Down
7 changes: 7 additions & 0 deletions source/styles/blocks/header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,11 @@
.header__logo-image {
margin-right: 14px;
}

.header__logo-text {
.logo-text__picture {
width: 118px;
height: 21px;
}
}
}
4 changes: 2 additions & 2 deletions source/styles/blocks/intro.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
text-align: start;
}

.intro_picture {
.intro__picture {
z-index: -1;
position: absolute;
bottom: 0;
Expand Down Expand Up @@ -110,7 +110,7 @@
margin-bottom: 52px;
}

.intro_picture {
.intro__picture {
height: 499px;
z-index: 1;
top: 0;
Expand Down
2 changes: 1 addition & 1 deletion source/styles/blocks/logo-image.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
text-decoration: none;
}

.logo-image_picture {
.logo-image__picture {
display: block;

&:hover,
Expand Down
9 changes: 1 addition & 8 deletions source/styles/blocks/logo-text.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@
}
}

.logo-text_picture {
.logo-text__picture {
display: block;
}

@media (min-width: $desktop-width) {
.logo-text_picture {
width: 118px;
height: 21px;
}
}
Loading