Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
garrying committed Jun 23, 2024
1 parent 0f2e1cf commit edb888e
Show file tree
Hide file tree
Showing 9 changed files with 189 additions and 229 deletions.
2 changes: 1 addition & 1 deletion _data/presenters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -919,7 +919,7 @@
socialMedia:
- url: https://instagram.com/funwithgod
text: "@funwithgod"
- url: http://instagram.com/smallfile
- url: https://www.instagram.com/smallfile
text: "@smallfile"

- presenterID: brooklyn
Expand Down
33 changes: 33 additions & 0 deletions _data/sessions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1585,3 +1585,36 @@
sessionType:
- exhibit
sessionLink: "https://open-weather.community/"

2024:
- sessionID: 24001
title: 'Session title 1'
presenterID:
- lori
sessionType: talk
description: >
Session description text
- sessionID: 24002
title: 'Session title 2'
presenterID:
- joni
sessionType: workshop
description: >
Session description text
- sessionID: 24003
title: 'Session title 3'
presenterID:
- brooklyn
sessionType: talk
description: >
Session description text
- sessionID: 24004
title: 'Session title 4'
presenterID:
- michelle
sessionType: panel
description: >
Session description text
41 changes: 25 additions & 16 deletions _includes/presenter-details.html
Original file line number Diff line number Diff line change
@@ -1,26 +1,35 @@
{%- if presenter.name -%}
<div class="presenter program-block content-width">
<a class="program-block-anchor" id="{{ presenter.presenterID }}"></a>
<div class="program-block-content p-1">
<header>
<h3 class="presenter-name heading">{{ presenter.name }}</h3>
{%- if presenter.affiliation -%}<h4>{{ presenter.affiliation}}</h4>{%-endif -%}
<div class="presenter program-block">
<div class="program-block-content p-1" id="{{ presenter.presenterID }}">
<header class="leading-relaxed">
<h3 class="presenter-name heading mb-0 text-base">{{ presenter.name }}</h3>
{%- if presenter.affiliation -%}
<h4 class="mt-0 font-normal text-sm mb-1">{{ presenter.affiliation}}</h4>
{%-endif -%}
{%- if presenter.socialMedia -%}
<div class="mb-1">
{%for link in presenter.socialMedia%}
<a href="{{link.url}}" target="_blank">{{link.text}}</a>{% if forloop.last %}{% else %}, {% endif %}
{% endfor %}
</div>
{%- endif -%}
</header>
{%- if presenter.bio -%}
<div class="presenter-bio">
{%- if presenter.bio -%}<p>{{ presenter.bio }}</p>{%- endif -%}
<p>{{ presenter.bio }}</p>
</div>
{%- endif -%}
<div class="presenter-links flex gap-4">
{%- if presenter.link -%}
<ul class="bio-sm-list pl-0">
<div>
<ul class="list-none pl-0 mt-0">
{%- for link in presenter.link -%}
<li class="bio-sm-list-item"><a href="{{link.url}}" target="_blank">{{link.text}}</a></li>
<li class="bio-sm-list-item">
<a href="{{link.url}}" target="_blank">{{link.text}}</a>
</li>
{%- endfor -%}
</ul>
{%- endif -%}
{%- if presenter.socialMedia -%}
<ul class="bio-sm-list pl-0">
{%- for link in presenter.socialMedia -%}
<li class="bio-sm-list-item"><a href="{{link.url}}" target="_blank">{{link.text}}</a></li>
{%- endfor -%}
</ul>
</div>
{%- endif -%}
</div>
</div>
Expand Down
9 changes: 4 additions & 5 deletions _includes/session-details.html
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
{%- if session.title -%}
<div class="session-detail program-block content-width">
<a class="program-block-anchor" {% unless session.skipProgramID %}id="{{ session.title | truncatewords: 6, '' | downcase | replace: ':', '' | replace: ' ', '-' }}"{% endunless %}></a>
<div class="program-block-content p-1">
<div class="session-detail program-block">
<div class="program-block-content p-1" {% unless session.skipProgramID %}id="{{ session.title | slugify }}"{% endunless %}>
<header class="session-header mb-1">
<h3 class="session-title heading font-display">{{ session.title }}</h3>
{%- if session.presenterID -%}
{% assign presenters = site.data.presenters[include.year] %}
{% assign presenterCount = session.presenterID.size %}
<ul class="ls-none pl-0">
<ul class="list-none pl-0 mt-0">
{%- for presenterID in session.presenterID -%}
{%- for presenter in presenters -%}
{%- if presenter.presenterID == presenterID -%}
{% assign name = presenter.name %}
{%- endif -%}
{%- endfor -%}
{% assign presenterCount = presenterCount | minus:1 %}
<li><h4 class="session-presenter"><a href="#{{ presenterID }}">{{ name }}</a></h4></li>
<li><h4 class="session-presenter m-0"><a href="#{{ presenterID }}">{{ name }}</a></h4></li>
{%- endfor -%}
</ul>
{%- endif -%}
Expand Down
47 changes: 31 additions & 16 deletions _sass/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ blockquote {
border-left: 1px dashed var(--black);
}

h2, h3 {
h2,
h3 {
margin-top: 1.5em;
margin-bottom: 0em;
}
Expand All @@ -45,27 +46,41 @@ table {
line-height: 1.625;
}

table th:first-child {
min-width: 120px;
}

table th:nth-child(2) {
min-width: 75px;
}

table tr td:nth-child(3) {
font-size: 0.875rem;
line-height: 1.25rem;
}

table tr {
border: 1px dashed;
border-left: 0;
border-right: 0;
border-bottom-color: var(--black);
}

table td, table th {
table td,
table th {
padding: 0.5em;
vertical-align: top;
}
}

.register-table {
& th:first-child {
min-width: 120px;
}

& th:nth-child(2) {
min-width: 75px;
}

& tr td:nth-child(3) {
font-size: 0.875rem;
line-height: 1.25rem;
}
}

.schedule-table {
& th:first-child {
width: 1%;
white-space: nowrap;
border-right: 1px dashed var(--black);
}
& .time-cell:first-child {
border-right: 1px dashed var(--black);
}
}
28 changes: 27 additions & 1 deletion _sass/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@
position: relative;
}

.sticky {
position: sticky;
}

.top-0 {
top: 0;
}

.overflow-hidden {
overflow: hidden;
}
Expand Down Expand Up @@ -103,6 +111,14 @@
padding: 0;
}

.pl-0 {
padding-left: 0;
}

.pl-1 {
padding-left: 1rem;
}

.pt-4 {
padding-top: 1rem;
}
Expand Down Expand Up @@ -202,4 +218,14 @@
min-height: 2rem;
overflow: hidden;
margin-bottom: -4px;
}
}

.presenter:has(*:target) {
.presenter-name:before {
margin-right: 1ch;
margin-left: -2ch;
content: "*";
color: var(--accent);
font-family: var(--font-family-display-mono);
}
}
4 changes: 4 additions & 0 deletions _sass/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@
text-align: center;
}

.text-left {
text-align: left;
}

.list-none {
list-style-type: none;
}
Expand Down
11 changes: 5 additions & 6 deletions index.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,15 @@ Drawing on practices of [local-first](https://www.inkandswitch.com/local-first/)

{:.font-display.mt-1}

## Announced Presenters
## Sessions and Presenters

Over the course of a day we will cover the PAST, PRESENT, and FUTURE with short keynote talks, workshops, and activities on the local network. Presenters include:

{% assign sortedPresenters = site.data.presenters[2024] %}

{%- for presenter in sortedPresenters -%}
<ul>{% include presenter-details.html year=2024 %}</ul>
{%- endfor -%}
<a href="/program" class="text-sm border border-inherit active:bg-accent font-mono antialiased rounded p-1 px-2 no-underline outlined active:text-white active:outline-accent">View program</a>

In addition, attendees will be able to sign up to give lightening talks, lead conversations, or host impromptu jams in available open spaces


The conference has a [Code of Conduct](https://ournetworks.ca/code-of-conduct/).

<pre role="img" aria-label="ASCII divider" class="font-display-mono aliased text-10 inline-flex max-w-prose overflow-hidden w-100">
Expand All @@ -45,6 +41,9 @@ Registration is now open!

We suggest $60 with other registration levels on a sliding scale from $30-120 depending on your financial situation.


{:.register-table}

| Level | Price | Details |
|:-----------------------|:------|:--------|
| Supporter | $120 | If your org or company is paying or your registration can be reimbursed, consider registering as organization supporter. This allows us to offer reduced cost admissions and scholarships. |
Expand Down
Loading

0 comments on commit edb888e

Please sign in to comment.