Исправление ошибок по критериям

htmlacademy-adaptive · Feb 21, 2025 · fe95bdf · fe95bdf
1 parent 75c60cf
commit fe95bdf
Show file tree

Hide file tree

Showing 8 changed files with 150 additions and 92 deletions.
diff --git a/source/catalog.html b/source/catalog.html
diff --git a/source/images/icon-html-academy.svg b/source/images/icon-html-academy.svg
diff --git a/source/styles/blocks/process.scss b/source/styles/blocks/process.scss
@@ -106,7 +106,7 @@
       position: absolute;
       top: 0;
       right: 0;
-      font-family: "Oswald", sans-serif;
+      font-family: "Oswald", "Arial", sans-serif;
       font-size: 280px;
       line-height: 1;
       color: $basic-grey;

diff --git a/source/styles/blocks/product.scss b/source/styles/blocks/product.scss
@@ -3,7 +3,7 @@
   display: grid;
   grid-template-columns: 1fr 1fr;
   align-items: center;
-  row-gap: 20px;
+  row-gap: 19px;
   border-bottom: 1px solid #ebebeb;
 
   @media (min-width: $width-tablet) {
@@ -16,43 +16,72 @@
   }
 }
 
-.product__pic {
-  display: block;
+.product__link-pic {
   margin: auto;
+  display: block;
+  transition: 0.3s;
+
+  &:hover {
+    transform: scale(1.05);
+  }
+
+  &:focus:not(:active) {
+    outline: none;
+    transform: scale(1.05);
+  }
+
+  &:active {
+    transform: scale(1.05);
+    opacity: 0.6;
+  }
+}
+
+.product__link-text {
+  width: 90px;
+  display: block;
+  text-decoration: none;
+  margin-bottom: 14px;
+  transition: 0.3s;
+
+  &:hover {
+    opacity: 0.6;
+    transform: scale(1.05);
+  }
+
+  &:focus:not(:active) {
+    outline: none;
+    opacity: 0.6;
+    transform: scale(1.05);
+  }
+
+  &:active {
+    transform: scale(1.05);
+    opacity: 0.3;
+  }
+
+  @media (min-width: $width-tablet) {
+    margin: 28px auto 13px;
+    width: 130px;
+  }
+
+  @media (min-width: $width-desktop) {
+    margin: 19px auto 17px;
+  }
 }
 
 .product__title {
   margin: 0;
-  margin-bottom: 14px;
-  width: 90px;
   font-size: 16px;
   line-height: 20px;
   font-weight: 400;
   text-transform: uppercase;
   color: #222222;
 
-  & br:nth-child(2) {
-    display: none;
-  }
-
   @media (min-width: $width-tablet) {
-    margin: 28px auto 13px;
-    width: 130px;
+    margin: auto;
     font-size: 20px;
     line-height: 24px;
     text-align: center;
-
-    & br:nth-child(1) {
-      display: none;
-    }
-
-    & br:nth-child(2) {
-      display: block;
-    }
-  }
-
-  @media (min-width: $width-desktop) {
-    margin: 19px auto 17px;
   }
 }
 

diff --git a/source/styles/blocks/show-more.scss b/source/styles/blocks/show-more.scss
@@ -1,6 +1,6 @@
 .show-more {
   position: relative;
-  padding: 79px 20px 24px;
+  padding: 80px 20px 24px;
   text-align: center;
 
   &::before,

diff --git a/source/styles/blocks/stocks-form.scss b/source/styles/blocks/stocks-form.scss
@@ -13,7 +13,7 @@
 .stocks-form__input {
   padding: 13px 13px 11px;
   width: 100%;
-  font-family: "Oswald", sans-serif;
+  font-family: "Oswald", "Arial", sans-serif;
   font-size: 20px;
   line-height: 30px;
   text-transform: uppercase;
@@ -46,7 +46,7 @@
 .stocks-form__button {
   padding: 15px;
   width: 100%;
-  font-family: "Oswald", sans-serif;
+  font-family: "Oswald", "Arial", sans-serif;
   font-size: 20px;
   line-height: 26px;
   border: none;

diff --git a/source/styles/common/global.scss b/source/styles/common/global.scss
@@ -7,7 +7,7 @@
 
 body {
   margin: 0;
-  font-family: "Oswald", sans-serif;
+  font-family: "Oswald", "Arial", sans-serif;
   font-size: 14px;
   line-height: 18px;
   color: $text-color;

diff --git a/source/styles/common/variables.scss b/source/styles/common/variables.scss
@@ -1,5 +1,5 @@
 /* здесь используйте глобальные переменные */
-$secondary-text: "Lato", sans-serif;
+$secondary-text: "Lato", "Arial", sans-serif;
 
 $width-only-mobile: 767px;
 $width-tablet: 768px;