From ef60ebcf132e4c21d3b40db8b2c4dade57de30a8 Mon Sep 17 00:00:00 2001
From: milenaLtz <milena.letz@gmail.com>
Date: Wed, 18 Dec 2024 16:33:18 +0200
Subject: [PATCH] =?UTF-8?q?=D0=B2=D0=BD=D0=B5=D1=81=D0=BB=D0=B0=20=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/catalog.html                   |  4 +++-
 source/icons/footer-logo.svg          |  2 +-
 source/index.html                     |  6 ++++--
 source/styles/blocks/main-footer.scss | 14 +++++++++-----
 source/styles/blocks/newsletter.scss  |  2 +-
 source/styles/blocks/set.scss         |  3 +--
 source/styles/styles.scss             |  1 -
 7 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/source/catalog.html b/source/catalog.html
index 0b36e84..49dc650 100644
--- a/source/catalog.html
+++ b/source/catalog.html
@@ -399,7 +399,9 @@ <h2 class="visually-hidden">Адрес и место нахождение на 
   <footer class="main-footer">
     <div class="main-footer__wrapper">
       <a class="main-footer__logo-text logo-text" href="index.html">
-        <img src="./images/footer-logo.svg" alt="логоти сайта кэт энэрджи" width="128" height="24">
+        <svg class="main-footer__logo" role="img" width="128" height="24" viewBox="0 0 128 24" xmlns="http://www.w3.org/2000/svg">
+          <use href="../../icons/stack.svg#footer-logo"/>
+        </svg>
       </a>
       <div class="main-footer__social social">
         <ul class="social__list">
diff --git a/source/icons/footer-logo.svg b/source/icons/footer-logo.svg
index be5dd76..62af770 100644
--- a/source/icons/footer-logo.svg
+++ b/source/icons/footer-logo.svg
@@ -1 +1 @@
-<svg viewBox="0 0 128 24" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#a)" fill="#111"><path d="M1.62 21.96a9.43 9.43 0 0 1-1.6-5.72v-8.48a9.56 9.56 0 0 1 1.5-5.82c1.1-1.33 2.8-1.94 5.31-1.94 2.5 0 4.1.61 5.1 1.74a7.43 7.43 0 0 1 1.51 5v2.04h-4.9v-2.35a5.4 5.4 0 0 0-.3-2.04 1.42 1.42 0 0 0-1.4-.82c-.71 0-1.21.2-1.41.72a6.72 6.72 0 0 0-.3 2.25v10.92a4.3 4.3 0 0 0 .4 2.15c.2.5.7.71 1.4.71s1.1-.2 1.3-.71c.23-.7.33-1.42.3-2.15v-2.45h4.91v2.05a7.92 7.92 0 0 1-1.5 5.1c-1 1.23-2.7 1.84-5.1 1.84-2.41-.1-4.22-.71-5.22-2.04Zm17.73-21.66h5.7l4.21 23.3h-4.6l-.8-4.91h-3.31l-.8 4.9h-4.7l4.3-23.28Zm4.1 15.33-1.2-9.1-1.2 9.1h2.4Zm9.32-11.44h-3.4v-3.88h11.9v3.78h-3.4v19.5h-5.1v-19.4Zm17.63-3.89h8.8v2.46h-5.7v7.66h4.6v2.35h-4.6v8.57h5.7v2.35h-8.9v-23.38h.1Zm11.4 0h2.21l6.51 15.43v-15.42h2.6v23.28h-2l-6.6-15.93v15.93h-2.71v-23.28Zm14.33 0h8.81v2.46h-5.7v7.66h4.6v2.35h-4.6v8.57h5.7v2.35h-8.81v-23.38Zm11.41 0h4.61a7.9 7.9 0 0 1 5.1 1.44c1.1.92 1.6 2.55 1.6 4.7 0 2.96-.9 4.8-2.8 5.4l3.21 11.65h-3.1l-3-10.93h-2.51v10.93h-3.2v-23.18h.1Zm4.41 10.01c1.03.1 2.06-.2 2.9-.81.6-.51.9-1.53.9-3.07a6.72 6.72 0 0 0-.3-2.24 2.58 2.58 0 0 0-1.1-1.23 4.49 4.49 0 0 0-2.2-.4h-1.4v7.65h1.2v.1Zm10.91 11.55a10.49 10.49 0 0 1-1.4-5.93v-7.76a17 17 0 0 1 .5-4.4c.34-1.06 1-2 1.9-2.65 1.12-.67 2.41-1 3.71-.92 2.1 0 3.6.51 4.5 1.64a7.93 7.93 0 0 1 1.41 5.1v.82h-3v-.71c0-.86-.07-1.71-.2-2.56a2.05 2.05 0 0 0-.8-1.32 3.05 3.05 0 0 0-1.9-.51 2.96 2.96 0 0 0-2.01.6 2.3 2.3 0 0 0-.8 1.64c-.13.92-.2 1.84-.2 2.76v8.68a9.43 9.43 0 0 0 .6 3.88c.4.82 1.2 1.12 2.4 1.12a2.38 2.38 0 0 0 2.4-1.22c.53-1.3.77-2.69.7-4.09v-1.63h-2.9v-2.35h5.81v11.54h-2l-.3-2.65a4.17 4.17 0 0 1-1.56 2.2c-.74.53-1.64.8-2.55.76a4.92 4.92 0 0 1-4.3-2.04Zm17.13-6.44-4.9-15.01h3l3.5 11.23 3.4-11.23h3.01l-4.9 15.01v8.17h-3.01v-8.17h-.1Z"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h128v24h-128z"/></clipPath></defs></svg>
\ No newline at end of file
+<svg viewBox="0 0 128 24" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#a)"><path d="M1.62 21.96a9.43 9.43 0 0 1-1.6-5.72v-8.48a9.56 9.56 0 0 1 1.5-5.82c1.1-1.33 2.8-1.94 5.31-1.94 2.5 0 4.1.61 5.1 1.74a7.43 7.43 0 0 1 1.51 5v2.04h-4.9v-2.35a5.4 5.4 0 0 0-.3-2.04 1.42 1.42 0 0 0-1.4-.82c-.71 0-1.21.2-1.41.72a6.72 6.72 0 0 0-.3 2.25v10.92a4.3 4.3 0 0 0 .4 2.15c.2.5.7.71 1.4.71s1.1-.2 1.3-.71c.23-.7.33-1.42.3-2.15v-2.45h4.91v2.05a7.92 7.92 0 0 1-1.5 5.1c-1 1.23-2.7 1.84-5.1 1.84-2.41-.1-4.22-.71-5.22-2.04Zm17.73-21.66h5.7l4.21 23.3h-4.6l-.8-4.91h-3.31l-.8 4.9h-4.7l4.3-23.28Zm4.1 15.33-1.2-9.1-1.2 9.1h2.4Zm9.32-11.44h-3.4v-3.88h11.9v3.78h-3.4v19.5h-5.1v-19.4Zm17.63-3.89h8.8v2.46h-5.7v7.66h4.6v2.35h-4.6v8.57h5.7v2.35h-8.9v-23.38h.1Zm11.4 0h2.21l6.51 15.43v-15.42h2.6v23.28h-2l-6.6-15.93v15.93h-2.71v-23.28Zm14.33 0h8.81v2.46h-5.7v7.66h4.6v2.35h-4.6v8.57h5.7v2.35h-8.81v-23.38Zm11.41 0h4.61a7.9 7.9 0 0 1 5.1 1.44c1.1.92 1.6 2.55 1.6 4.7 0 2.96-.9 4.8-2.8 5.4l3.21 11.65h-3.1l-3-10.93h-2.51v10.93h-3.2v-23.18h.1Zm4.41 10.01c1.03.1 2.06-.2 2.9-.81.6-.51.9-1.53.9-3.07a6.72 6.72 0 0 0-.3-2.24 2.58 2.58 0 0 0-1.1-1.23 4.49 4.49 0 0 0-2.2-.4h-1.4v7.65h1.2v.1Zm10.91 11.55a10.49 10.49 0 0 1-1.4-5.93v-7.76a17 17 0 0 1 .5-4.4c.34-1.06 1-2 1.9-2.65 1.12-.67 2.41-1 3.71-.92 2.1 0 3.6.51 4.5 1.64a7.93 7.93 0 0 1 1.41 5.1v.82h-3v-.71c0-.86-.07-1.71-.2-2.56a2.05 2.05 0 0 0-.8-1.32 3.05 3.05 0 0 0-1.9-.51 2.96 2.96 0 0 0-2.01.6 2.3 2.3 0 0 0-.8 1.64c-.13.92-.2 1.84-.2 2.76v8.68a9.43 9.43 0 0 0 .6 3.88c.4.82 1.2 1.12 2.4 1.12a2.38 2.38 0 0 0 2.4-1.22c.53-1.3.77-2.69.7-4.09v-1.63h-2.9v-2.35h5.81v11.54h-2l-.3-2.65a4.17 4.17 0 0 1-1.56 2.2c-.74.53-1.64.8-2.55.76a4.92 4.92 0 0 1-4.3-2.04Zm17.13-6.44-4.9-15.01h3l3.5 11.23 3.4-11.23h3.01l-4.9 15.01v8.17h-3.01v-8.17h-.1Z"/></g><defs><clipPath id="a"><path d="M0 0h128v24h-128z"/></clipPath></defs></svg>
diff --git a/source/index.html b/source/index.html
index 5e4b80f..a78cade 100644
--- a/source/index.html
+++ b/source/index.html
@@ -179,8 +179,10 @@ <h2 class="visually-hidden">Адрес и место нахождение на 
   </main>
   <footer class="main-footer">
     <div class="main-footer__wrapper">
-      <a class="main-footer__logo-text logo-text" href="#">
-        <img src="./images/footer-logo.svg" alt="логоти сайта кэт энэрджи" width="128" height="24">
+      <a class="main-footer__logo-text" href="#">
+        <svg class="main-footer__logo" role="img" width="128" height="24" viewBox="0 0 128 24" xmlns="http://www.w3.org/2000/svg">
+          <use href="../../icons/stack.svg#footer-logo"/>
+        </svg>
       </a>
       <div class="main-footer__social social">
         <ul class="social__list">
diff --git a/source/styles/blocks/main-footer.scss b/source/styles/blocks/main-footer.scss
index 250d55c..f94377d 100644
--- a/source/styles/blocks/main-footer.scss
+++ b/source/styles/blocks/main-footer.scss
@@ -40,11 +40,15 @@
   }
 }
 
-.main-footer__logo-text:hover,
-.main-footer__logo-text:focus {
-  opacity: 0.8;
+.main-footer__logo {
+  fill: #111111;
 }
 
-.main-footer__logo-text:active {
-  opacity: 0.6;
+.main-footer__logo-text:hover .main-footer__logo,
+.main-footer__logo-text:focus .main-footer__logo {
+  fill: #3e3e3e;
+}
+
+.main-footer__logo-text:active .main-footer__logo {
+  fill: #6b6b6b;
 }
diff --git a/source/styles/blocks/newsletter.scss b/source/styles/blocks/newsletter.scss
index 94ed362..7165275 100644
--- a/source/styles/blocks/newsletter.scss
+++ b/source/styles/blocks/newsletter.scss
@@ -179,7 +179,7 @@
 }
 
 .newsletter__submit-button {
-  padding: 15px 0;
+  padding: 15px;
   font-size: 20px;
   line-height: 26px;
   border: none;
diff --git a/source/styles/blocks/set.scss b/source/styles/blocks/set.scss
index ecbc312..0868e15 100644
--- a/source/styles/blocks/set.scss
+++ b/source/styles/blocks/set.scss
@@ -149,7 +149,7 @@
 }
 
 .set__link:active {
-  color: rgba(0, 0, 0, 0.7);
+  opacity: 0.3;
 }
 
 .set__link::before {
@@ -170,6 +170,5 @@
 }
 
 .set__link:active::before {
-  background-color: rgba(0, 0, 0, 0.7);
   mask-image: url("../../icons/stack.svg#arrow-hovered");
 }
diff --git a/source/styles/styles.scss b/source/styles/styles.scss
index b01fdcc..3f625e7 100644
--- a/source/styles/styles.scss
+++ b/source/styles/styles.scss
@@ -2,7 +2,6 @@
 @import "./common/variables.scss";
 @import "./common/mixins.scss";
 @import "./common/fonts.scss";
-@import "./common/global.scss";
 @import "./common/visually-hidden.scss";
 
 /* BLOCKS */