fix errors

mate-academy · Oct 22, 2024 · 4a286b9 · 4a286b9
1 parent e4c0aa6
commit 4a286b9
Show file tree

Hide file tree

Showing 19 changed files with 472 additions and 206 deletions.
diff --git a/src/images/logo/Logo-icon.ico b/src/images/logo/Logo-icon.ico
diff --git a/src/index.html b/src/index.html
diff --git a/src/styles/blocks/bottom-bar.scss b/src/styles/blocks/bottom-bar.scss
@@ -65,8 +65,6 @@
 
     &:hover::after {
       transform: scale(1);
-
     }
   }
-
 }
diff --git a/src/styles/blocks/contact-us.scss b/src/styles/blocks/contact-us.scss
@@ -23,7 +23,6 @@
     font-weight: 600;
     line-height: 48px;
     margin-bottom: 48px;
-
   }
 
   &__subtitle {
@@ -36,10 +35,10 @@
     letter-spacing: 3px;
     text-transform: uppercase;
     margin-bottom: 8px;
-
   }
 
-  &__number, &__address {
+  &__number,
+  &__address {
     display: block;
     color: $white-color;
     text-decoration: none;
@@ -49,6 +48,7 @@
     line-height: 36px;
     margin-bottom: 40px;
 
+    @include hover(transform, scale(1.2));
   }
 
   &__icons {
@@ -65,7 +65,6 @@
     &:hover {
       background-image: url(../images/icons/facebook-1.png);
     }
-
   }
 
   &__twitter {
@@ -77,7 +76,6 @@
     &:hover {
       background-image: url(../images/icons/twitter-1.png);
     }
-
   }
 
   &__instagram {
@@ -89,6 +87,5 @@
     &:hover {
       background-image: url(../images/icons/instagram-1.png);
     }
-
   }
 }
diff --git a/src/styles/blocks/footer-form.scss b/src/styles/blocks/footer-form.scss
@@ -28,7 +28,8 @@
     }
   }
 
-  &__email, &__name {
+  &__email,
+  &__name {
     background-color: $dark-color;
     border: none;
     border-bottom: solid 1px $grey-color;
@@ -42,10 +43,10 @@
     color: $grey-color;
     margin-bottom: 40px;
     transition: all 0.3s;
-
   }
 
-  &__email:focus, &__name:focus {
+  &__email:focus,
+  &__name:focus {
     border-bottom: solid 1px $bright-blue-color;
     color: $white-color;
   }
@@ -63,14 +64,13 @@
     line-height: 22.5px;
     color: $grey-color;
     margin-bottom: 56px;
-    transition: all 0.3s;
     resize: none;
     transition: all 0.3s;
   }
 
   &__message:focus {
-      border-bottom: solid 1px $bright-blue-color;
-      color: $white-color;
+    border-bottom: solid 1px $bright-blue-color;
+    color: $white-color;
   }
 
   &__button {
@@ -91,8 +91,6 @@
 
     @include on-tablet {
       width: 264px;
-      }
-
     }
-
+  }
 }
diff --git a/src/styles/blocks/header.scss b/src/styles/blocks/header.scss
@@ -4,5 +4,4 @@
   position: relative;
   border-end-start-radius: 30px;
   border-end-end-radius: 30px;
-
 }
diff --git a/src/styles/blocks/menu.scss b/src/styles/blocks/menu.scss
@@ -6,6 +6,7 @@
 
   padding-block: 20px 48px;
   padding-inline: 20px;
+  overflow: hidden;
 
   @include on-tablet {
     padding-block: 20px 56px;
@@ -74,7 +75,6 @@
 
     &:hover::after {
       transform: scale(1);
-
+    }
   }
 }
-}
diff --git a/src/styles/blocks/nav.scss b/src/styles/blocks/nav.scss
@@ -9,6 +9,7 @@
     @include on-tablet {
       display: none;
     }
+
     @include on-small-desktop {
       margin: 0;
       padding: 0;
@@ -40,7 +41,6 @@
 
         &:hover::after {
           transform: scale(1);
-
         }
       }
     }

diff --git a/src/styles/blocks/our-expertise.scss b/src/styles/blocks/our-expertise.scss
@@ -3,8 +3,9 @@
   border-radius: 30px;
   padding-block: 72px;
 
-
-
+  @include on-tablet {
+    padding-block: 128px;
+  }
 
   &__title {
     grid-column: 1 / -1;
@@ -17,35 +18,87 @@
     color: $dark-font-color;
     margin-bottom: 56px;
 
+    @include on-tablet {
+      margin-bottom: 64px;
+    }
   }
 
-  &__cards {
+  &__card--1 {
     grid-column: 1 / -1;
+    justify-content: center;
+    justify-items: center;
+    margin-bottom: 56px;
 
     @include on-tablet {
       grid-column: 2 / -2;
+      margin-bottom: 72px;
+
+      @include hover(transform, scale(1.2));
     }
 
     @include on-small-desktop {
-      display: flex;
-      justify-content: space-between;
-      gap: 137px;
+      grid-column: 1 / 4;
     }
+
   }
 
-  &__card {
+  &__card--2 {
+    grid-column: 1 / -1;
+    justify-content: center;
+    justify-items: center;
     margin-bottom: 56px;
 
-    &:last-child {
-      margin-bottom: 0;
+    @include on-tablet {
+      grid-column: 2 / -2;
+      margin-bottom: 72px;
+
+      @include hover(transform, scale(1.2));
+    }
+
+    @include on-small-desktop {
+      grid-column: 5 / 9;
     }
 
+  }
+
+  &__card--3 {
+    grid-column: 1 / -1;
+    justify-content: center;
     justify-items: center;
 
-    @include hover(transform, scale(1.2));
+    @include on-tablet {
+      grid-column: 2 / -2;
+
+      @include hover(transform, scale(1.2));
+    }
+
+    @include on-small-desktop {
+      grid-column: 10 / 13;
+
+    }
 
   }
 
+  // &__card {
+  //   display: flex;
+  //   flex-direction: column;
+  //   margin-bottom: 56px;
+
+  //   &:last-child {
+  //     margin-bottom: 0;
+  //   }
+
+  //   justify-content: center;
+  //   align-items: center;
+
+  //   @include on-tablet {
+  //     @include hover(transform, scale(1.2));
+  //   }
+  // }
+  &__image {
+    display: block;
+    margin: 0 auto;
+  }
 
   &__subtitle {
     margin: 0;
@@ -55,7 +108,7 @@
     font-size: 20px;
     font-weight: 600;
     line-height: 28px;
-
+    text-align: center;
   }
 
   &__info {
@@ -67,8 +120,5 @@
     line-height: 21px;
     text-align: center;
     color: $light-font-color;
-
   }
-
-
 }
diff --git a/src/styles/blocks/page.scss b/src/styles/blocks/page.scss
@@ -1,11 +1,13 @@
 .page {
   scroll-behavior: smooth;
 
-
+  &:has(.page__menu:target) {
+    overflow: hidden;
+  }
+
   &__body {
     margin: 0;
     min-width: 320px;
-
   }
 
   &__menu {

diff --git a/src/styles/blocks/sevices.scss b/src/styles/blocks/sevices.scss
@@ -5,7 +5,6 @@
     padding-block: 148px;
   }
 
-
   &__title {
     margin: 0;
     color: $grey-color;
@@ -99,7 +98,6 @@
       display: flex;
     }
 
-
     &-text {
       display: flex;
       align-items: center;
@@ -111,8 +109,7 @@
       line-height: 22.5px;
       text-decoration: none;
 
-      @include hover(transform, scale(1.2))
-
+      @include hover(transform, scale(1.2));
     }
 
     &--01 {
@@ -164,6 +161,5 @@
         grid-column: 10 / 13;
       }
     }
-
   }
 }
diff --git a/src/styles/blocks/slider.scss b/src/styles/blocks/slider.scss
@@ -2,9 +2,9 @@
   width: 100%;
   height: 320px;
 
-    @include on-small-desktop {
-      height: 680px;
-    }
+  @include on-small-desktop {
+    height: 680px;
+  }
 
   display: flex;
   flex-direction: column;
@@ -19,7 +19,6 @@
     background-position: center;
     border-radius: 30px;
     height: inherit;
-    // overflow: hidden;
 
     @include on-small-desktop {
       left: 50%;
@@ -43,29 +42,24 @@
     &:target {
       opacity: 1;
     }
-    // @include on-small-desktop {
-    //   left: 50%;
-    // }
   }
+
   &__content {
     display: block;
     position: absolute;
     margin-bottom: 24px;
-    // padding-left: 20px;
 
     @include on-small-desktop {
       display: flex;
       align-items: center;
       gap: 24px;
       left: 50%;
       margin: 0 0 48px 78px;
-      // padding-left: 0;
     }
 
     @include on-desktop {
       margin: 0 0 48px 48px;
     }
-
   }
   &__buttons {
     display: flex;
@@ -117,4 +111,3 @@
     color: $white-color;
   }
 }
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,8 +65,6 @@ @@
         &:hover::after {
           transform: scale(1);
         }
       }
     }