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/88 implement new design #90

Closed
wants to merge 5 commits into from
Closed

Enhancement/88 implement new design #90

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
74a22e0
change the sponsor and about section of the static site
ashaduzzamane Oct 31, 2020
4da6e49
fix hero positioning
ashaduzzamane Oct 31, 2020
dd6567b
fix color styling
ashaduzzamane Nov 16, 2020
530b06a
format code
ashaduzzamane Nov 16, 2020
0166c8b
code cleanup
ashaduzzamane Nov 21, 2020
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
137 changes: 137 additions & 0 deletions src/assets/images/designs/about-old.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.
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.
2 changes: 1 addition & 1 deletion src/components/Bg/BgStyles.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export const BgStyles = styled.section`
position: relative;
margin-bottom: 60px;
margin-top: 100px;
background: url(${BgImg});
background: #F4F4F4;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should have a colour variable defined for this

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should have a colour variable defined for this

I can create a variable. I thought it wasn't worth it since we're only gonna use this colour once. what do u guys think?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should have the entire grayscale as defined color variables if not there already

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, colors should be same from dashboard to static site, no hardcoded colors

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will fix

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'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if this hex code is accurate?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, apparently the last two are alpha (transparency)

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