Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/data-8/fa24
Browse files Browse the repository at this point in the history
pulling changes
  • Loading branch information
ella-deguzman committed Oct 6, 2024
2 parents 9c06e03 + 89dd2c1 commit aff738a
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 39 deletions.
4 changes: 2 additions & 2 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ links:
demo13: "• [Demo](https://data8.datahub.berkeley.edu/hub/user-redirect/git-pull?repo=https://github.com/data-8/materials-fa24&urlpath=tree/materials-fa24/lec/lec13/lec13.ipynb&branch=main)"
demo14: "• [Demo](https://data8.datahub.berkeley.edu/hub/user-redirect/git-pull?repo=https://github.com/data-8/materials-fa24&urlpath=tree/materials-fa24/lec/lec14/lec14.ipynb&branch=main)"
demo15: "• [Demo](https://data8.datahub.berkeley.edu/hub/user-redirect/git-pull?repo=https://github.com/data-8/materials-fa24&urlpath=tree/materials-fa24/lec/lec15/lec15.ipynb&branch=main)"
demo16: ""
demo16: "• [Demo](https://data8.datahub.berkeley.edu/hub/user-redirect/git-pull?repo=https://github.com/data-8/materials-fa24&urlpath=tree/materials-fa24/lec/lec16/lec16.ipynb&branch=main)"
demo17: ""
demo18: ""
demo19: ""
Expand Down Expand Up @@ -299,7 +299,7 @@ links:
slide13: "[Slides](https://docs.google.com/presentation/d/1g03KPmT194s3jw4BKNBKM4tL-krjWhBBtlL0CgQ7qik/edit?usp=sharing)"
slide14: "[Slides](https://docs.google.com/presentation/d/1PSduHebl6HyV0nF35BXX67Vp-BsA4AGtd4FI1Xa-s9o/edit?usp=sharing)"
slide15: "[Slides](https://docs.google.com/presentation/d/1zhcke7aJil27cVT5vRzh6-o-OXwT6oYxi3R3VnQuBgU/edit?usp=sharing)"
slide16: ""
slide16: "[Slides](https://docs.google.com/presentation/d/1cD0fmo7gl8bLibyk2q6iWDRZpeQ7yWry3bOJeKEN9eU/edit?usp=sharing)"
slide17: ""
slide18: ""
slide19: ""
Expand Down
65 changes: 36 additions & 29 deletions _layouts/schedule.html
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>
8 changes: 0 additions & 8 deletions _staffers/sai_b.md

This file was deleted.

0 comments on commit aff738a

Please sign in to comment.