Merge pull request #3 from OlegSulitskii/master

htmlacademy-adaptive · Dec 9, 2024 · 1b3d503 · 1b3d503
2 parents 5dabc86 + b4cf3ba
commit 1b3d503
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/source/catalog.html b/source/catalog.html
@@ -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>
@@ -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>

diff --git a/source/index.html b/source/index.html
@@ -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>
@@ -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>
@@ -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>

diff --git a/source/styles/blocks/header.scss b/source/styles/blocks/header.scss
@@ -44,4 +44,11 @@
   .header__logo-image {
     margin-right: 14px;
   }
+
+  .header__logo-text {
+    .logo-text__picture {
+      width: 118px;
+      height: 21px;
+    }
+  }
 }
diff --git a/source/styles/blocks/intro.scss b/source/styles/blocks/intro.scss
@@ -61,7 +61,7 @@
     text-align: start;
   }
 
-  .intro_picture {
+  .intro__picture {
     z-index: -1;
     position: absolute;
     bottom: 0;
@@ -110,7 +110,7 @@
     margin-bottom: 52px;
   }
 
-  .intro_picture {
+  .intro__picture {
     height: 499px;
     z-index: 1;
     top: 0;

diff --git a/source/styles/blocks/logo-image.scss b/source/styles/blocks/logo-image.scss
@@ -2,7 +2,7 @@
   text-decoration: none;
 }
 
-.logo-image_picture {
+.logo-image__picture {
   display: block;
 
   &:hover,

diff --git a/source/styles/blocks/logo-text.scss b/source/styles/blocks/logo-text.scss
@@ -9,13 +9,6 @@
   }
 }
 
-.logo-text_picture {
+.logo-text__picture {
   display: block;
 }
-
-@media (min-width: $desktop-width) {
-  .logo-text_picture {
-    width: 118px;
-    height: 21px;
-  }
-}