Merge pull request #12 from Ayronhayd/master

htmlacademy-adaptive · Jan 19, 2024 · 1e171d8 · 1e171d8
2 parents 8b0b542 + 3282947
commit 1e171d8
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 23 deletions.
diff --git a/source/index.html b/source/index.html
@@ -249,10 +249,11 @@ <h2 class="visually-hidden">Контакты.</h2>
 
   <footer class="footer">
     <div class="footer__container container">
-      <a class="footer__logo logo logo--footer" href="#">
-        <img class="logo__image" src="./images/logo-sign.svg" width="128" height="24" alt=" Логотип Cat Energy.">
-      </a>
 
+        <div class="footer__logo logo  logo--footer">
+          <img class="logo__image" src="./images/logo-sign.svg" width="128" height="24" alt=" Логотип Cat Energy.">
+        </div>
+      </a>
       <ul class="footer__social social">
         <li class="social__item">
           <a class="social__link" href="https://vk.com/htmlacademy">

diff --git a/source/styles/blocks/footer.scss b/source/styles/blocks/footer.scss
@@ -5,11 +5,11 @@
   width: 100%;
 
   @media (min-width: $tablet-width) {
-    padding: 50px 0 50px;
+    padding: 55px 0;
   }
 
   @media (min-width: $desktop-width) {
-    padding: 55px 0 50px;
+    padding: 68px 0;
   }
 }
 

diff --git a/source/styles/blocks/header.scss b/source/styles/blocks/header.scss
@@ -37,6 +37,22 @@
   width: 100%;
 }
 
+.header__logo {
+  text-decoration: none;
+  width: 33px;
+  height: 38px;
+
+  @media (min-width: $tablet-width) {
+    min-width: 174px;
+    height: 50px;
+  }
+
+  @media (min-width: $desktop-width) {
+    width: 202px;
+    height: 59px;
+  }
+}
+
 .header__toggler {
   width: 24px;
   height: 16px;
@@ -52,7 +68,7 @@
     opacity: 0.5;
   }
 
-  &:active {
+  &:active:not(:hover) {
     opacity: 0.3;
   }
 
@@ -83,15 +99,15 @@
   &.is-active {
     span {
       &:nth-child(1) {
-        transform: translate(-50%, 10px) rotate(-46deg);
+        transform: translate(-34%, 8px) rotate(-47deg);
       }
 
       &:nth-child(2) {
         display: none;
       }
 
       &:nth-child(3) {
-        transform: translate(-50%, -10px) rotate(46deg);
+        transform: translate(-31%, -8px) rotate(47deg);
       }
     }
   }

diff --git a/source/styles/blocks/logo.scss b/source/styles/blocks/logo.scss
@@ -1,18 +1,4 @@
 .logo {
-  text-decoration: none;
-  width: 33px;
-  height: 38px;
-
-  @media (min-width: $tablet-width) {
-    min-width: 174px;
-    height: 50px;
-  }
-
-  @media (min-width: $desktop-width) {
-    width: 202px;
-    height: 59px;
-  }
-
   &:link:hover {
     opacity: 0.8;
   }

diff --git a/source/styles/blocks/site-list.scss b/source/styles/blocks/site-list.scss
@@ -78,6 +78,7 @@
   text-decoration: none;
   color: $color-black;
   padding: 20px;
+  padding-bottom: 25px;
   border-bottom: 1px solid $color-gray-100;
 
   @media (min-width: $tablet-width) {

diff --git a/source/styles/global/global.scss b/source/styles/global/global.scss
@@ -12,7 +12,7 @@ img {
 
 html {
   min-width: 320px;
-  height: 100%;
+  min-height: 100%;
   font-family: $font-body;
   font-size: 14px;
   line-height: 18px;