From fd175988f83c237bc4847e6551c3428c110c7ce0 Mon Sep 17 00:00:00 2001 From: Kegan Maher Date: Mon, 4 Mar 2019 16:34:08 -0800 Subject: [PATCH 01/12] Westside survey shortcut --- static/_redirects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/_redirects b/static/_redirects index 138b425a53..55a8c28900 100644 --- a/static/_redirects +++ b/static/_redirects @@ -15,4 +15,4 @@ /slack https://hackforla-slack.herokuapp.com/ # Temporary Events and Promos -/coffee https://www.eventbrite.com/e/make-trash-history-the-los-angeles-coffee-community-leads-the-way-tickets-51337704456 +/westside https://docs.google.com/forms/d/e/1FAIpQLSdHOcMOoPhk_6BBJCmfMXwr1j2cfmH66tfj0CViTURj_nS28A/viewform?usp=pp_url&entry.1073515406=2019-03-04 From af5829bd2019e4ce54ae68faaa3f8d933c7f8db5 Mon Sep 17 00:00:00 2001 From: Roland Abregorivas Date: Wed, 27 Mar 2019 13:04:36 -0700 Subject: [PATCH 02/12] header: add all svg icons & hfla log --- _includes/svg/icon-about.svg | 1 + _includes/svg/icon-facebook.svg | 6 ++++++ _includes/svg/icon-github.svg | 6 ++++++ _includes/svg/icon-hacknights.svg | 1 + _includes/svg/icon-medium.svg | 6 ++++++ _includes/svg/icon-meetup.svg | 16 ++++++++++++++++ _includes/svg/icon-press.svg | 1 + _includes/svg/icon-projects.svg | 1 + _includes/svg/icon-slack.svg | 6 ++++++ _includes/svg/icon-twitter.svg | 6 ++++++ _includes/svg/logo-hfla.svg | 1 + 11 files changed, 51 insertions(+) create mode 100644 _includes/svg/icon-about.svg create mode 100644 _includes/svg/icon-facebook.svg create mode 100644 _includes/svg/icon-github.svg create mode 100644 _includes/svg/icon-hacknights.svg create mode 100644 _includes/svg/icon-medium.svg create mode 100644 _includes/svg/icon-meetup.svg create mode 100644 _includes/svg/icon-press.svg create mode 100644 _includes/svg/icon-projects.svg create mode 100644 _includes/svg/icon-slack.svg create mode 100644 _includes/svg/icon-twitter.svg create mode 100644 _includes/svg/logo-hfla.svg diff --git a/_includes/svg/icon-about.svg b/_includes/svg/icon-about.svg new file mode 100644 index 0000000000..0d5136f928 --- /dev/null +++ b/_includes/svg/icon-about.svg @@ -0,0 +1 @@ + diff --git a/_includes/svg/icon-facebook.svg b/_includes/svg/icon-facebook.svg new file mode 100644 index 0000000000..89923067d8 --- /dev/null +++ b/_includes/svg/icon-facebook.svg @@ -0,0 +1,6 @@ + + Facebook icon + + diff --git a/_includes/svg/icon-github.svg b/_includes/svg/icon-github.svg new file mode 100644 index 0000000000..a276181cf4 --- /dev/null +++ b/_includes/svg/icon-github.svg @@ -0,0 +1,6 @@ + + GitHub icon + + diff --git a/_includes/svg/icon-hacknights.svg b/_includes/svg/icon-hacknights.svg new file mode 100644 index 0000000000..d1949c3341 --- /dev/null +++ b/_includes/svg/icon-hacknights.svg @@ -0,0 +1 @@ + diff --git a/_includes/svg/icon-medium.svg b/_includes/svg/icon-medium.svg new file mode 100644 index 0000000000..f0b65303c6 --- /dev/null +++ b/_includes/svg/icon-medium.svg @@ -0,0 +1,6 @@ + + Medium icon + + diff --git a/_includes/svg/icon-meetup.svg b/_includes/svg/icon-meetup.svg new file mode 100644 index 0000000000..8b8c7986e1 --- /dev/null +++ b/_includes/svg/icon-meetup.svg @@ -0,0 +1,16 @@ + + + + meetup-logo + Created with Sketch. + + + + + + + diff --git a/_includes/svg/icon-press.svg b/_includes/svg/icon-press.svg new file mode 100644 index 0000000000..2b783a83df --- /dev/null +++ b/_includes/svg/icon-press.svg @@ -0,0 +1 @@ + diff --git a/_includes/svg/icon-projects.svg b/_includes/svg/icon-projects.svg new file mode 100644 index 0000000000..4ec55677fb --- /dev/null +++ b/_includes/svg/icon-projects.svg @@ -0,0 +1 @@ + diff --git a/_includes/svg/icon-slack.svg b/_includes/svg/icon-slack.svg new file mode 100644 index 0000000000..6d651e2914 --- /dev/null +++ b/_includes/svg/icon-slack.svg @@ -0,0 +1,6 @@ + + Slack icon + + diff --git a/_includes/svg/icon-twitter.svg b/_includes/svg/icon-twitter.svg new file mode 100644 index 0000000000..b384ec74fb --- /dev/null +++ b/_includes/svg/icon-twitter.svg @@ -0,0 +1,6 @@ + + Twitter icon + + diff --git a/_includes/svg/logo-hfla.svg b/_includes/svg/logo-hfla.svg new file mode 100644 index 0000000000..4a87e12ade --- /dev/null +++ b/_includes/svg/logo-hfla.svg @@ -0,0 +1 @@ + From 6951432a2adb1ebce7241e5e3d87879882a825b8 Mon Sep 17 00:00:00 2001 From: Roland Abregorivas Date: Wed, 27 Mar 2019 13:05:09 -0700 Subject: [PATCH 03/12] header: create main & social data files --- _data/navigation/main.yml | 25 +++++++++++++++++++++++++ _data/navigation/social.yml | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 _data/navigation/main.yml create mode 100644 _data/navigation/social.yml diff --git a/_data/navigation/main.yml b/_data/navigation/main.yml new file mode 100644 index 0000000000..2a59ca7feb --- /dev/null +++ b/_data/navigation/main.yml @@ -0,0 +1,25 @@ +- name: Hack Nights + link: hack-nights + listClassName: + iconUrl: /svg/icon-hacknights.svg + iconClass: icon icon-hack-nights nav-icon +- name: Projects + link: projects + listClassName: + iconUrl: /svg/icon-projects.svg + iconClass: icon icon-hack-nights nav-icon icon icon-projects nav-icon +- name: Press + link: press + listClassName: + iconUrl: /svg/icon-press.svg + iconClass: icon icon-hack-nights nav-icon icon icon-projects nav-icon icon icon-press nav-icon +- name: About + link: about + listClassName: + iconUrl: /svg/icon-about.svg + iconClass: icon icon-hack-nights nav-icon icon icon-projects nav-icon icon icon-about nav-icon +- name: Contact Us + link: contact + listClassName: hide-mobile + iconUrl: + iconClass: diff --git a/_data/navigation/social.yml b/_data/navigation/social.yml new file mode 100644 index 0000000000..e210807c98 --- /dev/null +++ b/_data/navigation/social.yml @@ -0,0 +1,35 @@ +- name: Meetup + link: https://www.meetup.com/hackforla/ + iconUrl: /svg/icon-meetup + header: false + footer: true + +- name: Github + link: https://github.com/hackforla + iconUrl: /svg/icon-github + header: true + footer: true + +- name: Slack + link: https://hackforla-slack.herokuapp.com/ + iconUrl: /svg/icon-slack + header: true + footer: true + +- name: Facebook + link: https://hackforla-slack.herokuapp.com/ + iconUrl: /svg/icon-facebook + header: true + footer: true + +- name: Medium + link: https://medium.com/hack-for-la + iconUrl: /svg/icon-medium + header: true + footer: true + +- name: Twitter + link: https://twitter.com/HackForLA + iconUrl: /svg/icon-twitter + header: false + footer: true From 935b1976989e1af2fc77bbeb44ae43ecae3b66d2 Mon Sep 17 00:00:00 2001 From: Roland Abregorivas Date: Wed, 27 Mar 2019 13:05:44 -0700 Subject: [PATCH 04/12] header: create main-nave include file --- _includes/main-nav.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 _includes/main-nav.html diff --git a/_includes/main-nav.html b/_includes/main-nav.html new file mode 100644 index 0000000000..c33c57098b --- /dev/null +++ b/_includes/main-nav.html @@ -0,0 +1,14 @@ + From 75351fc548ad1c501d810acce6a0837b57989513 Mon Sep 17 00:00:00 2001 From: Roland Abregorivas Date: Wed, 27 Mar 2019 13:06:02 -0700 Subject: [PATCH 05/12] header: create social nav include file --- _includes/social.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 _includes/social.html diff --git a/_includes/social.html b/_includes/social.html new file mode 100644 index 0000000000..f4fcfe40db --- /dev/null +++ b/_includes/social.html @@ -0,0 +1,15 @@ + From 3161c13df72609ee788bf725110e20ecb0dbc474 Mon Sep 17 00:00:00 2001 From: Roland Abregorivas Date: Wed, 27 Mar 2019 13:07:05 -0700 Subject: [PATCH 06/12] header: create header.html & include nav & social --- _includes/header.html | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 _includes/header.html diff --git a/_includes/header.html b/_includes/header.html new file mode 100644 index 0000000000..d052c463f2 --- /dev/null +++ b/_includes/header.html @@ -0,0 +1,9 @@ +
+
+
+
Hack for LA
+ {% include svg/logo-hfla.svg %} +
+ {% include main-nav.html %} {% include social.html %} +
+
From 64f69a4ae04daa403e526b43ebd0d6b1d6c3bafd Mon Sep 17 00:00:00 2001 From: Roland Abregorivas Date: Wed, 27 Mar 2019 13:07:55 -0700 Subject: [PATCH 07/12] header: update default with header --- _layouts/default.html | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/_layouts/default.html b/_layouts/default.html index 16092cb2ce..6d7fd27880 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,9 +1,17 @@ - {% include head.html %} - -
- {{ content }} -
- +{% include head.html %} + + +
+ + {%- include header.html -%} +
+ {{ content }} +
+
+ + From 224b0baa1be7ae114fabc5c1cca7127ed335d73c Mon Sep 17 00:00:00 2001 From: Roland Abregorivas Date: Wed, 27 Mar 2019 14:11:53 -0700 Subject: [PATCH 08/12] hero: _include created --- _includes/hero.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 _includes/hero.html diff --git a/_includes/hero.html b/_includes/hero.html new file mode 100644 index 0000000000..c43c20c1e5 --- /dev/null +++ b/_includes/hero.html @@ -0,0 +1,12 @@ +
+
+ {% for item in site.hero %} +

{{ item.title }}

+

{{ item.message }}

+ {% endfor %} + {% include forms/hero-signup.html %} +

+ +

+
+
From 8962999ebcaad5050c0ffca0d32389e47dcabacb Mon Sep 17 00:00:00 2001 From: Roland Abregorivas Date: Wed, 27 Mar 2019 14:12:13 -0700 Subject: [PATCH 09/12] hero: markdown file added --- _hero/hero.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 _hero/hero.md diff --git a/_hero/hero.md b/_hero/hero.md new file mode 100644 index 0000000000..31233478bd --- /dev/null +++ b/_hero/hero.md @@ -0,0 +1,8 @@ +--- +title: You can change LA for the better! +message: + Can you design, write, or code? Are you an activist with an idea? You can help Los Angeles + live up to its potential at + Hack for LA. Everyone is welcome! +--- + From 9be7d18373e2b7c547f266ed22dac735cc3a9177 Mon Sep 17 00:00:00 2001 From: Roland Abregorivas Date: Wed, 27 Mar 2019 14:12:28 -0700 Subject: [PATCH 10/12] hero: signup form added --- _includes/forms/hero-signup.html | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 _includes/forms/hero-signup.html diff --git a/_includes/forms/hero-signup.html b/_includes/forms/hero-signup.html new file mode 100644 index 0000000000..b7046eff4d --- /dev/null +++ b/_includes/forms/hero-signup.html @@ -0,0 +1,9 @@ + From 51df9e4f11fdfc51e3095e86d4e0b5cdc9926401 Mon Sep 17 00:00:00 2001 From: Roland Abregorivas Date: Wed, 27 Mar 2019 14:13:12 -0700 Subject: [PATCH 11/12] hero: sass bg img url updated --- _sass/components/_hero.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_sass/components/_hero.scss b/_sass/components/_hero.scss index f304c09723..ff0b318385 100644 --- a/_sass/components/_hero.scss +++ b/_sass/components/_hero.scss @@ -1,5 +1,5 @@ .hero { - background: $color-blue-dark url("/assets/images/hacknight-women.jpg") center + background: $color-blue-dark url("/assets/images/hero/hacknight-women.jpg") center center no-repeat; background-size: cover; display: flex; From 8bc304627f3fb0f266e8c2ce928d77e7f388a302 Mon Sep 17 00:00:00 2001 From: Roland Abregorivas Date: Wed, 27 Mar 2019 14:14:21 -0700 Subject: [PATCH 12/12] hero: add to collections in config & update index --- _config.yml | 1 + index.html | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/_config.yml b/_config.yml index ff70661fdc..4a736e1c56 100644 --- a/_config.yml +++ b/_config.yml @@ -14,6 +14,7 @@ url: https://hackforla.github.io/website/ collections: projects: output: true + hero: defaults: - scope: diff --git a/index.html b/index.html index ceee186d43..4bc1834cd5 100644 --- a/index.html +++ b/index.html @@ -1,23 +1,23 @@ --- --- - +{%- include hero.html -%}
-

Current Projects

+

Current Projects

    - {% for item in site.projects %} -
  • -
    -
    + {% for item in site.projects %} +
  • +
    +

    {{ item.title }}

    {{ item.dek }}

    +
    -
- - {% endfor %} + + {% endfor %}