Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
garrying committed Apr 11, 2024
1 parent 2bc554a commit 1ff8957
Show file tree
Hide file tree
Showing 13 changed files with 178 additions and 110 deletions.
18 changes: 16 additions & 2 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<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>
Expand All @@ -10,3 +10,17 @@
</div>
</div>
</footer>
<pre class="font-display-mono aliased text-10 mt-0 max-w-prose overflow-scroll">
`::`
/
` `;:`
_
_(_)_ wWWWw _
@@@@ (_)@(_) vVVVv _ @@@@ (___) _(_)_
@@()@@ wWWWw (_)\ (___) _(_)_ @@()@@ Y (_)@(_)
@@@@ (___) `|/ Y (_)@(_) @@@@ \|/ (_)\
/ Y \| \|/ /(_) \| |/ |
\ | \ |/ | / \ | / \|/ |/ \| \|/
jgs \\|// \\|/// \\\|//\\\|/// \|/// \\\|// \\|// \\\|//
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^</pre>

45 changes: 13 additions & 32 deletions _includes/nav.html
Original file line number Diff line number Diff line change
@@ -1,40 +1,21 @@
<header class="header w-100 top-0 mb-2 font-display font-medium">
<div class="container flex relative w-100 flex-align-center flex-justify-space-between">
{% 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 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 text-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 gap-4 text-center list-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>
6 changes: 3 additions & 3 deletions _includes/session-video.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<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">
<header class="mt-1">
<h3 class="mb-0 mt-0 font-display">{{ session.title }}</h3>
{%- if session.presenterID -%}
<h4 class="session-presenter text-sm mt-1 font-normal">
Expand All @@ -29,7 +29,7 @@ <h4 class="session-presenter text-sm mt-1 font-normal">
</h4>
{%- endif -%}
</header>
<div class="m-1">
<section>
<div class="text-xs">
{{ session.description | truncatewords: 20 | markdownify }}
{%- unless session.sessionType == "orga" or session.sessionType == "lightning-talk" -%}
Expand All @@ -47,5 +47,5 @@ <h5 class="text-base mt-0 mb-0 font-display">Watch elsewhere:</h5>
{%- endif -%}
</div>
</div>
</div>
</section>
</article>
2 changes: 1 addition & 1 deletion _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
/>
</head>
<body class="bg-beige">
<main>{% include nav.html %} {{ content }} {% include footer.html %}</main>
<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' }}"
Expand Down
4 changes: 2 additions & 2 deletions _layouts/page.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
---

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

<div>{{ content }}</div>
<section>{{ content }}</section>
</article>
</div>
31 changes: 25 additions & 6 deletions _layouts/splash.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,30 @@

<div class="container">
<header>
<h1 class="font-display">Our Networks 2024</h1>
<h2 class="font-display">Does not (cloud) compute</h2>
<h3 class="font-display">July 27, 2024</h3>
<h4 class="font-display">312 Main</h4>
<h5 class="font-display">Vancouver, BC</h5>
<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 class="font-display-mono aliased text-10 max-w-prose overflow-scroll">
.--..-. .--. _.-.
( ) ) ☼ ( )' )
.-' `-. ☼ .-'. `-.
_ ( _.-~-._)-' __ ( ) ) )
-~ ~-._ _.-~ ~-._..--~~--._.-~ ~~--..__-----' `-'
_.-~ ~-._ _.-~ ~~--..__ ___..
_.-~ · _____________ . ~-._.
|░░░░░░░░░░░░░| ·. ~-._ . . ·· . .
|░░░░░☺░░░░░░░|
|░░░░░░░░░░░░░|
|░░░░░░░░░░░░░|
\\###########\\
\ ___ \
\_____\__\____\</pre>
</div>
<div class="max-w-prose">{{ content }}</div>
</div>
4 changes: 2 additions & 2 deletions _sass/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ a {
}

p {
@extend .text-sm;
line-height: 1.5;
@extend .text-base;
@extend .leading-relaxed;
}

img {
Expand Down
46 changes: 35 additions & 11 deletions _sass/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
overflow: hidden;
}

// Grid

.content-width {
max-width: $content-width;
.overflow-scroll {
overflow: scroll;
}

// Grid

.container {
padding: 0 20px;
padding: 0 1.25rem;
}

.none {
Expand Down Expand Up @@ -89,8 +89,9 @@
}
}

.w-main {
max-width: $content-width;

.max-w-prose {
max-width: 65ch;
}

// Padding
Expand All @@ -99,12 +100,17 @@
padding: 0;
}

.pt-s {
padding-top: 1em;
.pt-4 {
padding-top: 1rem;
}

.p-1 {
padding: 0.25rem;
}

.pb-s {
padding-bottom: 1em;
.px-2 {
padding-left: 1rem;
padding-right: 1rem;
}

// Margin
Expand Down Expand Up @@ -153,8 +159,26 @@
margin-right: 1em;
}

.mx-auto {
margin-left: auto;
margin-right: auto;
}

// Gap

.gap-4 {
gap: 1rem;
}

.rounded {
border-radius: 0.25rem;
}

.outlined:hover, .outlined:focus {
outline: 1px solid var(--black);
outline-offset: 0.2rem;
}

.outlined:active {
outline-width: 2px;
}
Loading

0 comments on commit 1ff8957

Please sign in to comment.