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

Jump to bottom

Created linking from hours to coords and modified the coords layout #125

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Created linking from hours to coords and modified the coords layout #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99ec8b7
Created linking from hours to coords and modified the coords layout
Sep 8, 2018
e038eee
updated JSON package, reverted to 3 column with link anchors, fixed R…
awlevin Sep 9, 2018
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
4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ GEM
gemoji (~> 2.0)
html-pipeline (~> 2.2)
jekyll (>= 3.0)
json (1.8.3)
json (1.8.6)
kramdown (1.11.1)
liquid (3.0.6)
listen (3.0.6)
Expand Down Expand Up @@ -127,4 +127,4 @@ DEPENDENCIES
github-pages!

BUNDLED WITH
1.12.5
1.16.4
12 changes: 6 additions & 6 deletions _data/hours.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
8:50AM: ''
9:55AM: ''
11:00AM: 'Claire Jolly'
12:05PM: 'Roz Stengle'
1:20PM: 'Jonas klare'
12:05PM: 'Rosalind Stengle'
1:20PM: 'Jonas Klare'
2:25PM: 'Jonas Klare'
3:30PM: 'Claire Jolly'
4:35PM: 'Andrew Geng'
Expand All @@ -39,12 +39,12 @@
times:
8:50AM: ''
9:55AM: ''
11:00AM: 'Roz Stengle'
11:00AM: 'Rosalind Stengle'
12:05PM: 'Claire Jolly'
1:20PM: 'David Chen'
2:25PM: 'Andew Petti'
2:25PM: 'Andrew Petti'
3:30PM: 'Maya Subramaniam'
4:35PM: 'Andew Geng'
4:35PM: 'Andrew Geng'
5:40PM: ''

- day: Friday
Expand All @@ -54,7 +54,7 @@
11:00AM: 'John Balis'
12:05PM: 'Harrison Brewton'
1:20PM: 'Aaron Levin'
2:25PM: 'Andew Petti'
2:25PM: 'Andrew Petti'
3:30PM: 'Harrison Brewton'
4:35PM: ''
5:40PM: ''
47 changes: 25 additions & 22 deletions coords.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,30 @@ <h2>Coordinators</h2>
<ul class="coords-list">
{% assign coords = site.data.coords | sort: 'name' %}
{% for coord in coords %}
<li>
{% assign photo = coord.photo || 'default.png' %}
<div class="coord-mug"><img title="{{coord.name}}" src="{{'images/coords/' | append: photo | prepend: site.baseurl }}" /></div>
<h4>{{ coord.name }}</h4>
<div class="coord-info">
<p>
{{ coord.year }} majoring in {{ coord.major }}
<br />
{% if coord.emoji %}
<p>Favorite emoji:
<img class="emoji" title=":{{ coord.emoji }}:" alt=":{{ coord.emoji }}:" src="https://assets-cdn.github.com/images/icons/emoji/{{coord.emoji}}.png" height="20" width="20" align="absmiddle" />
</p>
{% endif %}
{% if coord.github %}
<a title="{{ coord.name }}: GitHub" href="{{ coord.github }}">GitHub</a>
{% endif %}
{% if coord.website %}
<a title="{{ coord.name }}: Website" href="{{ coord.website }}">Website</a>
{% endif %}
</p>
</div>
</li>

<li id="{{ coord.name }}">
{% assign photo = coord.photo || 'default.png' %}
<div><a href="#{{ coord.name }}"></a></div>
<div class="coord-mug"><img title="{{coord.name}}" src="{{'images/coords/' | append: photo | prepend: site.baseurl }}" /></div>
Copy link
Member

Choose a reason for hiding this comment

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

Put a line break in here somewhere.

<h4>{{ coord.name }}</h4>
<div class="coord-info">
<p>
{{ coord.year }} majoring in {{ coord.major }}
<br />
{% if coord.emoji %}
<p>Favorite emoji:
<img class="emoji" title=":{{ coord.emoji }}:" alt=":{{ coord.emoji }}:" src="https://assets-cdn.github.com/images/icons/emoji/{{coord.emoji}}.png" height="20" width="20" align="absmiddle" />
Copy link
Member

Choose a reason for hiding this comment

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

Here too. Attributes should be able to be across multiple lines.

Copy link
Member

Choose a reason for hiding this comment

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

Basically, 80 character limit please 😸

</p>
{% endif %}
{% if coord.github %}
<a title="{{ coord.name }}: GitHub" href="{{ coord.github }}">GitHub</a>
{% endif %}
{% if coord.website %}
<a title="{{ coord.name }}: Website" href="{{ coord.website }}">Website</a>
{% endif %}
</p>
</div>
</li>

{% endfor %}
</ul>
4 changes: 2 additions & 2 deletions hours.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
{% if site.data.lab.hours == false %}
<p>We are not currently holding any official office hours. Check back during the school year. There may be coords in the UPL during the summer; if the door is open, you are welcome to come in.</p>
{% else %}
<strong>The schedule below is for Spring 2018!</strong>
<strong>The schedule below is for Fall 2018!</strong>
{% include current-coord.html %}
<table class="hours striped large-only">
<tbody>
Expand All @@ -30,7 +30,7 @@
{% for day in site.data.hours %}
{% for t in day.times %}
{% if forloop.index == t_index %}
<td>{{ t[1] }}</td>
<td><a href="/coords.html#{{ t[1] }}">{{ t[1] }}</a></td>
{% endif %}
{% endfor %}
{% endfor %}
Expand Down