Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhancement/1 implement new design #4

Merged
merged 1 commit into from
Nov 24, 2020
Merged

Enhancement/1 implement new design #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
264 changes: 128 additions & 136 deletions src/assets/images/designs/about.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 12 additions & 21 deletions src/assets/images/designs/cord.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
230 changes: 144 additions & 86 deletions src/assets/images/designs/sponsor.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions src/components/Bg/BgStyles.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import styled from "styled-components"
import * as styleVars from "../variable"
import BgImg from "../../assets/images/designs/bg.svg"

export const BgStyles = styled.section`
height: 100%;
position: relative;
margin-bottom: 60px;
margin-top: 100px;
background: url(${BgImg});
background: ${styleVars.hackBlack5};
background-size: cover;
background-position: right 80px;
background-repeat: no-repeat;
Expand Down
1 change: 1 addition & 0 deletions src/components/Hero/HeroStyles.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import styled from "styled-components"
import * as styleVars from "../variable"

export const HeroStyles = styled.section`
margin-top: 100px;
position: relative;
padding: 0 2rem;
margin-bottom: 400px;
Expand Down
6 changes: 3 additions & 3 deletions src/components/Sponsor/Button.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export const Button = styled.button`
font-weight: 600;
font-size: 14px;
text-transform: none;
background-color: ${styleVars.colorHackRed};
background-color: ${styleVars.purple};
color: white;
border-radius: 3.75em;
border: none;
Expand All @@ -20,8 +20,8 @@ export const Button = styled.button`
// width: 175px;

&:hover {
background-color: #f56f65;
color: white;
background-color: ${styleVars.purpleLight};
color: ${styleVars.purple};
}
`

Expand Down
2 changes: 2 additions & 0 deletions src/components/variable.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ export const colorHackRedMed = "#f56f65"
export const colorHackRedLight = "#f89790"
export const colorHackYellow = "#ffd081"
export const colorHackTeal = "#48DEE2"
export const purple = "#5C63AB"
export const purpleLight = "#5C63AB19"
export const hackBlack = "#202020"
export const hackBlack80 = "#4d4d4d"
export const hackBlack70 = "#636363"
Expand Down
4 changes: 2 additions & 2 deletions src/pages/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ const IndexPage = () => {
scrollToSponsor={() => scrollTo(sponsorRef)}
scrollToFaq={() => scrollTo(faqRef)}
/>
<Hero />
<Bg>
<Hero />
<About scrollRef={aboutRef} />
<Sponsor scrollRef={sponsorRef} />
</Bg>
<Sponsor scrollRef={sponsorRef} />
<FAQ scrollRef={faqRef} />
<Logos />
<Footer />
Expand Down