-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' of https://github.com/data-8/fa24
pulling changes
- Loading branch information
Showing
3 changed files
with
38 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,34 +1,41 @@ | ||
{% assign start_time = page.timeline | first %} | ||
{% capture offset %}{% include minutes.liquid time=start_time %}{% endcapture %} | ||
<div class="schedule"> | ||
<ul class="schedule-timeline" style="min-width: {{ page.schedule | size | times: 120 }}px"> | ||
{% for time in page.timeline %} | ||
<li class="schedule-time">{{ time }} </li> | ||
{% endfor %} | ||
</ul> | ||
<ul class="schedule-group"> | ||
{% for day in page.schedule %} | ||
<li class="schedule-day"> | ||
<h2 class="schedule-header">{{ day.name }}</h2> | ||
{% if day.events %} | ||
<ul class="schedule-events" style="height: {{ page.timeline | size | times: 40 }}px"> | ||
{% for event in day.events %} | ||
{% capture start %}{% include minutes.liquid time=event.start %}{% endcapture %} | ||
{% capture end %}{% include minutes.liquid time=event.end %}{% endcapture %} | ||
{% assign top = start | minus: offset | times: 40 | divided_by: 30 %} | ||
{% assign height = end | minus: start | times: 40 | divided_by: 30 %} | ||
<li class="schedule-event {% if event.class %}{{ event.class }}{% else %}{{ event.name | slugify }}{% endif %}" | ||
style="top: {{ top }}px; height: {{ height }}px;"> | ||
<div class="name">{{ event.name }}</div> | ||
<div class="time">{{ event.start }}–{{ event.end }}</div> | ||
{% if event.location %} | ||
<div class="location">{{ event.location }}</div> | ||
{% endif %} | ||
</li> | ||
{% endfor %} | ||
<div style="display: flex;"> | ||
<!-- Timeline Column --> | ||
<div style="width: 15%; margin-right: 2%; min-width: 75px; max-width: 75px"> | ||
<ul class="schedule-timeline" style="min-width: {{ page.schedule | size | times: 120 }}px;"> | ||
{% for time in page.timeline %} | ||
<li class="schedule-time">{{ time }} </li> | ||
{% endfor %} | ||
</ul> | ||
{% endif %} | ||
</li> | ||
{% endfor %} | ||
</ul> | ||
</div> | ||
|
||
<!-- Schedule Column --> | ||
<ul class="schedule-group" style="flex-grow: 1;"> | ||
{% for day in page.schedule %} | ||
<li class="schedule-day"> | ||
<h2 class="schedule-header">{{ day.name }}</h2> | ||
{% if day.events %} | ||
<ul class="schedule-events" style="height: {{ page.timeline | size | times: 40 }}px"> | ||
{% for event in day.events %} | ||
{% capture start %}{% include minutes.liquid time=event.start %}{% endcapture %} | ||
{% capture end %}{% include minutes.liquid time=event.end %}{% endcapture %} | ||
{% assign top = start | minus: offset | times: 40 | divided_by: 30 %} | ||
{% assign height = end | minus: start | times: 40 | divided_by: 30 %} | ||
<li class="schedule-event {% if event.class %}{{ event.class }}{% else %}{{ event.name | slugify }}{% endif %}" | ||
style="top: {{ top }}px; height: {{ height }}px;"> | ||
<div class="name">{{ event.name }}</div> | ||
<div class="time">{{ event.start }}–{{ event.end }}</div> | ||
{% if event.location %} | ||
<div class="location">{{ event.location }}</div> | ||
{% endif %} | ||
</li> | ||
{% endfor %} | ||
</ul> | ||
{% endif %} | ||
</li> | ||
{% endfor %} | ||
</ul> | ||
</div> | ||
</div> |
This file was deleted.
Oops, something went wrong.