Skip to content

Commit b3adb9f

Browse files
maxx1128maxx1128
committed
Updated partials
1 parent 5be60cc commit b3adb9f

File tree

6 files changed

+211
-39
lines changed

6 files changed

+211
-39
lines changed

‎_data/menu.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
- name: About
22
link: '/about/'
33

4-
- name: Blog
5-
link: '/blog/'
6-
7-
- name: Developers
8-
link: '/developers'
4+
- name: Events
5+
link: '/events/'
96

107
- name: Contact
11-
link: 'http://groups.google.com/forum/?fromgroups#!forum/newhavenio'
8+
link: '/contact/'
9+
10+
- name: Code of Conduct
11+
link: 'https://github.com/newhavenio/code-of-conduct/blob/master/README.md'
12+
external: true

‎_data/social-links.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
- name: Slack
2+
label: Chat with us on
3+
link: https://newhavenio-slackin.herokuapp.com/
4+
5+
- name: Twitter
6+
label: Talk with us on
7+
link: http://www.twitter.com/newhavenio
8+
9+
- name: Meetup
10+
label: Find us on
11+
link: http://www.meetup.com/newhavenio/

‎_includes/footer.html‎

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,39 @@
1-
<footer class="site-footer">
1+
<!-- Have the description not appear on homepage -->
2+
<!-- Social links -->
23

3-
<div class="container-fluid">
4-
<div class="row">
5-
6-
<div class="footer-links col-sm-6 col-md-8">
7-
{% for menu in site.data.menu %}
8-
<a href="{{ menu.link | prepend: site.baseurl }}">
4+
<footer class="mt-auto bg-teal-darker text-grey-lighter shadow-lg">
5+
<div class="nh-o-maxWidth flex flex-col">
6+
{% unless page.url == "/" %}
7+
<p class="pb-6 text-teal-lighter leading-normal">
8+
{{ site.description }}
9+
</p>
10+
11+
<ul class="flex mb-6 list-reset">
12+
{% for menu in site.data.menu %}
13+
{% if page.url == menu.link %}
14+
{% assign link = '#main' %}
15+
{% assign active_classes = 'font-semibold' %}
16+
{% else %}
17+
{% assign link = menu.link | prepend: site.baseurl %}
18+
{% assign active_classes = 'text-sm' %}
19+
{% endif %}
20+
<li>
21+
<a {% if menu.external %}target="_blank" rel="noopener"{% endif %} class="inline-block mr-4 text-teal-lighter {{ active_classes }}" href="{{ link }}">
922
{{ menu.name }}
10-
</a>{% if forloop.last == false %} / {% endif %}
23+
</a>
24+
</li>
1125
{% endfor %}
12-
</div>
26+
</ul>
27+
{% endunless %}
1328

14-
<div class="col-sm-6 col-md-4">
15-
<a href="{{ menu.link | prepend: site.baseurl }}">
16-
<h4 class="footer-heading">
17-
{{ site.title }}
18-
</h4>
19-
</a>
20-
</div>
21-
</div>
29+
<ul class="flex mb-6 list-reset">
30+
{% for social in site.data.social-links %}
31+
<li>
32+
<a target="_blank" rel="noopener" href="{{ social.link }}" class="inline-block mr-4 text-teal-lighter text-sm">
33+
{{ social.name }}
34+
</a>
35+
</li>
36+
{% endfor %}
37+
</ul>
2238
</div>
23-
24-
<script src="{{ "/js/modernizr.min.js" | prepend: site.baseurl }}"></script>
25-
<script>
26-
// Makes all blog links open in a new tab
27-
$('article.post a').each(function() {
28-
$(this).attr('target', '_blank');
29-
});
30-
</script>
3139
</footer>

‎_includes/head.html‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,23 @@
1616
<title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
1717
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
1818

19-
<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
2019
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
2120
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">
22-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
23-
<link href='https://fonts.googleapis.com/css?family=Montserrat|Open+Sans:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
2421

25-
<script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/0.7.21/webcomponents-lite.min.js"></script>
26-
<script type="text/javascript" src="{{ '/js/bundle.js' | prepend: site.baseurl }}" charset="utf8" ></script>
27-
<script src="{{ "/js/components/meetup-utils.js" | prepend: site.baseurl }}"></script>
22+
<style type="text/css">
23+
{% include main.css %}
24+
</style>
25+
26+
{% if page.meetup_events %}
27+
<script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/0.7.21/webcomponents-lite.min.js"></script>
28+
<script type="text/javascript" src="{{ '/js/bundle.js' | prepend: site.baseurl }}" charset="utf8" ></script>
29+
<script src="{{ "/js/components/meetup-utils.js" | prepend: site.baseurl }}"></script>
30+
<link rel="import" href="{{ "/js/components/meetup-events.html" | prepend: site.baseurl }}">
31+
<link rel="import" href="{{ "/js/components/meetup-event-card.html" | prepend: site.baseurl }}">
32+
{% endif %}
2833

2934
{% if jekyll.environment == 'production' %}
30-
{% include analytics.html %}
35+
{% include analytics.html %}
3136
{% endif %}
32-
37+
3338
</head>

‎_includes/nav.html‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{% if page.url == '/' %}
2+
{% assign home_link = '#main' %}
3+
{% else %}
4+
{% assign home_link = '/' | site.baseurl %}
5+
{% endif %}
6+
7+
<header class="border-orange border-t-3 border-b-3 bg-grey-lightest shadow-md" role="banner">
8+
<div class="nh-o-maxWidth py-0 flex items-center justify-between">
9+
<a href="{{ home_link }}" class="inline-flex pr-8">
10+
<img class="w-16" src="/img/logo.svg" alt="NewHaven.IO homepage">
11+
</a>
12+
<nav>
13+
<ul class="list-reset flex flex-wrap items-center justify-end">
14+
{% for menu in site.data.menu %}
15+
{% if page.url == menu.link %}
16+
{% assign link = '#main' %}
17+
{% assign active_classes = 'font-semibold text-base' %}
18+
{% else %}
19+
{% assign link = menu.link | prepend: site.baseurl %}
20+
{% assign active_classes = '' %}
21+
{% endif %}
22+
<li>
23+
<a {% if menu.external %}target="_blank" rel="noopener"{% endif %} class="inline-block p-3 md:p-4 {{ active_classes }}" href="{{ link }}">
24+
{{ menu.name }}
25+
</a>
26+
</li>
27+
{% endfor %}
28+
</ul>
29+
</nav>
30+
</div>
31+
</header>

‎img/logo.svg‎

Lines changed: 116 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)