Merge pull request #3 from milenaLtz/master

htmlacademy-adaptive · Dec 18, 2024 · a6c0eca · a6c0eca
2 parents 3b7c7b4 + ef60ebc
commit a6c0eca
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 13 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 */