Merge pull request #10 from frc9611/dev

Dev
frc9611 · Jan 16, 2024 · 65707b4 · 65707b4
2 parents 81282dc + 0502757
commit 65707b4
Show file tree

Hide file tree

Showing 36 changed files with 1,068 additions and 235 deletions.
diff --git a/about-us.html b/about-us.html
diff --git a/assets/cool-cyberrain-bg.png b/assets/cool-cyberrain-bg.png
diff --git a/assets/cr-team-moment-1.png b/assets/cr-team-moment-1.png
diff --git a/assets/cr-team-moment-2.png b/assets/cr-team-moment-2.png
diff --git a/assets/cr-team-moment-3.png b/assets/cr-team-moment-3.png
diff --git a/assets/cr-team-moment-4.png b/assets/cr-team-moment-4.png
diff --git a/assets/cr-team-moment-5.png b/assets/cr-team-moment-5.png
diff --git a/assets/cr-team-moment-6.png b/assets/cr-team-moment-6.png
diff --git a/assets/cr-team.png b/assets/cr-team.png
diff --git a/assets/frc-bg.jpg b/assets/frc-bg.jpg
diff --git a/assets/frc-filtered-bg.jpg b/assets/frc-filtered-bg.jpg
diff --git a/assets/idea-lamp-icon.png b/assets/idea-lamp-icon.png
diff --git a/assets/members/akira-original.JPG b/assets/members/akira-original.JPG
diff --git a/assets/members/akira.JPG b/assets/members/akira.JPG
diff --git a/assets/members/bruno.JPG b/assets/members/bruno.JPG
diff --git a/assets/members/eiji.JPG b/assets/members/eiji.JPG
diff --git a/assets/members/enzo.JPG b/assets/members/enzo.JPG
diff --git a/assets/members/evelise.JPG b/assets/members/evelise.JPG
diff --git a/assets/members/helena.JPG b/assets/members/helena.JPG
diff --git a/assets/members/j-rodrigo.JPG b/assets/members/j-rodrigo.JPG
diff --git a/assets/members/jean.JPG b/assets/members/jean.JPG
diff --git a/assets/members/karol.JPG b/assets/members/karol.JPG
diff --git a/assets/members/lcc-original.JPG b/assets/members/lcc-original.JPG
diff --git a/assets/members/lcc.JPG b/assets/members/lcc.JPG
diff --git a/assets/members/marco.jpg b/assets/members/marco.jpg
diff --git a/assets/members/ogawa.JPG b/assets/members/ogawa.JPG
diff --git a/assets/members/paula.JPG b/assets/members/paula.JPG
diff --git a/assets/some-guy.png b/assets/some-guy.png
diff --git a/index.html b/index.html
@@ -21,6 +21,7 @@
     <script src="./javascripts/components/mobile-dropdown-menu.js" defer></script>
     <link rel="stylesheet" href="./styles/components/layout.css">
     <link rel="stylesheet" href="./styles/components/loading.css">
+    <link rel="stylesheet" href="./styles/components/common-ui.css">
 </head>
 
 <body>
@@ -34,8 +35,8 @@
         </div>
         <nav class="nav-wrapper">
             <ul class="menu-pages-wrapper">
-                <li><a href="" class="menu-page">Home</a></li>
-                <li><a href="not-implemented.html" class="menu-page">Conheça-nos</a></li>
+                <li><a href="." class="menu-page">Home</a></li>
+                <li><a href="about-us.html" class="menu-page">Conheça-nos</a></li>
                 <li><a href="not-implemented.html" class="menu-page">Patrocinadores</a></li>
                 <li><a href="not-implemented.html" class="menu-page">Projetos</a></li>
             </ul>
@@ -93,7 +94,7 @@
                     Competition (FRC). Composta por alunos da Escola SESI de Referência, com idade média entre 15 e 17
                     anos, a equipe tem se destacado por sua dedicação, criatividade e inovação.</p>
                 <div class="cr-about-buttons-wrapper">
-                    <a href="not-implemented.html" class="default-button-width purple-filled-button">Conheça-nos</a>
+                    <a href="about-us.html" class="default-button-width purple-filled-button">Conheça-nos</a>
                     <a href="not-implemented.html" class="default-button-width purple-unfilled-button">Contato</a>
                 </div>
             </div>
@@ -228,8 +229,8 @@
         <div id="dropdown-menu">
             <span class="dropdown-menu-title">Menu</span>
             <ul class="dropdown-menu-options">
-                <li><a class="dropdown-menu-option" href="./not-implemented.html">Home</a></li>
-                <li><a class="dropdown-menu-option" href="./not-implemented.html">Conheça-nos</a></li>
+                <li><a class="dropdown-menu-option" href=".">Home</a></li>
+                <li><a class="dropdown-menu-option" href="./about-us.html">Conheça-nos</a></li>
                 <li><a class="dropdown-menu-option" href="./not-implemented.html">Projetos</a></li>
                 <li><a class="dropdown-menu-option" href="./not-implemented.html">Newsletter</a></li>
                 <li><a class="dropdown-menu-option" href="./not-implemented.html">Patrocinadores</a></li>

diff --git a/not-implemented.html b/not-implemented.html
@@ -15,8 +15,6 @@
     <link rel="stylesheet" href="./styles/not-implemented.css">
     <link href="https://fonts.googleapis.com/css2?family=Outfit:wght@100;300;600;700&display=swap" rel="stylesheet">
     <link rel="shortcut icon" href="./assets/favicon.png" type="image/x-icon">
-    <!-- Components -->
-    <script src="./javascripts/loading-state-manager.js" defer></script>
 </head>
 
 <body>