[chore] Merge LLZBranch into main

TeamXFive · Jun 7, 2024 · 4ee91be · 4ee91be
2 parents d4b3a13 + bd4c932
commit 4ee91be
Show file tree

Hide file tree

Showing 10 changed files with 122 additions and 13 deletions.
diff --git a/img/carol.jpg → assets/img/carol.jpg b/img/carol.jpg → assets/img/carol.jpg
diff --git a/img/drone.jpeg → assets/img/drone.jpeg b/img/drone.jpeg → assets/img/drone.jpeg
diff --git a/img/hero-2-circle-ocean.png → assets/img/hero-2-circle-ocean.png b/img/hero-2-circle-ocean.png → assets/img/hero-2-circle-ocean.png
diff --git a/img/ivan.jpg → assets/img/ivan.jpg b/img/ivan.jpg → assets/img/ivan.jpg
diff --git a/img/lorenzo.jpeg → assets/img/lorenzo.jpeg b/img/lorenzo.jpeg → assets/img/lorenzo.jpeg
diff --git a/img/othon.jpg → assets/img/othon.jpg b/img/othon.jpg → assets/img/othon.jpg
diff --git a/img/sani.jpg → assets/img/sani.jpg b/img/sani.jpg → assets/img/sani.jpg
diff --git a/html/sobre.html b/html/sobre.html
@@ -1,11 +1,60 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>EcoShield - SOBRE</title>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>EcoShield | Sobre Nós</title>
+    <!-----===| GOOGLE FONTS |===----->
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <link href="https://fonts.googleapis.com/css2?family=Josefin+Sans:ital,wght@0,100..700;1,100..700&display=swap"
+        rel="stylesheet" />
+    <!-----===| BOOTSTRAP |===----->
+    <!---=| CSS |=--->
+    <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet"
+        integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous" />
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"
+        integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz"
+        crossorigin="anonymous"></script>
+    <!---=| JavaScript |=--->
+    <script src="https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js"
+        integrity="sha384-I7E8VVD/ismYTF4hNIPjVp/Zjvgyol6VFvRkX/vR+Vc4jQkC+hVqc2pM8ODewa9r"
+        crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"
+        integrity="sha384-0pUGZvbkm6XF6gxjEnlmuGrJXVbNuzT9qBBavbLwCsOGabYfZo0T0to5eqruptLy"
+        crossorigin="anonymous"></script>
+    <!---=| CSS Próprio |=--->
+    <link rel="stylesheet" href="../css/universal.css" />
 </head>
+
 <body>
-
+    <header class="d-flex flex-wrap justify-content-center align-items-center py-3">
+        <a href="../index.html"
+            class="d-flex align-items-center mb-md-0 me-md-auto link-body-emphasis text-decoration-none left-header">
+            <span class="logo-name-eco">Eco</span><span class="logo-name-shield">Shield</span>
+        </a>
+
+        <ul class="nav nav-pills right-header">
+            <li class="nav-item"><a href="./sobre.html" class="nav-link">SOBRE NÓS</a></li>
+            <li class="nav-item"><a href="./solucoes.html" class="nav-link">SOLUÇÕES</a></li>
+        </ul>
+    </header>
+
+    <main>
+    </main>
+    <!-- FOOTER START -->
+    <footer class="footer mt-auto py-3 bg-light">
+        <div class="container">
+            <p class="float-end"><a href="#">Voltar ao topo</a></p>
+            <p>
+                © 2024 EcoShield · <a href="#">Sobre</a> · <a href="#">Perguntas</a>
+            </p>
+        </div>
+    </footer>
+    <!-- FOOTER START -->
 </body>
+
+<script src="./js/universal.js"></script>
+
 </html>
diff --git a/html/solucoes.html b/html/solucoes.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>EcoShield | Soluções</title>
+    <!-----===| GOOGLE FONTS |===----->
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <link href="https://fonts.googleapis.com/css2?family=Josefin+Sans:ital,wght@0,100..700;1,100..700&display=swap"
+        rel="stylesheet" />
+    <!-----===| BOOTSTRAP |===----->
+    <!---=| CSS |=--->
+    <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet"
+        integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous" />
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"
+        integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz"
+        crossorigin="anonymous"></script>
+    <!---=| JavaScript |=--->
+    <script src="https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js"
+        integrity="sha384-I7E8VVD/ismYTF4hNIPjVp/Zjvgyol6VFvRkX/vR+Vc4jQkC+hVqc2pM8ODewa9r"
+        crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"
+        integrity="sha384-0pUGZvbkm6XF6gxjEnlmuGrJXVbNuzT9qBBavbLwCsOGabYfZo0T0to5eqruptLy"
+        crossorigin="anonymous"></script>
+    <!---=| CSS Próprio |=--->
+    <link rel="stylesheet" href="../css/universal.css" />
+</head>
+
+<body>
+    <header class="d-flex flex-wrap justify-content-center align-items-center py-3">
+        <a href="../index.html"
+            class="d-flex align-items-center mb-md-0 me-md-auto link-body-emphasis text-decoration-none left-header">
+            <span class="logo-name-eco">Eco</span><span class="logo-name-shield">Shield</span>
+        </a>
+
+        <ul class="nav nav-pills right-header">
+            <li class="nav-item"><a href="./sobre.html" class="nav-link">SOBRE NÓS</a></li>
+            <li class="nav-item"><a href="./solucoes.html" class="nav-link">SOLUÇÕES</a></li>
+        </ul>
+    </header>
+
+    <main>
+    </main>
+    <!-- FOOTER START -->
+    <footer class="footer mt-auto py-3 bg-light">
+        <div class="container">
+            <p class="float-end"><a href="#">Voltar ao topo</a></p>
+            <p>
+                © 2024 EcoShield · <a href="#">Sobre</a> · <a href="#">Perguntas</a>
+            </p>
+        </div>
+    </footer>
+    <!-- FOOTER START -->
+</body>
+
+<script src="./js/universal.js"></script>
+
+</html>
diff --git a/index.html b/index.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>EcoShield</title>
+    <title>EcoShield | Home</title>
     <!-----===| GOOGLE FONTS |===----->
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
@@ -37,8 +37,8 @@
         </a>
 
         <ul class="nav nav-pills right-header">
-            <li class="nav-item"><a href="#" class="nav-link">SOBRE NÓS</a></li>
-            <li class="nav-item"><a href="#" class="nav-link">SOLUÇÕES</a></li>
+            <li class="nav-item"><a href="./html/sobre.html" class="nav-link">SOBRE NÓS</a></li>
+            <li class="nav-item"><a href="./html/solucoes.html" class="nav-link">SOLUÇÕES</a></li>
         </ul>
     </header>
 
@@ -86,7 +86,7 @@ <h4>
                         </p>
                     </div>
                     <div class="col-lg-5 mt-3 mt-lg-0">
-                        <img class="lg featurette-image img-fluid mx-auto" src="./img/drone.jpeg" />
+                        <img class="lg featurette-image img-fluid mx-auto" src="./assets/img/drone.jpeg" />
                     </div>
                 </div>
             </div>
@@ -120,7 +120,7 @@ <h3>Nos assista no <span class="blue-text">Youtube!</span></h3>
                 <h1 class="my-5">Fundadores</h1>
                 <div class="row">
                     <div class="col-lg-2 col-md-3 col-sm-4 ms-auto">
-                        <img src="./img/carol.jpg" class="rounded-circle" width="140" height="140" role="img"
+                        <img src="./assets/img/carol.jpg" class="rounded-circle" width="140" height="140" role="img"
                             aria-label="Foto da Carol" />
                         <p class="fs-6 mt-3">
                             <small>RM: 559160</small>
@@ -129,7 +129,7 @@ <h1 class="my-5">Fundadores</h1>
                         </p>
                     </div>
                     <div class="col-lg-2 col-md-3 col-sm-4">
-                        <img src="./img/ivan.jpg" class="rounded-circle" width="140" height="140" role="img"
+                        <img src="./assets/img/ivan.jpg" class="rounded-circle" width="140" height="140" role="img"
                             aria-label="Foto do Ivan" />
                         <p class="fs-6 mt-3">
                             <small>RM: 556964</small>
@@ -139,14 +139,14 @@ <h1 class="my-5">Fundadores</h1>
                         </p>
                     </div>
                     <div class="col-lg-2 col-md-3 col-sm-4">
-                        <img src="./img/sani.jpg" class="rounded-circle" width="140" height="140" role="img"
+                        <img src="./assets/img/sani.jpg" class="rounded-circle" width="140" height="140" role="img"
                             aria-label="Foto do Sani" />
                         <p class="fs-6 mt-3">
                             <small> RM: 558703 </small><br />Luiz Henrique <br />Sani
                         </p>
                     </div>
                     <div class="col-lg-2 col-md-3 col-sm-4">
-                        <img src="./img/lorenzo.jpeg" class="rounded-circle" width="140" height="140" role="img"
+                        <img src="https://avatars.githubusercontent.com/u/97912499?v=4" class="rounded-circle" width="140" height="140" role="img"
                             aria-label="Foto do Lorenzo" />
                         <p class="fs-6 mt-3">
                             <small> RM: 555037 </small><br />
@@ -155,7 +155,7 @@ <h1 class="my-5">Fundadores</h1>
                         </p>
                     </div>
                     <div class="col-lg-2 col-md-3 col-sm-4 me-auto">
-                        <img src="./img/othon.jpg" class="rounded-circle" width="140" height="140" role="img"
+                        <img src="./assets/img/othon.jpg" class="rounded-circle" width="140" height="140" role="img"
                             aria-label="Foto do Lorenzo" />
                         <p class="fs-6 mt-3">
                             <small> RM: 554364 </small><br />José Othon <br />Ribeiro Moreira