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

Join us page #1002

Merged
merged 25 commits into from
Mar 17, 2021
Merged

Join us page #1002

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
56eb6c5
Set main layout
Jan 22, 2021
02541e4
Style Advice Card Mbl, Stle Volunteer Card Mbl
Jan 22, 2021
33cc4aa
Stle Advice Car Mbl, Stle Volunteer Card Mbl
Jan 22, 2021
77f1f71
Style Partner Card Mbl
Jan 22, 2021
b8fffda
Style Partner with Us Mbl
Jan 22, 2021
5631d51
Merge branch 'gh-pages' of https://github.com/hackforla/website into …
Jan 28, 2021
8b4c092
Fix button and card classes, Desktop style for Banner
Jan 28, 2021
6220ef1
Style Desktop cards
Jan 28, 2021
d73b8f2
Add links
Feb 1, 2021
26d5974
Change nav bar link
Feb 1, 2021
9e1e2ef
undo mian.yml edit
Feb 2, 2021
5aa413b
fix main.yml rout
Feb 2, 2021
19c6b07
Merge branch 'gh-pages' into Join-Us-Page
Feb 4, 2021
e2e4111
Style fixes round 1
Feb 7, 2021
707a606
Margin fix
Feb 7, 2021
ae004a6
Update donation graphics
Feb 7, 2021
3f0e148
fixed overlaping margins
Feb 14, 2021
fb34cd4
update banner style in tablet
Feb 21, 2021
6ed9f68
clarify scss comments
Feb 21, 2021
b50591c
catch branch up to main
Feb 24, 2021
216c0bb
remove duplicate files
Feb 24, 2021
49bc1b8
made quotes in main.scss single
Feb 24, 2021
ab56bcd
add mailto: to email link line 149
trtincher Mar 17, 2021
acb2f87
add slack link
trtincher Mar 17, 2021
1a9921d
add target blank to a tags
trtincher Mar 17, 2021
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
12 changes: 12 additions & 0 deletions _credits/building 2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
title: Building
title-link: https://www.freepik.com/free-vector/connecting-teams-concept-illustration_6183570.htm
content: icon
used-in: Hack Nights
artist: stories
provider: Freepik
provider-link: 'https://www.freepik.com/'
image-url: /assets/images/hack-nights/building.png
alt: 'Image of Building'
type: icon
---
12 changes: 12 additions & 0 deletions _credits/business 2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
title: Business
title-link: https://www.freepik.com/free-vector/telecommuting-concept-illustration_7321316.htm
content: icon
used-in: Getting Started, Hack Nights
artist: stories
provider: Freepik
provider-link: 'https://www.freepik.com/'
image-url: /assets/images/getting-started/step1.png
alt: 'Image of Business'
type: icon
---
12 changes: 12 additions & 0 deletions _credits/button 2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
title: Button
title-link: https://www.freepik.com/free-vector/choose-concept-illustration_5568798.htm
content: icon
used-in: Getting Started
artist: stories
provider: Freepik
provider-link: 'https://www.freepik.com/'
image-url: /assets/images/getting-started/step2.png
alt: 'Image of Button'
type: icon
---
12 changes: 12 additions & 0 deletions _credits/check 2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
title: Check
title-link: https://thenounproject.com/search/?q=check&i=1271976
content: icon
used-in: Getting Started
artist: Karan
provider: Noun Project
provider-link: 'https://thenounproject.com/'
image-url: /assets/images/getting-started/join-4.png
alt: 'Image of Check'
type: icon
---
12 changes: 12 additions & 0 deletions _credits/design 2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
title: Design
title-link: https://www.freepik.com/free-vector/design-community-concept-illustration_6610841.htm
content: icon
used-in: Credits
artist: stories
provider: Freepik
provider-link: 'https://www.freepik.com/'
image-url: /assets/images/credits/credits-hero.png
alt: 'Image of Design'
type: icon
---
12 changes: 12 additions & 0 deletions _credits/people 2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
title: People
title-link: https://www.freepik.com/free-vector/team-spirit-concept-illustration_7079890.htm
content: icon
used-in: Getting Started
artist: stories
provider: Freepik
provider-link: 'https://www.freepik.com/'
image-url: /assets/images/getting-started/step3.png
alt: 'Image of People'
type: icon
---
12 changes: 12 additions & 0 deletions _credits/people2 2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
title: People
title-link: https://www.freepik.com/free-vector/hang-out-concept-illustration_6982628.htm
content: icon
used-in: Hack Nights
artist: stories
provider: Freepik
provider-link: 'https://www.freepik.com/'
image-url: /assets/images/hack-nights/happy-hour.png
alt: 'Image of People'
type: icon
---
12 changes: 12 additions & 0 deletions _credits/process 2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
title: Process
title-link: https://www.freepik.com/free-vector/organizing-projects-concept-illustration_5911566.htm
content: icon
used-in: Hack Nights, Projects
artist: stories
provider: Freepik
provider-link: 'https://www.freepik.com/'
image-url: /assets/images/hack-nights/org-projects.png
alt: 'Image of Process'
type: icon
---
12 changes: 12 additions & 0 deletions _credits/redo 2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
title: Redo
title-link: https://thenounproject.com/search/?q=next%20arrow&i=1781061
content: icon
used-in: Getting Started
artist: Numero Uno
provider: Noun Project
provider-link: 'https://thenounproject.com/'
image-url: /assets/images/getting-started/onboard-4.png
alt: 'Image of Redo'
type: icon
---
12 changes: 12 additions & 0 deletions _credits/resume 2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
title: Resume
title-link: https://thenounproject.com/term/curriculum-vitae/638140/
content: icon
used-in: Getting Started
artist: unlimicon
provider: Noun Project
provider-link: 'https://thenounproject.com/'
image-url: /assets/images/getting-started/adopt-2.png
alt: 'Image of Resume'
type: icon
---
12 changes: 12 additions & 0 deletions _credits/secutiry 2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
title: Security
title-link: https://thenounproject.com/search/?q=security&i=2995532
content: icon
used-in: Getting Started
artist: Graphik Designz
provider: Noun Project
provider-link: 'https://thenounproject.com/'
image-url: /assets/images/getting-started/adopt-1.png
alt: 'Image of Security'
type: icon
---
12 changes: 12 additions & 0 deletions _credits/technology 2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
title: Technology
title-link: https://www.freepik.com/free-vector/secure-data-concept-illustration_5573512.htm#position=1
content: icon
used-in: Getting Started
artist: stories
provider: Freepik
provider-link: 'https://www.freepik.com/'
image-url: /assets/images/getting-started/step4.png
alt: 'Image of Technology'
type: icon
---
12 changes: 12 additions & 0 deletions _credits/video-conference 2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
title: Video Conference
title-link: https://thenounproject.com/search/?q=video%20conference&i=1786074
content: icon
used-in: Getting Started
artist: Edwin PM
provider: Noun Project
provider-link: 'https://thenounproject.com/'
image-url: /assets/images/getting-started/onboard-2.png
alt: 'Image of Video Conference'
type: icon
---
12 changes: 12 additions & 0 deletions _credits/winner 2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
title: Winner
title-link: https://www.freepik.com/premium-vector/contest-winner-background-with-trophy-confetti_2848255.htm
content: icon
used-in: Wins Page
artist: freepik
provider: Freepik
provider-link: 'https://www.freepik.com/'
image-url: assets/images/wins-page/wins-trophy.png
alt: 'Image of Winner'
type: icon
---
8 changes: 4 additions & 4 deletions _data/navigation/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
- name: Events
link: '/events'
link: "/events"
list_class_name:
icon: /svg/icon-hacknights.svg

# the link attribute should be changed to "/hack-nights-page" after page issues have been resolved
- name: Projects
link: '/#projects'
link: "/#projects"
list_class_name:
icon: /svg/icon-projects.svg

- name: Press
link: '/#press'
link: "/#press"
list_class_name:
icon: /svg/icon-press.svg

Copy link
Member

Choose a reason for hiding this comment

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

There does not seem to have been any change to this file in regards to this pull request. Any chance this could be removed from the pull request?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do you know the git command to do that?

Copy link
Member

Choose a reason for hiding this comment

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

Not off the top of my head, no. You will have to look into that. But i believe this might be it from the contrrib.md file(Please do double check tough).

-Use the git reset HEAD command to remove a staged file.

This command will remove a file that has been staged. This file will not be committed (saved) when you run the next command, git commit. This only works if the wrong files were added, but they were not yet committed. The file will be removed from the staging area, but not actually deleted:

git reset HEAD “filename.ext”

- name: Connect
link: '/#about'
link: "/#about"
list_class_name:
icon: /svg/icon-about.svg

Expand Down
Loading