From c82ad427e2323d5272b3e9e389f40f6d5a625476 Mon Sep 17 00:00:00 2001
From: douglastofoli <tofoli.douglas@hotmail.com>
Date: Fri, 13 Sep 2024 11:02:31 -0300
Subject: [PATCH] resolve conflicts

---
 assets/css/aboutus.scss      | 27 +++++++--------------------
 assets/css/get_in_touch.scss |  5 +----
 assets/css/landing.scss      |  9 +--------
 assets/package-lock.json     | 17 -----------------
 4 files changed, 9 insertions(+), 49 deletions(-)

diff --git a/assets/css/aboutus.scss b/assets/css/aboutus.scss
index 632d2ac5..2c1a6237 100644
--- a/assets/css/aboutus.scss
+++ b/assets/css/aboutus.scss
@@ -6,7 +6,7 @@
   }
 }
 
-.lighter-banner{
+.lighter-banner {
   display: flex;
   flex-direction: column;
   text-align: center;
@@ -18,10 +18,10 @@
   background-blend-mode: multiply;
 
   .banner-img {
-      z-index: -1;
-      position: absolute;
-      width: 100vw;
-      height: 260px;
+    z-index: -1;
+    position: absolute;
+    width: 100vw;
+    height: 260px;
   }
 
 }
@@ -61,9 +61,6 @@
 
     img {
       width: 100vw;
-      height: auto;
-      padding: 0 20px;
-      border-radius: 8%;
     }
 
     .know-content {
@@ -206,15 +203,6 @@
       max-width: fit-content;
     }
 
-<<<<<<< feat/responsive-landing
-      .accordion-bx {
-        width: 75%;
-
-        @media(max-width: 810px) {
-          width: 60%;
-        }
-      }
-=======
   }
 
 }
@@ -230,11 +218,10 @@
     .phase-content {
       order: 1;
       width: 100%;
->>>>>>> main
     }
 
     img {
-      order: 2; 
+      order: 2;
       width: 100%;
     }
 
@@ -264,4 +251,4 @@
     height: 100%;
     z-index: -1;
   }
-}
\ No newline at end of file
+}
diff --git a/assets/css/get_in_touch.scss b/assets/css/get_in_touch.scss
index fd528144..88c7e3bd 100644
--- a/assets/css/get_in_touch.scss
+++ b/assets/css/get_in_touch.scss
@@ -81,7 +81,6 @@
     }
   }
 }
-<<<<<<< feat/responsive-landing
 
 @media (max-width: 767px) {
   .onde-nos-encontrar-wrapper {
@@ -134,6 +133,4 @@
       }
     }
   }
-}
-=======
->>>>>>> main
+}
\ No newline at end of file
diff --git a/assets/css/landing.scss b/assets/css/landing.scss
index 0be5a3d8..8061a821 100644
--- a/assets/css/landing.scss
+++ b/assets/css/landing.scss
@@ -155,19 +155,12 @@
       list-style: none;
     }
 
-<<<<<<< feat/responsive-landing
     .glide__slide {
       @apply flex justify-center items-center;
       width: 100%;
       height: auto;
       max-height: 500px;
       transition: transform 0.25s ease-out;
-=======
-    p {
-      text-wrap: wrap;
-      margin-top: 0.5rem;
-      padding: 0 1rem 1.5rem 1rem;
->>>>>>> main
     }
 
     .glide__slide img {
@@ -599,4 +592,4 @@
   .nossas-equipes-container {
     width: 1360px;
   }
-}
+}
\ No newline at end of file
diff --git a/assets/package-lock.json b/assets/package-lock.json
index 0e14afde..b187a0d3 100644
--- a/assets/package-lock.json
+++ b/assets/package-lock.json
@@ -644,19 +644,6 @@
         "url": "https://github.com/sponsors/rawify"
       }
     },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -879,10 +866,6 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
       "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-<<<<<<< feat/responsive-landing
-=======
-      "license": "MIT",
->>>>>>> main
       "dependencies": {
         "braces": "^3.0.3",
         "picomatch": "^2.3.1"