Skip to content

Commit

Permalink
2024 announce (#284)
Browse files Browse the repository at this point in the history
* update

* update

* screen

* attr

* dividers

* footer

* role

* fix overflow
  • Loading branch information
garrying committed Apr 16, 2024
1 parent 1b26ebd commit 4c33759
Show file tree
Hide file tree
Showing 36 changed files with 747 additions and 414 deletions.
6 changes: 2 additions & 4 deletions 404.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ order: 0
---

<div class="container">
<div class="post">
<h1>404: Page Not Found</h1>
<p>It looks like nothing was found at this location. <a href="{{ site.baseurl }}/">Return to home page</a>.</p>
</div>
<h1 class="font-display">404: Page Not Found</h1>
<p>It looks like nothing was found at this location. <a href="{{ site.baseurl }}/">Return to home page</a>.</p>
</div>
20 changes: 10 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ GEM
sass-embedded (~> 1.54)
jekyll-watch (2.2.1)
listen (~> 3.0)
json (2.7.1)
json (2.7.2)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
Expand All @@ -81,11 +81,11 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
nokogiri (1.16.3-arm-linux)
nokogiri (1.16.4-arm-linux)
racc (~> 1.4)
nokogiri (1.16.3-arm64-darwin)
nokogiri (1.16.4-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.3-x86_64-linux)
nokogiri (1.16.4-x86_64-linux)
racc (~> 1.4)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
Expand All @@ -95,24 +95,24 @@ GEM
hashery (~> 2.0)
ruby-rc4
ttfunk
public_suffix (5.0.4)
public_suffix (5.0.5)
racc (1.7.3)
rainbow (3.1.1)
rake (13.1.0)
rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.6)
rouge (4.2.1)
ruby-rc4 (0.1.5)
safe_yaml (1.0.5)
sass-embedded (1.72.0-arm-linux-gnueabihf)
sass-embedded (1.75.0-arm-linux-gnueabihf)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.72.0-arm-linux-musleabihf)
sass-embedded (1.75.0-arm-linux-musleabihf)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.72.0-arm64-darwin)
sass-embedded (1.75.0-arm64-darwin)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.72.0-x86_64-linux-gnu)
sass-embedded (1.75.0-x86_64-linux-gnu)
google-protobuf (>= 3.25, < 5.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
Expand Down
14 changes: 11 additions & 3 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
<footer class="footer mt-2 mb-2 pb-s pt-s w-main">
<footer class="footer mt-2 pt-4">
<div class="container flex">
<div class="w-50">
<div class="w-100">
<p><a href="https://twitter.com/{{ site.twitter_username }}" target="_blank" rel="noopener">@{{ site.twitter_username }}</a></p>

<p><a href="{% link code-of-conduct.md %}">Code of Conduct</a>, email <a href="mailto:[email protected]">[email protected]</a></p>
<p></p>

<p><a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a></p>
</div>
</div>
</footer>
<pre role="img" aria-label="ASCII mountains separated by water at night with the moon and stars" class="font-display-mono aliased text-10 mt-0 max-w-prose overflow-hidden inline-flex mb- w-100">
_ . , . .
* / \_ * / \_ _ * * /\'__ *
/ \ / \, (( . _/ / \ *'.
. /\/\ /\/ :' __ \_ ` _^/ ^/ `--.
/ \/ \ _/ \-'\ * /.' ^_ \_ .'\ *
/\ .- `. \/ \ /==~=-=~=-==~=-=~=-=-;. _/ \ -. `_/ \
/ `-.__ ^ / .-'.--\ =-=~_-=~_=_=~_-=~=-=~=^/ _ `--./ .-' `-
/jgs `. / / `.~-^=--^-^=-^=--^=-=~=^=.-' '-._ `._</pre>
1 change: 0 additions & 1 deletion _includes/icons/close.svg

This file was deleted.

43 changes: 12 additions & 31 deletions _includes/nav.html
Original file line number Diff line number Diff line change
@@ -1,40 +1,21 @@
{% assign currentTitle = page.title %}
{% assign current = page.url %}
{% assign sorted_pages = site.pages | sort: "order" %}
{% assign sub_pages = '' | split: '' %}

<header class="header w-100 top-0 mb-2">
<div class="container flex relative m-0 w-100 flex-align-center flex-justify-space-between">
<div class="container relative w-100">
<a class="logo" href="{{ "/" | relative_url }}" rel="home" title="{{ site.title }}">
{% include logo/soon-logo.svg %}
</a>
<input class="menu-btn none" type="checkbox" id="menu-btn" />
<label class="menu-icon none color-white bg-black" for="menu-btn"><span>Menu</span></label>
<label class="menu-icon none text-white bg-black rounded font-mono antialiased p-1 no-underline outlined" for="menu-btn"><span>Menu</span></label>
<nav class="nav w-100" aria-label="Primary Menu">
<ul class="menu flex w-100 text-center ls-none">
{% assign currentTitle = page.title %}
{% assign current = page.url %}
{% assign sorted_pages = site.pages | sort: "order" %}
{% for page in sorted_pages %}
{% if page.order > 0 and page.parent == nil %}
<li>
<a class="nav-item {% if current != '/' %}{% if page.url == current %}active{% endif %}{% endif %}"
href="{% if page.content.size > 1 %}{{ page.url | relative_url }}{% else %}#{% endif %}" aria-label="{{ page.title }}">
{% if page.titleDisplay %}{{ page.titleDisplay }}{% else %}{{ page.title }}{% endif %}
</a>
{% assign sorted2_pages = site.pages | sort: "order" %}
<ul class="nav-item-sub" aria-hidden="true">
{% if page.title == "Previous years" %}
{%- for year in site.data.previous-years -%}
<li><a href="{{ year.redirect_to }}" aria-label="{{ year.titleDisplay }}" target="_blank">{{ year.titleDisplay }}</a></li>
{%- endfor -%}
{% else %}
{%- for page2 in sorted2_pages -%}
{% if page.title == page2.parent %}
<li><a class="{% if current != '/' %}{% if page2.url == current %}active{% endif %}{% endif %}" href="{% if page2.redirect_to %}{{ page2.redirect_to }}{% else %}{{ page2.url }}{% endif %}" aria-label="{% if page2.titleDisplay %}{{ page2.titleDisplay }}{% else %}{{ page2.title }}{% endif %}">{% if page2.titleDisplay %}{{ page2.titleDisplay }}{% else %}{{ page2.title }}{% endif %}</a></li>
{% endif %}
{%- endfor -%}
{% endif %}
</ul>
</li>
{% endif %}
{% endfor %}
</ul> <!-- .nav -->
<pre class="leading-normal"><ul class="menu w-100 gap-4 list-none"><a class="hover-ornament {% if current == '/' %}active{% endif %}" href="{{ "/" | relative_url }}" rel="home" title="{{ site.title }}">ournetworks.ca</a>{% for page in sorted_pages %}{% if page.order > 0 and page.parent == nil %}<li>{% if forloop.last %}└── {% else %}β”œβ”€β”€ {% endif %}<a class="hover-ornament {% if current != '/' %}{% if page.url == current %}active{% endif %}{% endif %}"
href="{% if page.content.size > 1 %}{{ page.url | relative_url }}{% else %}#{% endif %}" aria-label="{{ page.title }}">{% if page.titleDisplay %}{{ page.titleDisplay }}{% else %}{{ page.title }}{% endif %}</a>{% assign sorted2_pages = site.pages | sort: "order" %}<ul class="nav-item-sub">{% if page.title == "Previous years" %}{%- for year in site.data.previous-years -%}<li>β”‚ {% if forloop.last %}└── {% else %}β”œβ”€β”€ {% endif %}<a class="hover-ornament" href="{{ year.redirect_to }}" aria-label="{{ year.titleDisplay }}" target="_blank">{{ year.titleDisplay }}</a></li>
{%- endfor -%}{% else %}{%- for page2 in sorted2_pages -%}{% if page.title == page2.parent %}{% assign sub_pages = sub_pages | push: page2 %}
{%- for page in sub_pages -%}
<li>β”‚ {% if forloop.last %}└── {% else %}β”œβ”€β”€ {% endif %}<a class="hover-ornament {% if current != '/' %}{% if page.url == current %}active{% endif %}{% endif %}" href="{% if page.redirect_to %}{{ page.redirect_to }}{% else %}{{ page.url }}{% endif %}" aria-label="{% if page.titleDisplay %}{{ page.titleDisplay }}{% else %}{{ page.title }}{% endif %}">{% if page.titleDisplay %}{{ page.titleDisplay }}{% else %}{{ page.title }}{% endif %}</a></li>{% endfor %}{% endif %}{%- endfor -%}{% endif %}</ul></li>{% endif %}{% endfor %}</ul></pre><!-- .nav -->
</nav>
</div>
</header>
28 changes: 14 additions & 14 deletions _includes/session-video.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="session-video-detail w-50 mb-1">
<article class="session-video-detail w-50 mb-1">
<div class="video-thumbnail relative">
{%- if session.ipfs720 -%}
<a href="https://{{ include.year }}.ournetworks.ca/video/?ipfs={{ session.ipfs720 }}" title="View {{ session.title }}">
Expand All @@ -11,10 +11,10 @@
<img src="https://img.youtube.com/vi/{{ session.youtube }}/maxresdefault.jpg" loading="lazy" alt="Video thumbnail for {{ session.title }}" />
</a>
</div>
<header class="m-1">
<h3 class="mb-0 mt-0">{{ session.title }}</h3>
<header class="mt-1">
<h3 class="mb-0 mt-0 font-display">{{ session.title }}</h3>
{%- if session.presenterID -%}
<h4 class="session-presenter fs-small mt-1 fw-normal">
<h4 class="session-presenter text-sm mt-1 font-normal">
{% assign presenters = site.data.presenters[include.year] %}
{% assign presenterCount = session.presenterID.size %}
{%- for presenterID in session.presenterID -%}
Expand All @@ -29,23 +29,23 @@ <h4 class="session-presenter fs-small mt-1 fw-normal">
</h4>
{%- endif -%}
</header>
<div class="m-1">
<div class="fs-small">
{{ session.description | truncatewords: 20 | markdownify }}
<section>
<div>
<p class="text-xs">{{ session.description | truncatewords: 20 | markdownify | strip_html }}</p>
{%- unless session.sessionType == "orga" or session.sessionType == "lightning-talk" -%}
<p><span class="read-more">
<a href="https://{{ include.year }}.ournetworks.ca/{%- if include.program-path -%}{{ include.program-path }}{% else %}program{%- endif -%}/#{{ session.title | truncatewords: 6, '' | downcase | replace: ':', '' | replace: ' ', '-' }}" rel="noopener">See session description</a></span></p>
<p class="text-sm">
<a href="https://{{ include.year }}.ournetworks.ca/{%- if include.program-path -%}{{ include.program-path }}{% else %}program{%- endif -%}/#{{ session.title | truncatewords: 6, '' | downcase | replace: ':', '' | replace: ' ', '-' }}" rel="noopener">See session description</a></p>
{%- endunless -%}
<div class="video-links-container pt-1">
<h5 class="fs-normal fw-normal mt-0">Watch elsewhere:</h5>
<h5 class="text-base mt-0 mb-0 font-display">Watch elsewhere:</h5>
{%- if session.ipfs720 or session.ipfs1080 or session.youtube -%}
<ul class="ls-none p-0">
<ul class="list-none p-0 text-xs font-mono">
{%- if session.ipfs720 -%}<li class="video-links-item"><a href="{{ site.ipfs_gateway }}/ipfs/{{ session.ipfs720 }}" target="_blank" rel="noopener"><code>[&nbsp;720p]</code>ipfs://{{ session.ipfs720 }}</a></li>{%- endif -%}
{%- if session.ipfs1080 -%}<li class="video-links-item"><a href="{{ site.ipfs_gateway }}/ipfs/{{ session.ipfs1080 }}" target="_blank" rel="noopener"><code>[1080p]</code>ipfs://{{ session.ipfs1080 }}</a></li>{%- endif -%}
{%- if session.youtube -%}<li class="video-links-item"><a href="https://youtu.be/{{ session.youtube }}" target="_blank" rel="noopener">youtu.be/{{ session.youtube }}</a></li>{%- endif -%}
{%- if session.youtube -%}<li><a href="https://youtu.be/{{ session.youtube }}" target="_blank" rel="noopener">youtu.be/{{ session.youtube }}</a></li>{%- endif -%}
</ul>
{%- endif -%}
</div>
</div>
</div>
</div>
</section>
</article>
74 changes: 50 additions & 24 deletions _layouts/default.html
Original file line number Diff line number Diff line change
@@ -1,30 +1,56 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>{% if page.title %}{{ page.title }} | {% endif %}{{ site.title }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
{% capture sitedescription %}{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}{% endcapture %}
<meta name="description" content="{{ sitedescription }}">
<meta name="twitter:title" content="{{ site.title }}">
<meta name="twitter:site" content="@_ournetworks">
<meta name="twitter:card" content="summary">
<meta name="twitter:description" content="{{ sitedescription }}">
<meta name="twitter:image" content="{{ site.social_image | prepend: site.url }}">
<meta property="og:title" content="{{ site.title }}">
<meta property="og:type" content="website">
<meta property="og:url" content="{{ site.url }}">
<meta property="og:description" content="{{ sitedescription }}">
<meta property="og:image" content="{{ site.social_image | prepend: site.url }}">
<link rel="stylesheet" href="{{ '/css/main.css' | relative_url }}?{{ site.time | date: '%s%N' }}">
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.url }}">
<meta charset="utf-8" />
<title>
{% if page.title %}{{ page.title }} | {% endif %}{{ site.title }}
</title>
<meta
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
{% capture sitedescription %}{% if page.excerpt %}{{ page.excerpt |
strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description
}}{% endif %}{% endcapture %}
<meta name="description" content="{{ sitedescription }}" />
<meta name="twitter:title" content="{{ site.title }}" />
<meta name="twitter:site" content="@_ournetworks" />
<meta name="twitter:card" content="summary_large_image" />
<meta name="twitter:url" content="{{ site.url }}">
<meta name="twitter:description" content="{{ sitedescription }}" />
<meta
name="twitter:image"
content="{{ site.social_image | prepend: site.url }}"
/>
<meta property="og:title" content="{{ site.title }}" />
<meta property="og:type" content="website" />
<meta property="og:url" content="{{ site.url }}" />
<meta property="og:description" content="{{ sitedescription }}" />
<meta
property="og:image:alt"
content="ASCII mountains and clouds in the background with a laptop in the foreground and DOES NOT COMPUTE on the screen"
/>
<meta
property="og:image"
content="{{ site.social_image | prepend: site.url }}"
/>
<link
rel="stylesheet"
href="{{ '/css/main.css' | relative_url }}?{{ site.time | date: '%s%N' }}"
/>
<link
rel="canonical"
href="{{ page.url | replace:'index.html','' | prepend: site.url }}"
/>
</head>
<body>
<main>
{% include nav.html %}
{{ content }}
{% include footer.html %}
<body class="bg-beige">
<main class="max-w-prose mx-auto">
{% include nav.html %} {{ content }} {% include footer.html %}
</main>
<script async src="{{ '/js/main.js' | relative_url }}?{{ site.time | date: '%s%N' }}"></script>
<script src="{{ '/js/vendor/asciiMorph.js' | relative_url }}"></script>
<script
async
src="{{ '/js/main.js' | relative_url }}?{{ site.time | date: '%s%N' }}"
></script>
</body>
</html>
12 changes: 5 additions & 7 deletions _layouts/page.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
---
layout: default
---

<div class="container">
<article class="post w-main">
<div class="max-w-prose">
<header>
<h1 class="{{ page.titleClasses }}">{{ page.title }}</h1>
<h1 class="{{ page.titleClasses }} font-display">{{ page.title }}</h1>
</header>

<div class="post-content">
{{ content }}
</div>

</article>
<section>{{ content }}</section>
</div>
</div>
30 changes: 27 additions & 3 deletions _layouts/splash.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,33 @@
---
layout: default
---

<div class="container">
<header>
<h1 class="heading-display fw-normal">Our Networks 2024</h1>
<header>
<h1 class="font-display text-sm">Our Networks 2024</h1>
<h2 class="font-display text-4xl mt-0">Does not (cloud) compute</h2>
<h3 class="font-display text-2xl">July 27, 2024</h3>
<h4 class="font-display text-2xl mb-0">
<a href="https://312main.ca/" target="_blank">312 Main</a>
</h4>
<h5 class="font-display text-2xl mt-0 mb-0">Vancouver, BC</h5>
</header>
{{ content }}
<div>
<pre role="img" aria-label="ASCII mountains and clouds in the background with a laptop in the foreground with NETWORK IS OPTIONAL and DOES NOT COMPUTE text on the screen" class="font-display-mono aliased text-10 max-w-prose overflow-hidden">
.--..-. .--. _.-.
( ) ) ☼ ( )' )
.-' `-. ☼ .-'. `-.
_ ( _.-~-._)-' __ ( ) ) )
-~ ~-._ _.-~ ~-._..--~~--._.-~ ~~--..__-----' `-'
_.-~ ~-._ _.-~ ~~--..__ ___..
_.-~ Β· _____________ . ~-._.
|β–‘β–‘β–‘β–‘β–‘β–‘β–‘β–‘β–‘β–‘β–‘β–‘<span class="text-accent">Γ—</span>| Β·. ~-._ . . Β·Β· . .
<span class="screen"></span>
|β–‘β–‘β–‘β–‘β–‘β–‘β–‘β–‘β–‘β–‘β–‘β–‘β–‘|
\\###########\\
\ ___ \
\_____\__\____\</pre>
</div>
<div class="max-w-prose">{{ content }}</div>
</div>

36 changes: 20 additions & 16 deletions _sass/_base.scss
Original file line number Diff line number Diff line change
@@ -1,26 +1,30 @@
// Base Styling
// Images

a {
color: inherit;
text-underline-offset: 0.2rem;

body {
font: $base-font-weight #{$base-font-size}/#{$base-line-height} $base-font-family;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
&:active {
color: var(--accent);
}
}

// Images
p {
@extend .leading-relaxed;
@extend .text-base;
}

ul {
@extend .leading-relaxed;
}

img {
max-width: 100%;
height: auto;
}

// Links

a {
color: var(--black);

&:hover,
&:focus,
&.active {
text-decoration: none;
}
hr {
border: 0;
background-color: var(--black);
height: 1px;
}
Loading

0 comments on commit 4c33759

Please sign in to comment.