jekyll-theme-open-course 1.0.1 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee7859ed93d15688c53305eeace80e49bdd6ce3b9228915f87e6ebdf5c97ffb7
-  data.tar.gz: cffa0b043adf2bace48b4f1000bfd08445904f0435e0127a9364fd3db6a72172
+  metadata.gz: 0302d9b2eeb86fdcf21ae00059e4797d3a1c0d298b2bcae75368a494e4380a3c
+  data.tar.gz: 7307c7a5fe6fdf66fc11f71e7cac087426b9a49172aab41b9866ff84c62cf3ef
 SHA512:
-  metadata.gz: 5b6c5e2d47909a8303b7877b2eca4538c33d470737561b1ee872b8bbe26a602637a5bc8acdc2a345e6e87599bfcea01ede52b250fb49410739fbc96486818a93
-  data.tar.gz: f020b4d1c8ceac52fd6dba769f163f2e1062bc03a90d69bd43b569eeb9ac38ed06ef2aae98caacd389aa530f40988712777e3dedbaeb125a7ba40daab9b92e90
+  metadata.gz: 66b64c74eab9cab58bdff61bad762f0dc59e95d9ba9090e2272e1c95e2ab72445cdf8852d45aa95585a9732f7777f12a5de99ffe94f63f85599bf9143174672c
+  data.tar.gz: 22bccb2d57b09c398c7cc8d40318cab06cac9bdb24011cd8da4b370fddcafc0996f09ae67b01fe9a79d49e926ef3288f479c9f4360e97e5341f086131b0b48d3

data/Gemfile.lock

@@ -4,56 +4,58 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.7)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    ffi (1.11.3)
+    ffi (1.13.1)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
-    i18n (1.8.1)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    jekyll (4.0.0)
+    jekyll (4.1.1)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (>= 0.9.5, < 2)
+      i18n (~> 1.0)
       jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
       kramdown (~> 2.1)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3.3)
+      mercenary (~> 0.4.0)
       pathutil (~> 0.9)
       rouge (~> 3.0)
       safe_yaml (~> 1.0)
       terminal-table (~> 1.8)
-    jekyll-sass-converter (2.0.1)
+    jekyll-sass-converter (2.1.0)
       sassc (> 2.0.1, < 3.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.1.0)
+    kramdown (2.3.0)
+      rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.3)
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    mercenary (0.3.6)
+    mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.3)
-    rb-fsevent (0.10.3)
+    public_suffix (4.0.5)
+    rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rouge (3.14.0)
+    rexml (3.2.4)
+    rouge (3.22.0)
     safe_yaml (1.0.5)
-    sassc (2.2.1)
+    sassc (2.4.0)
       ffi (~> 1.9)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
@@ -62,4 +64,4 @@ DEPENDENCIES
   jekyll
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

data/_config.yml

@@ -39,6 +39,8 @@ course:
     - label: Policies
       href: "policies/"
       id: pol
+  css:
+    font-url: "https://use.typekit.net/qqk1feg.css"
 
 collections_dir: syllabus
 

data/_layouts/calendar.html

@@ -4,13 +4,21 @@ layout: default
 {% assign util = site.data.utility %}
 {% assign projects = site.projects %}
 
+{% assign week_count = site.data.calendar | size %}
+{% assign final_week = week_count | minus: 1 %}
+
+{% assign today = "today" | date: "%s" %}
+{% assign last_expiry = site.data.calendar[final_week].expires | date: "%s" %}
+
 {% assign current = true %}
+{% if today > last_expiry %}
+  {% assign current = false %}
+{% endif %}
 
 {% for entry in site.data.calendar %}
   {% assign week_int = forloop.index | times: 1 %}
   {% capture week_num %}{% if week_int < 10 %}0{% endif %}{{ week_int }}{% endcapture %}
   {% assign week = site.weeks[forloop.index0] %}
-  {% assign today = "today" | date: "%s" %}
   {% assign expiry = entry.expires | date: "%s" %}
 
   <!-- past dates? -->
@@ -22,10 +30,11 @@ layout: default
       <header>
     {% endif %}
       <h2>
-        {{ week.theme | escape }}
+        {{ week.theme | markdownify | remove: "<p>" | remove: "</p>" | strip_newlines }}
       </h2>
       <small>Week&nbsp;{{ util.spelled_nums[week_int] }}</small>
     </header>
+    <div class="agendas">
     {% for meeting in week.meetings %}
     <section class="agenda">
       {% if site.course.days.size > 0 %}
@@ -43,11 +52,34 @@ layout: default
       </ol>
     </section>
     {% endfor %}
-    {% if week.readings or week.tasks %}
+    </div>
+    {% assign be = entry.begins | date: "%s" %}
+    {% assign ex = entry.expires | date: "%s" %}
+    {% assign deliverables_li = "" %}
+
+    {%- capture deliverables_li -%}
+    {%- for project in projects -%}
+      {%- assign proj_int = forloop.index | times: 1 -%}
+      {%- capture proj_num -%}{%- if proj_int < 10 -%}0{%- endif -%}{{ proj_int }}{%- endcapture -%}
+      {%- for deliverable in project.deliverables -%}
+        {%- assign dl = deliverable.deadline | date: "%s" -%}
+        {%- if dl >= be and dl <= ex -%}
+          <li class="deadline">Project {{ util.spelled_nums[proj_int] }}: {{ deliverable.action | markdownify | remove: "<p>" | remove: "</p>" | strip_newlines }} (Due by {{ deliverable.deadline | date: "%A, %B %-e" }})</li>
+        {%- endif -%}
+      {%- endfor -%}
+    {%- endfor -%}
+    {%- endcapture -%}
+
+    {% if week.readings or week.tasks or deliverables_li.size > 1%}
     <aside class="assigned">
       <header>
         <h3>Assigned Work</h3>
-        <small>Due {{ entry.expires | date: "%A, %B %-e" }}</small>
+        {% if entry.due_date %}
+          {% assign due_date = entry.due_date %}
+        {% else %}
+          {% assign due_date = entry.expires %}
+        {% endif %}
+        <small>Due {{ due_date | date: "%A, %B %-e" }}</small>
       </header>
       {% if week.readings %}
       <section class="readings">
@@ -70,23 +102,6 @@ layout: default
       </section>
       {% endif %}
 
-          {% assign be = entry.begins | date: "%s" %}
-          {% assign ex = entry.expires | date: "%s" %}
-          {% assign deliverables_li = "" %}
-
-          {%- capture deliverables_li -%}
-          {%- for project in projects -%}
-            {%- assign proj_int = forloop.index | times: 1 -%}
-            {%- capture proj_num -%}{%- if proj_int < 10 -%}0{%- endif -%}{{ proj_int }}{%- endcapture -%}
-            {%- for deliverable in project.deliverables -%}
-              {%- assign dl = deliverable.deadline | date: "%s" -%}
-              {%- if dl >= be and dl <= ex -%}
-                <li class="deadline">Project {{ util.spelled_nums[proj_int] }}: {{ deliverable.action }} (Due by {{ deliverable.deadline | date: "%A, %B %-e" }})</li>
-              {%- endif -%}
-            {%- endfor -%}
-          {%- endfor -%}
-          {%- endcapture -%}
-
       {% if deliverables_li.size > 1 %}
       <!-- {{ deliverables_li.size }} -->
       <section class="deadlines">

data/_layouts/default.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
-<html lang="en" id="{{page.id}}" prefix="og: http://ogp.me/ns#">
-<head>{% assign course = site.course %}{% assign instructor = site.course.instructor %}
+<html lang="en" id="{{page.id}}" prefix="og: http://ogp.me/ns#" class="loading">
+<head>{% assign course = site.course %}{% assign instructor = site.course.instructor %}{% assign ta = site.course.ta %}
   <meta charset="utf-8" />
   <title>{{ course.number }}: {% if page.title %}{{ page.title}}{% else %}{{ course.title }}{% endif %}</title>
   <meta name="viewport" content="width=device-width,initial-scale=1.0,shrink-to-fit=no" />
@@ -17,7 +17,7 @@
 <body>
 <header id="header">
   <h1>
-    <a rel="home" href="{{ site.url }}{{ site.baseurl }}">{{ course.title}}</a>
+    <a rel="home" href="{{ site.url }}{{ site.baseurl }}">{{ course.title}}</a>{% if page.title %}: {{ page.title}}{% endif %}
   </h1>
   <p class="tagline">
     {% if course.tagline %}{{ course.tagline }}{% endif %}
@@ -25,8 +25,8 @@
     {{ course.term }}.
   </p>
   <nav id="quick-nav">
+    <h3 id="nav-con"><a href="#content"><span class="access">Jump to</span> {{ page.title }}</a></h3>
     <ul class="nav">
-      <li id="nav-con"><a href="#content"><span class="access">Jump to</span> {{ page.title }}</a></li>
       <li id="nav-nav"><a href="#full-nav"><span class="access">Jump to</span> Menu</a></li>
     </ul>
   </nav>
@@ -35,28 +35,41 @@
   {{ content }}
 </main>
 
+<aside id="instructor">
+  <header>
+    <h3>Instructor</h3>
+  </header>
+  <ul>
+    <li>
+      <a href="{{ instructor.url }}">{{ instructor.honorific }} {{ instructor.name }}</a>,
+      {{ instructor.full_title | escape }}
+    </li>
+    <li><a href="mailto:{{ instructor.email }}">{{ instructor.email }}</a></li>
+    <li id="office-hours">
+      {{ instructor.office_hours }}
+    </li>
+  </ul>
+  {% if ta.name %}
+  <header>
+    <h3>Teaching Assistant</h3>
+  </header>
+  <ul>
+    <li>
+      {% if ta.url %}<a href="{{ ta.url }}">{% endif %}{{ ta.name }}{% if ta.url %}</a>{% endif %},
+      {{ ta.full_title | escape }}
+    </li>
+    <li><a href="mailto:{{ ta.email }}">{{ ta.email }}</a></li>
+    <li id="office-hours">
+      {{ ta.office_hours }}
+    </li>
+  </ul>
+  {% endif %}
+</aside>
 
 
 <footer id="footer">
-  <section id="instructor">
-    <header>
-      <h3>Instructor</h3>
-    </header>
-    <ul>
-      <li>
-        <a href="{{ instructor.url }}">{{ instructor.honorific }} {{ instructor.name }}</a>,
-        {{ site.course.instructor.full_title | escape }}
-      </li>
-      <li><a href="mailto:{{ instructor.email }}">{{ instructor.email }}</a></li>
-      <li id="office-hours">
-        {{ instructor.office_hours }}
-      </li>
-    </ul>
-  </section>
   <nav id="full-nav">
-    <header>
-      <h3>Navigation</h3>
-    </header>
+    <h3>Navigation</h3>
     <ul class="nav">
       {% for nav in course.navigation %}
       {% assign protocol = nav.href | slice: 0, 4 %}
@@ -70,9 +83,7 @@
     </ul>
   </nav>
   <section id="colophon">
-    <header>
-      <h3>Colophon</h3>
-    </header>
+    <h3>Colophon</h3>
     <p class="fineprint">
       Course syllabus by <a href="{{ instructor.url }}">{{ instructor.name }}</a>.
       Licensed under

data/_layouts/error.html

@@ -0,0 +1,10 @@
+---
+layout: default
+---
+
+<article class="error">
+  <header>
+    <h2>{{ page.title }}</h2>
+  </header>
+  {{ content }}
+</article>

data/_layouts/links.html

@@ -0,0 +1,10 @@
+---
+layout: default
+---
+
+<article class="links">
+  <header>
+    <h2>{{ page.title }}</h2>
+  </header>
+  {{ content }}
+</article>

data/_layouts/projects.html

@@ -19,22 +19,12 @@ layout: default
     <small>Due by {{ project.due_date | date: "%A, %B %-e, %Y"}}</small>
   </header>
 
-  <section class="description">
+  <section class="description {% if project.preview %}preview{% endif %}">
     <h3>Project Description</h3>
     {{ project.content }}
   </section>
 
   {% unless project.preview %}
-  {% if project.goals %}
-  <section class="goals">
-    <h3>Project Goals</h3>
-    <ul>
-    {% for goal in project.goals %}
-      <li>{{ goal | markdownify | remove: "<p>" | remove: "</p>" | strip_newlines }}</li>
-    {% endfor %}
-    </ul>
-  </section>
-  {% endif %}
   {% if project.deliverables %}
   <section class="deliverables">
     <h3>Deliverables and Deadlines</h3>
@@ -66,6 +56,16 @@ layout: default
     </ol>
   </section>
   {% endif %}
+  {% if project.goals %}
+  <section class="goals">
+    <h3>Project Goals</h3>
+    <ul>
+    {% for goal in project.goals %}
+      <li>{{ goal | markdownify | remove: "<p>" | remove: "</p>" | strip_newlines }}</li>
+    {% endfor %}
+    </ul>
+  </section>
+  {% endif %}
   {% endunless %}
 </article>
 {% endfor %}

data/_sass/_base.scss

@@ -0,0 +1,108 @@
+body {
+  line-height: $base-line;
+}
+
+h1,h2,h3,h4,h5,h6 {
+  font-weight: bold;
+}
+h1 {
+  padding-top: $base-line / 2;
+}
+h1 small,
+h1 b {
+  display: block;
+  font-weight: normal;
+}
+h3,
+h4 {
+  text-transform: uppercase;
+  padding-bottom: $base-line / 4;
+}
+h4 {
+  text-transform: none;
+}
+
+p,li {
+  padding-bottom: $base-line;
+  -webkit-hyphens: auto;
+  hyphens: auto;
+}
+
+li {
+  padding-bottom: $base-line / 2;
+}
+ol, ul {
+  padding-bottom: $base-line / 2;
+}
+
+ol ol,
+ol ul,
+ul ol,
+ul ul {
+  padding-top: $base-line / 2;
+  padding-bottom: 0;
+  padding-left: $base-line;
+}
+
+ol ul > li,
+ul ul > li,
+.with::before {
+  margin-left: -($base-line * 1.25);
+}
+ul {
+  list-style-type: square;
+}
+ol {
+  list-style-type: decimal;
+}
+ul, .with::before {
+  list-style-type: none;
+}
+ul li, .with::before {
+  position: relative;
+  padding-left: $base-line;
+  margin-left: -($base-line);
+}
+ul li::before {
+  content: "■";
+  position: absolute;
+  left: $base-line * 0.3;
+  top: -($base-line * 0.065);
+}
+
+ol, .with::before {
+  list-style-type: none;
+  counter-reset: enumerated;
+}
+ol > li, .with::before {
+  position: relative;
+  padding-left: $base-line;
+  margin-left: -($base-line);
+  counter-increment: enumerated;
+}
+ol > li::before {
+  font-weight: bold;
+  content: counter(enumerated) "";
+  position: absolute;
+  left: -($base-line * 0.0375);
+  text-align: right;
+  width: 1em;
+}
+
+b, strong {
+  font-weight: bold;
+}
+
+cite, em, i {
+  font-style: italic;
+}
+code {
+  font-family: Menlo, Monaco, "Droid Sans Mono", Courier, "Courier New", monospace;
+  font-size: 0.85em;
+  hyphens: none;
+}
+
+.access {
+  position: absolute;
+  left: -10000px;
+}