Skip to content

Commit 162a432

Browse files
committed
Separate members page
1 parent 3442a36 commit 162a432

File tree

6 files changed

+35
-18
lines changed

6 files changed

+35
-18
lines changed

_includes/nav.html

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,19 @@
1010
</div>
1111
<div class="navbar-collapse collapse">
1212
<ul class="nav navbar-nav">
13-
<li class="active"><a href="#top-of-page">About</a></li>
14-
<li><a href="#events">Events</a></li>
15-
<li><a href="#presentations">Presentations</a></li>
16-
<li><a href="#projects">Projects</a></li>
17-
<li><a href="#members">Members</a></li>
18-
<li><a href="#resources">Resources</a></li>
19-
<li><a href="#contact">Contact</a></li>
13+
<li{% if page.url == '/index.html' %} class="active"{% endif %}>
14+
<a href="/index.html#top-of-page">About</a>
15+
</li>
16+
<li><a href="/index.html#events">Events</a></li>
17+
<li><a href="/index.html#presentations">Presentations</a></li>
18+
<li><a href="/index.html#projects">Projects</a></li>
19+
<li{% if page.url == '/members/' %} class="active"{% endif %}>
20+
<a href="/members/">Members</a>
21+
</li>
22+
<li><a href="/index.html#resources">Resources</a></li>
23+
<li><a href="/index.html#contact">Contact</a></li>
2024
{% if site.categories.updates.size > 0 %}
21-
<li><a href="#updates">Updates</a></li>
25+
<li><a href="/index.html#updates">Updates</a></li>
2226
{% endif %}
2327
</ul>
2428
<ul class="nav navbar-nav navbar-right">

_layouts/page.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
layout: default
3+
---
4+
<div class="page-header">
5+
<h1>{{ page.title }}</h1>
6+
</div>
7+
<div class="page">
8+
{{ content }}
9+
</div>

css/custom.scss

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ h1, h2, h3, h4 {
8080

8181
.page-header {
8282
text-align: center;
83+
border-bottom: none;
8384
}
8485

8586
.project-thumbnail,
@@ -122,19 +123,15 @@ h1, h2, h3, h4 {
122123
background-color: $dark-muted-teal;
123124
}
124125

125-
.page-section#members {
126-
background-color: $muted-teal;
127-
}
128-
129126
.page-section#resources {
130-
background-color: $dark-muted-teal;
127+
background-color: $muted-teal;
131128
}
132129

133130
.page-section#contact {
131+
background-color: $dark-muted-teal;
134132
}
135133

136134
.page-section#site-footer {
137-
background-color: $muted-teal;
138135
text-align: center;
139136
padding-bottom: 20px;
140137
font-size: 12px;

index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ <h1 id="site-title">{{site.name}}</h1>
1010
{% include events.html %}
1111
{% include presentations.html %}
1212
{% include projects.html %}
13-
{% include members.html %}
1413
{% include resources.html %}
1514
{% include contact.html %}
1615
{% include updates.html %}

js/custom.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@ $(function() {
99
var time_str = time_tag.text();
1010
time_tag.text(moment(time_str).fromNow());
1111
});
12-
$('a[href^=#]').click(function(event) {
12+
$('a[href^="/index.html#"]').click(function(event) {
1313
var link = $(this);
14-
var url = link.attr('href');
14+
var url = link.attr('href').replace(/^\/index.html/, '');
15+
if (window.location.href.indexOf('/members') > -1) {
16+
return true;
17+
}
1518
event.preventDefault();
1619
var area_to_scroll_to = $(url);
1720
var y_offset = area_to_scroll_to.offset().top -

_includes/members.html renamed to members.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
---
2+
layout: page
3+
title: Members
4+
permalink: /members/
5+
---
6+
17
<section id="members" class="page-section">
28
<div class="container">
3-
<h2>Members</h2>
49
{% assign column_counter = 0 %}
510
{% for post in site.categories.members reversed %}
611
{% if column_counter == 3 %}

0 commit comments

Comments
 (0)