Merge branch 'main' of github.com:00-team/heydari

00-team · Aug 27, 2024 · 9bf5f07 · 9bf5f07
2 parents 84e4f1a + e2c118b
commit 9bf5f07
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 32 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "heydari"
-version = "0.1.36"
+version = "0.1.38"
 edition = "2021"
 
 [dependencies]

diff --git a/templates/home/index.html b/templates/home/index.html
@@ -29,6 +29,16 @@
 <link rel="canonical" href="https://heydari-mi.com/">
 <link rel="alternate" hreflang="fa" href="https://heydari-mi.com/">
 
+<style>
+    :root {
+        --SCENE_DUR: 3.25s;
+        --WRAPPERR_DUR: 5s;
+
+        --BOTTOM_DUR: 1s;
+        --BOTTOM_DELLAY: 1s;
+    }
+</style>
+
 {% endblock header %}
 
 {% block content %}

diff --git a/templates/layout/footer.html b/templates/layout/footer.html
@@ -58,7 +58,7 @@
                         شماره فکس
                         <!-- -->
                     </div>
-                    <div class="data">02155009865</div>
+                    <div class="data">02155004626</div>
                 </div>
             </div>
         </div>

diff --git a/templates/product/index.html b/templates/product/index.html
@@ -56,7 +56,7 @@ <h2 class="product-title title">
             <p class="product-desc title_smaller">
                 {{ product.detail }}
             </p>
-            <button class="contact-us title_small">
+            <a href="/contact" target="_blank" class="contact-us title_small">
                 <span class="dot dot-1"></span>
                 <span class="dot dot-2"></span>
                 <span class="dot dot-3"></span>
@@ -67,7 +67,7 @@ <h2 class="product-title title">
                 <div class="text">
                     تماس با ما
                 </div>
-            </button>
+            </a>
         </aside>
         <aside class="product-img">
             <div class="main-wrapper">

diff --git a/web/style/blog/blog.scss b/web/style/blog/blog.scss
@@ -17,6 +17,14 @@
         .simurgh--blog-preview {
             width: clamp(0px, 100%, 1000px);
         }
+
+        .simurgh--blog-thumbnail {
+            max-width: unset;
+            max-height: unset;
+
+            width: clamp(0px, 100%, 1200px);
+            height: 400px;
+        }
     }
 
     .related-blogs {

diff --git a/web/style/home/about.scss b/web/style/home/about.scss
@@ -146,13 +146,6 @@ section.about-container {
                     position: absolute;
                 }
 
-                img {
-                    width: 100%;
-                    object-fit: cover;
-
-                    border-radius: 10px;
-                }
-
                 &.next {
                     animation: next-slider 1.5s
                         cubic-bezier(0.45, 0.02, 0.09, 0.98) forwards;
@@ -230,6 +223,13 @@ section.about-container {
                         }
                     }
                 }
+
+                img {
+                    width: 100%;
+                    object-fit: cover;
+
+                    border-radius: 10px;
+                }
             }
         }
     }

diff --git a/web/style/home/hero.scss b/web/style/home/hero.scss
@@ -45,7 +45,8 @@ section.hero-container {
             opacity: 0;
             translate: 50%;
 
-            animation: hero-img-slidein 1s 5s ease-in-out forwards;
+            animation: hero-img-slidein 1s calc(var(--SCENE_DUR) + 0.3s)
+                ease-in-out forwards;
 
             @media screen and (max-width: 1440px) {
                 width: clamp(0px, 350px, 100%);

diff --git a/web/style/home/welcome.scss b/web/style/home/welcome.scss
@@ -12,8 +12,7 @@
 
     will-change: transform;
 
-    animation: welcomer-slideOut 0.7s 5.25s cubic-bezier(0.45, 0.02, 0.09, 0.98)
-        forwards;
+    animation: welcomer-slideOut 0.7s var(--SCENE_DUR) ease-in-out forwards;
 
     z-index: 10;
 
@@ -43,7 +42,7 @@
 
             transform: translateY(100%);
 
-            animation: fadein 7s ease-in-out forwards;
+            animation: fadein var(--WRAPPERR_DUR) ease-in-out forwards;
 
             fill: var(--sixty-percent);
 
@@ -84,7 +83,7 @@
 
                     transform: translateY(100%);
 
-                    animation: fadein 7s ease-in-out forwards;
+                    animation: fadein var(--WRAPPERR_DUR) ease-in-out forwards;
 
                     @keyframes fadein {
                         0% {
@@ -96,20 +95,20 @@
                             opacity: 1;
                             transform: translateY(0);
                         }
-                        50% {
+                        100% {
                             opacity: 1;
                             transform: translateY(0);
                         }
 
-                        70% {
-                            transform: translateY(-100%);
-                            opacity: 0;
-                        }
+                        // 70% {
+                        //     transform: translateY(-100%);
+                        //     opacity: 0;
+                        // }
 
-                        100% {
-                            transform: translateY(-70%);
-                            opacity: 0;
-                        }
+                        // 100% {
+                        //     transform: translateY(-70%);
+                        //     opacity: 0;
+                        // }
                     }
                 }
 
@@ -136,7 +135,8 @@
 
             transform: translateY(100%);
 
-            animation: welcomer-companyname-fadein 1s 1.5s ease-in-out forwards;
+            animation: welcomer-companyname-fadein var(--BOTTOM_DUR)
+                var(--BOTTOM_DELLAY) ease-in-out forwards;
 
             @keyframes welcomer-companyname-fadein {
                 from {
@@ -154,7 +154,9 @@
                 height: 2px;
                 background-color: var(--accent-color);
 
-                animation: width-open 0.5s 2.5s ease-in-out forwards;
+                animation: width-open calc(var(--BOTTOM_DELLAY) / 2)
+                    calc(var(--BOTTOM_DELLAY) + var(--BOTTOM_DUR)) ease-in-out
+                    forwards;
 
                 @keyframes width-open {
                     from {

diff --git a/web/style/product/product.scss b/web/style/product/product.scss
@@ -54,7 +54,10 @@ main.product {
                 cursor: default;
             }
 
-            button {
+            a {
+                text-align: center;
+                color: #ffffff;
+
                 margin-top: 2em;
 
                 width: clamp(200px, 50%, 250px);
@@ -80,7 +83,8 @@ main.product {
                 }
                 &::after {
                     content: '';
-                    box-shadow: 0px 0px 23px 0px #fdfca9 inset,
+                    box-shadow:
+                        0px 0px 23px 0px #fdfca9 inset,
                         0px 0px 8px 0px #ffffff42;
                     transition: opacity 0.3s;
 
@@ -133,7 +137,8 @@ main.product {
 
                     &::after {
                         content: '';
-                        animation: hoverFirefly var(--speed) infinite,
+                        animation:
+                            hoverFirefly var(--speed) infinite,
                             dimFirefly calc(var(--speed) / 2) infinite
                                 calc(var(--speed) / 3);
                         animation-play-state: paused;
@@ -142,7 +147,8 @@ main.product {
                         background: yellow;
                         width: 100%;
                         height: 100%;
-                        box-shadow: 0px 0px 6px 0px #ffeb3b,
+                        box-shadow:
+                            0px 0px 6px 0px #ffeb3b,
                             0px 0px 4px 0px #fdfca9 inset,
                             0px 0px 2px 1px #ffffff42;
                     }
@@ -300,7 +306,6 @@ main.product {
                 img {
                     object-fit: cover;
                 }
-
             }
             .others {
                 flex: 1 0 0;