Skip to content
This repository has been archived by the owner on May 25, 2024. It is now read-only.

Commit

Permalink
Merge pull request #13 from frc9611/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
LucasHitoshi committed Jan 20, 2024
2 parents 6c13d63 + 6ae9c41 commit ae293ae
Show file tree
Hide file tree
Showing 22 changed files with 42 additions and 32 deletions.
4 changes: 2 additions & 2 deletions src/about-us.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="theme-color" content="#34024B">
<title>CyberRain - Home</title>
<title>CyberRain - Conheça-nos</title>
<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=Outfit:wght@100;300;600;700&display=swap" rel="stylesheet">
Expand Down Expand Up @@ -36,7 +36,7 @@
<nav class="nav-wrapper">
<ul class="menu-pages-wrapper">
<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="about-us.html" class="menu-page highlighted-text">Conheça-nos</a></li>
<li><a href="sponsorship.html" class="menu-page">Patrocinadores</a></li>
<li><a href="projects.html" class="menu-page">Projetos</a></li>
</ul>
Expand Down
File renamed without changes
File renamed without changes
Binary file removed src/assets/cool-cyberrain-bg.png
Binary file not shown.
Binary file removed src/assets/frc-bg-2.jpg
Binary file not shown.
Binary file removed src/assets/frc-bg.jpg
Binary file not shown.
Binary file removed src/assets/frc-filtered-bg - Copia (2).jpg
Binary file not shown.
Binary file removed src/assets/idea-lamp-icon.png
Binary file not shown.
File renamed without changes
File renamed without changes
File renamed without changes
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file added src/assets/technical-projects.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 10 additions & 9 deletions src/contact.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="theme-color" content="#34024B">
<title>CyberRain - Home</title>
<title>CyberRain - Get in Touch</title>
<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=Outfit:wght@100;300;600;700&display=swap" rel="stylesheet">
<link rel="shortcut icon" href="./assets/favicon.png" type="image/x-icon">
<!-- Globals -->
<link rel="stylesheet" href="./styles/global/normalize.css">
<!--css-->
<script src="./javascripts/disable-scroll.js" defer></script>
<!-- Page CSS file -->
<link rel="stylesheet" href="./styles/contact.css">
<!-- Components -->
<script src="./javascripts/components/mobile-dropdown-menu.js" defer></script>
Expand Down Expand Up @@ -61,12 +62,12 @@
</div>
<hr />
<div class="contact">
<img src="/src/assets/ri_instagram-line.svg" alt="instagram-icon">
<img src="./assets/ri-instagram-line.svg" alt="instagram-icon">
<a href="https://www.instagram.com/cyberainfrc/" target="_blank">@cyberain</a>
</div>

<div class="contact">
<img src="/src/assets/ri_tiktok-line.svg" alt="tiktok-icon">
<img src="./assets/ri-tiktok-line.svg" alt="tiktok-icon">
<a href="https://www.tiktok.com/@cyberrainfrc?" target="_blank">@cyberrainfrc</a>
</div>
</section>
Expand All @@ -77,19 +78,19 @@
</div>
<hr />
<div class="contact">
<img src="/src/assets/nimbus_marketing.svg" alt="contact-icon">
<img src="./assets/nimbus-marketing.svg" alt="contact-icon">
<a href="mailto:contact@9611.team" target="_blank">contact@9611.team</a>
</div>
<div class="contact">
<img src="/src/assets/mdi_brain.svg" alt="brain-icon">
<img src="./assets/mdi-brain.svg" alt="brain-icon">
<a href="mailto:mentorship@9611.team" target="_blank">mentorship@9611.team</a>
</div>
<div class="contact">
<img src="/src/assets/material-symbols_computer-outline.svg" alt="computer-icon">
<img src="./assets/material-symbols-computer-outline.svg" alt="computer-icon">
<a href="mailto:programming@9611.team" target="_blank">programming@9611.team</a>
</div>
<div class="contact">
<img src="/src/assets/bxs_pen.svg" alt="pen-icon">
<img src="./assets/bxs-pen.svg" alt="pen-icon">
<a href="mailto:design@9611.team" target="_blank">design@9611.team</a>
</div>
</section>
Expand All @@ -104,7 +105,7 @@
<a href="https://www.thebluealliance.com/team/9611" target="_blank">[TBA] #9611</a>
</div>
<div class="contact">
<img src="./assets/bi_github.svg" alt="Ícone da The Blue Alliance">
<img src="./assets/bi-github.svg" alt="Ícone da The Blue Alliance">
<a href="https://www.thebluealliance.com/team/9611" target="_blank">[Github] frc9611</a>
</div>
</section>
Expand Down
2 changes: 1 addition & 1 deletion src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</div>
<nav class="nav-wrapper">
<ul class="menu-pages-wrapper">
<li><a href="." class="menu-page">Home</a></li>
<li><a href="." class="menu-page highlighted-text">Home</a></li>
<li><a href="about-us.html" class="menu-page">Conheça-nos</a></li>
<li><a href="sponsorship.html" class="menu-page">Patrocinadores</a></li>
<li><a href="projects.html" class="menu-page">Projetos</a></li>
Expand Down
10 changes: 5 additions & 5 deletions src/projects.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="theme-color" content="#34024B">
<title>CyberRain - Home</title>
<title>CyberRain - Projetos</title>
<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=Outfit:wght@100;300;600;700&display=swap" rel="stylesheet">
Expand Down Expand Up @@ -38,7 +38,7 @@
<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="sponsorship.html" class="menu-page">Patrocinadores</a></li>
<li><a href="projects.html" class="menu-page">Projetos</a></li>
<li><a href="projects.html" class="menu-page highlighted-text">Projetos</a></li>
</ul>
<a href="contact.html" class="yellow-unfilled-button">Contato</a>
</nav>
Expand All @@ -64,15 +64,15 @@
<span class="about-projects-option-name-prefix">Projetos</span>
<span class="about-projects-option-name-class">Sociais</span>
</div>
<img class="about-projects-option-image" src="./assets/enzo.png" alt="Projetos sociais">
<img class="about-projects-option-image" src="./assets/social-projects.png" alt="Projetos sociais">
</a>
<a href="#technical-projects" class="about-projects-option">
<span class="about-projects-option-side-line"></span>
<div class="about-projects-option-name-wrapper">
<span class="about-projects-option-name-prefix">Projetos</span>
<span class="about-projects-option-name-class">Sociais</span>
<span class="about-projects-option-name-class">Técnicos</span>
</div>
<img class="about-projects-option-image" src="./assets/enzo.png" alt="Projetos sociais">
<img class="about-projects-option-image" src="./assets/technical-projects.png" alt="Projetos sociais">
</a>
</div>
</div>
Expand Down
12 changes: 8 additions & 4 deletions src/sponsorship.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="theme-color" content="#34024B">
<title>CyberRain - Home</title>
<title>CyberRain - Patrocínio</title>
<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=Outfit:wght@100;300;600;700&display=swap" rel="stylesheet">
Expand Down Expand Up @@ -37,7 +37,7 @@
<ul class="menu-pages-wrapper">
<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="sponsorship.html" class="menu-page">Patrocinadores</a></li>
<li><a href="sponsorship.html" class="menu-page highlighted-text">Patrocinadores</a></li>
<li><a href="projects.html" class="menu-page">Projetos</a></li>
</ul>
<a href="contact.html" class="yellow-unfilled-button">Contato</a>
Expand All @@ -55,10 +55,14 @@
<hr class="thick-line">
<div class="sponsorship-motivations-wrapper">
<span class="sponsorship-motivation">
Patrocinar uma equipe de robótica pode proporcionar visibilidade positiva para sua empresa, demonstrando apoio à educação, inovação e tecnologia. Além disso, cria oportunidades de networking e promove uma imagem de responsabilidade social corporativa.
Patrocinar uma equipe de robótica pode proporcionar visibilidade positiva para sua empresa,
demonstrando apoio à educação, inovação e tecnologia. Além disso, cria oportunidades de
networking e promove uma imagem de responsabilidade social corporativa.
</span>
<span class="sponsorship-motivation">
Além disso, ao patrocinar-nos, sua empresa fomenta o interesse nas áreas STEAM (Ciência, Tecnologia, Engenharia, Artes e Matemática), ajudando a nova geração de trabalhadores a serem mais inovadores e ambiciosos.
Além disso, ao patrocinar-nos, sua empresa fomenta o interesse nas áreas STEAM (Ciência,
Tecnologia, Engenharia, Artes e Matemática), ajudando a nova geração de trabalhadores a serem
mais inovadores e ambiciosos.
</span>
</div>
</div>
Expand Down
13 changes: 3 additions & 10 deletions src/styles/about-us.css
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
/* Modded Header */

.modded-header {
background-color: #271129;
position: relative;
z-index: 10;
box-shadow: var(--black-text) 0 0 7rem;
}

/* CyberRain logo section */
Expand Down Expand Up @@ -196,15 +198,6 @@
}
}

@media (max-width: 300px) {
.cr-info-wrapper {
justify-content: center;
margin: 0 4rem;
text-align: center;
flex-direction: column;
}
}

/* CyberRain Team Photo */

.cr-team-photo {
Expand Down
6 changes: 6 additions & 0 deletions src/styles/components/layout.css
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,12 @@
content: "🌝";
}

.menu-page.highlighted-text::after {
background-color: var(--cr-yellow);
display: block;
width: 100%;
}

.menu-page:hover::after {
display: block;
width: 100%;
Expand Down
6 changes: 6 additions & 0 deletions src/styles/projects.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@
--ui-ultra-light-blue: #d3e8ff;
}

/* Calibrations */

* {
scroll-behavior: smooth;
}

/* About Projects */

.about-projects-section {
Expand Down

0 comments on commit ae293ae

Please sign in to comment.