Merge branch 'main' of github.com:brunoosella/devias-web

brunoosella · Jan 16, 2024 · be4ee66 · be4ee66
2 parents 8612285 + 9959bb0
commit be4ee66
Show file tree

Hide file tree

Showing 7 changed files with 121 additions and 30 deletions.
diff --git a/devias-web/src/Components/ItemStep/ItemStep.scss b/devias-web/src/Components/ItemStep/ItemStep.scss
@@ -54,10 +54,12 @@
 
   /* Content step */
   .container-step-description {
-    height: 0;
+    max-height: 0;
     border-top: 0;
     overflow: hidden;
-    transition: all .35s ease-in-out;
+    transition: 
+      max-height .35s ease-out,
+      border-top .35s ease;
 
     .step-description {
       color: #333;
@@ -66,19 +68,8 @@
     }
 
     &.show {
-      height: 150px;
-      display: flex;
+      max-height: 300px;
       border-top: 0.5px solid #9d9d9d40;
-
-      @media (max-width: 767px){
-        height: 130px;
-      }
-      @media (max-width: 575px){
-        height: 145px;
-      }
-      @media (max-width: 459px){
-        height: 190px;
-      }
     }
   }
 
@@ -96,6 +87,16 @@
   &.step-3 {
     border-right: 0;
     border-left: 0;
+  }
+
+  &.step-4 {
+    border-right: 0;
+    border-left: 0;
+  }
+
+  &.step-5 {
+    border-right: 0;
+    border-left: 0;
     border-bottom: 0;
   }
 }

diff --git a/devias-web/src/Components/TeamCard/TeamCard.scss b/devias-web/src/Components/TeamCard/TeamCard.scss
@@ -48,7 +48,7 @@
       @media (max-width: 767px) {
         margin-top: 1rem;
       }
-      }
+    }
 
     h5 {
       color: #333;
@@ -57,20 +57,7 @@
       font-weight: 300;
       margin: 0px;
       line-height: 1.2;
-    }
-
-    .line {
-      border: 1px solid rgba(0, 0, 0, 0.1882352941);
-      margin: 1rem 0 0 0;
-      width: 85%;
-      padding: 0;
-    }
-
-    p {
-      color: #828282;
-      font-size: 0.9rem;
-      margin-top: 1rem;
-      margin-bottom: 0;
+      text-align: center;
     }
   }
 

diff --git a/devias-web/src/Components/TeamCard/teamCard.json b/devias-web/src/Components/TeamCard/teamCard.json
@@ -33,7 +33,7 @@
       "img": 7,
       "job": "Talent Manager"
     },{
-      "name": "Fer Sydor",
+      "name": "Fer",
       "img": 8,
       "job": "Designer"
     },{

diff --git a/devias-web/src/Screens/AboutUs/AboutUs.scss b/devias-web/src/Screens/AboutUs/AboutUs.scss
@@ -9,6 +9,7 @@
           font-family: 'Ubuntu', sans-serif;
           font-weight: 300;
           color: #828282;
+          animation: slideRight 0.5s ease-in-out;
         }
         h1{
           font-size: 6rem;
@@ -18,6 +19,7 @@
           margin-bottom: 0.5rem;
           font-weight: 500;
           line-height: 1.2;
+          animation: slideRight 1s ease-in-out;
 
           @media (max-width: 991px) {
             font-size: 3rem;
@@ -33,6 +35,8 @@
     }
   }
   .section-info{
+    animation: slideDown 1.5s ease-in-out;
+
     .container{
       .container-card{
         width: 100%;
@@ -87,4 +91,26 @@
       }
     }
   }
+}
+
+@keyframes slideRight {
+  0% {
+    transform: translateX(100%);
+    opacity: 0;
+  }
+  100%{
+    transform: translateX(0);
+    opacity: 1;
+  }
+}
+
+@keyframes slideDown {
+  0% {
+    transform: translateY(100%);
+    opacity: 0;
+  }
+  100% {
+    transform: translateY(0);
+    opacity: 1;
+  }
 }
diff --git a/devias-web/src/Screens/ContactUs/ContactUs.scss b/devias-web/src/Screens/ContactUs/ContactUs.scss
@@ -13,6 +13,7 @@
         font-size: 6rem;
         font-weight: 500;
         margin: 0;
+        animation: slideRight 1s ease-in-out;
 
         @media (max-width: 991px) {
           font-size: 3rem;
@@ -28,6 +29,7 @@
           font-family: 'Ubuntu', sans-serif;
           font-weight: 300;
           color: #828282;
+          animation: slideRight 0.5s ease-in-out;
       }
 
       @media (max-width: 991px) {
@@ -46,9 +48,32 @@
     align-items: center;
     gap: 10px;
     flex-wrap: wrap;
+    animation: slideDown 1.5s ease-in-out;
 
     @media all and (max-width: 768px) {
       flex-direction: column;
     }
   }
 }
+
+@keyframes slideRight {
+  0% {
+    transform: translateX(100%);
+    opacity: 0;
+  }
+  100%{
+    transform: translateX(0);
+    opacity: 1;
+  }
+}
+
+@keyframes slideDown {
+  0% {
+    transform: translateY(100%);
+    opacity: 0;
+  }
+  100% {
+    transform: translateY(0);
+    opacity: 1;
+  }
+}
diff --git a/devias-web/src/Screens/OurCustomers/OurCustomers.scss b/devias-web/src/Screens/OurCustomers/OurCustomers.scss
@@ -5,12 +5,14 @@
     .container {
       .main-title {
         margin: 100px 0 64px 0;
+
 
         h5 {
           font-size: 1.5rem;
           font-family: 'Ubuntu', sans-serif;
           font-weight: 300;
           color: #828282;
+          animation: slideRight 0.5s ease-in-out;
         }
 
         h1 {
@@ -21,6 +23,7 @@
           margin-bottom: 0.5rem;
           font-weight: 500;
           line-height: 1.2;
+          animation: slideRight 1s ease-in-out;
 
           @media (max-width: 991px) {
             font-size: 3rem;
@@ -35,6 +38,8 @@
   }
 
   .info {
+    animation: slideDown 1.5s ease-in-out;
+
     .container {
       .container-card {
         width: 100%;
@@ -112,4 +117,26 @@
       }
     }
   }
+}
+
+@keyframes slideRight {
+  0% {
+    transform: translateX(100%);
+    opacity: 0;
+  }
+  100%{
+    transform: translateX(0);
+    opacity: 1;
+  }
+}
+
+@keyframes slideDown {
+  0% {
+    transform: translateY(100%);
+    opacity: 0;
+  }
+  100% {
+    transform: translateY(0);
+    opacity: 1;
+  }
 }
diff --git a/devias-web/src/Screens/OurWay/OurWay.scss b/devias-web/src/Screens/OurWay/OurWay.scss
@@ -13,6 +13,7 @@
           font-size: 6rem;
           font-weight: 500;
           margin: 0;
+          animation: slideRight 1s ease-in-out;
 
           @media (max-width: 991px) {
             font-size: 3rem;
@@ -28,6 +29,7 @@
           font-family: 'Ubuntu', sans-serif;
           font-weight: 300;
           color: #828282;
+          animation: slideRight 0.5s ease-in-out;
         }
 
         @media (max-width: 991px){
@@ -52,6 +54,7 @@
 
   .process-steps {
     margin: 95px 0px 115px 0px;
+    animation: slideDown 1.5s ease-in-out;
   }
 
   .services-cards {
@@ -199,4 +202,26 @@
       }
     }
   }
+}
+
+@keyframes slideRight {
+  0% {
+    transform: translateX(100%);
+    opacity: 0;
+  }
+  100%{
+    transform: translateX(0);
+    opacity: 1;
+  }
+}
+
+@keyframes slideDown {
+  0% {
+    transform: translateY(100%);
+    opacity: 0;
+  }
+  100% {
+    transform: translateY(0);
+    opacity: 1;
+  }
 }