Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Updated FAQ and Intro Sections #60

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/app/components/nav/Nav.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Container from "react-bootstrap/Container";
import Navbar from "react-bootstrap/Navbar";
import Nav from "react-bootstrap/Nav";

import zothacksLogo from "assets/icons/zothacks-logo.svg";
import { ReactComponent as ZothacksLogo} from "assets/icons/zothacks-logo.svg";

import "./Nav.scss";

Expand All @@ -17,7 +17,7 @@ function NavigationBar() {
<Navbar id="app-navbar" expand="md" variant="dark">
<Container fluid>
<Navbar.Brand as={NavLink} end to="/">
<img className="navbar-logo" src={zothacksLogo} alt="ZotHacks Logo" />
<ZothacksLogo className="navbar-logo" fill="white"/>
</Navbar.Brand>
<Navbar.Toggle aria-controls="inner-navbar-nav" />
<Navbar.Collapse id="inner-navbar-nav">
Expand Down
6 changes: 4 additions & 2 deletions src/app/views/home/sections/Faq.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
align-items: center;
justify-content: space-between;
flex-direction: column;
background: $black;
opacity: 50%;
background: rgba(0, 0, 0, 0.5);
width: 80%;
margin: auto;
border-radius: 10px;

& > h2 {
width: 80vw;
Expand Down
4 changes: 2 additions & 2 deletions src/app/views/home/sections/Intro.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import React from "react";

import zothacksLogo from "assets/icons/zothacks-logo.svg";
import { ReactComponent as ZothacksLogo } from "assets/icons/zothacks-logo.svg";

import "./Intro.scss";

function Intro() {
return (
<section className="intro">
<div className="card">
<img className="zothacks-logo" src={zothacksLogo} />
<ZothacksLogo className="zothacks-logo" fill="#1D6C38" />
<h2>What is ZotHacks?</h2>
<p className="card-text">
ZotHacks is a beginner-friendly hackathon where students with minimal
Expand Down
1 change: 1 addition & 0 deletions src/app/views/home/sections/Intro.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

.zothacks-logo {
width: 100px;
height: 100px;
margin: 0 auto 2rem auto;
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/assets/icons/zothacks-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.