From 84a94e95fdc77cd3ef82363ba97a879acb6927f7 Mon Sep 17 00:00:00 2001 From: Garry Ing Date: Fri, 28 Jun 2024 14:05:49 -0400 Subject: [PATCH] 2024 Program (#303) * add program * updates * Update _data/sessions.yml Co-authored-by: dcwalk * Update program.md Co-authored-by: dcwalk * Update program.md Co-authored-by: dcwalk * Update program.md Co-authored-by: dcwalk * updates * bump by 30 * updates to program --------- Co-authored-by: dcwalk Co-authored-by: dc --- _data/presenters.yml | 9 ++- _data/sessions.yml | 33 ++++++++ _includes/presenter-details.html | 47 +++++++---- _includes/session-details.html | 29 +++++++ _includes/session-type.html | 4 + _includes/session.html | 26 +++++++ _sass/_base.scss | 51 ++++++++---- _sass/_layout.scss | 32 +++++++- _sass/_typography.scss | 20 +++++ environment.md | 2 +- index.md | 11 ++- previous-years.md | 2 +- program.md | 130 +++++++++++++++++++++++++++++++ recorded-talks.md | 2 +- visiting.md | 2 +- 15 files changed, 359 insertions(+), 41 deletions(-) create mode 100644 _includes/session-details.html create mode 100644 _includes/session-type.html create mode 100644 _includes/session.html create mode 100644 program.md diff --git a/_data/presenters.yml b/_data/presenters.yml index 84debfbe..337df001 100644 --- a/_data/presenters.yml +++ b/_data/presenters.yml @@ -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 @@ -944,3 +944,10 @@ link: - url: https://www.sharereuserepair.org/ text: "sharereuserepair.org" + + - presenterID: esther + name: "Esther Jang" + affiliation: "Seattle Community Network" + link: + - url: https://seattlecommunitynetwork.org/ + text: "seattlecommunitynetwork.org" \ No newline at end of file diff --git a/_data/sessions.yml b/_data/sessions.yml index cac4615c..c2e1da41 100644 --- a/_data/sessions.yml +++ b/_data/sessions.yml @@ -1585,3 +1585,36 @@ sessionType: - exhibit sessionLink: "https://open-weather.community/" + +2024: + - sessionID: 24001 + title: + presenterID: + - lori + sessionType: talk + description: > + + + - sessionID: 24002 + title: + presenterID: + - joni + sessionType: workshop + description: > + + + - sessionID: 24003 + title: + presenterID: + - brooklyn + sessionType: talk + description: > + + + - sessionID: 24004 + title: + presenterID: + - michelle + sessionType: discussion + description: > + \ No newline at end of file diff --git a/_includes/presenter-details.html b/_includes/presenter-details.html index 2c6bb49b..e6aefd3b 100644 --- a/_includes/presenter-details.html +++ b/_includes/presenter-details.html @@ -1,16 +1,37 @@ {%- if presenter.name -%} -
  • - {%- if presenter.link -%} - +
    +
    +
    +

    {{ presenter.name }}

    + {%- if presenter.affiliation -%} +

    {{ presenter.affiliation}}

    + {%-endif -%} + {%- if presenter.socialMedia -%} +
    + {%for link in presenter.socialMedia%} + {{link.text}}{% if forloop.last %}{% else %}, {% endif %} + {% endfor %} +
    + {%- endif -%} +
    + {%- if presenter.bio -%} +
    +

    {{ presenter.bio }}

    +
    {%- endif -%} - {{ presenter.name }} - {%- if presenter.link -%}{%- endif -%} - {%- if presenter.affiliation -%}, {{ presenter.affiliation}}{%-endif -%} - -

    - {%- for link in presenter.link -%} - {{link.text}}{% unless forloop.last %}, {% endunless %} - {%- endfor -%} -

    -
    • +
    + {%- if presenter.link -%} +
    +
      + {%- for link in presenter.link -%} +
    • + {{link.text}} +
      • + {%- endfor -%} +
    +
    + {%- endif -%} +
    + + {%- endif -%} diff --git a/_includes/session-details.html b/_includes/session-details.html new file mode 100644 index 00000000..108e02d7 --- /dev/null +++ b/_includes/session-details.html @@ -0,0 +1,29 @@ +{%- if session.title -%} +
    +
    +
    +

    {{ session.title }}

    + {%- if session.presenterID -%} + {% assign presenters = site.data.presenters[include.year] %} + {% assign presenterCount = session.presenterID.size %} +
      + {%- for presenterID in session.presenterID -%} + {%- for presenter in presenters -%} + {%- if presenter.presenterID == presenterID -%} + {% assign name = presenter.name %} + {%- endif -%} + {%- endfor -%} + {% assign presenterCount = presenterCount | minus:1 %} +

    • {{ name }}

      • + {%- endfor -%} +
    + {%- endif -%} +
    + {%- if session.description -%} +
    +

    {{ session.description | escape | newline_to_br | truncatewords: 75 }}{%- if session.descriptionLink -%} read more{%- endif -%}

    +
    + {%- endif -%} +
    +
    +{%- endif -%} \ No newline at end of file diff --git a/_includes/session-type.html b/_includes/session-type.html new file mode 100644 index 00000000..a2ed3e7d --- /dev/null +++ b/_includes/session-type.html @@ -0,0 +1,4 @@ +{%- for session in site.data.sessions -%} + {%- assign sessionObject = session[1] | where: "sessionID", include.session-id | first -%} + {{ sessionObject.sessionType }} +{%- endfor -%} \ No newline at end of file diff --git a/_includes/session.html b/_includes/session.html new file mode 100644 index 00000000..2985a8fd --- /dev/null +++ b/_includes/session.html @@ -0,0 +1,26 @@ +{%- for session in site.data.sessions[include.year] -%} + {%- if include.session-id == session.sessionID -%} +
    +
    +

    + {{ session.title }} +

    + {% if session.presenterID %} +

    + {% assign presenters = site.data.presenters[include.year] %} + {% assign presenterCount = session.presenterID.size %} + {%- for presenterID in session.presenterID -%} + {%- for presenter in presenters -%} + {%- if presenter.presenterID == presenterID -%} + {% assign name = presenter.name %} + {%- endif -%} + {%- endfor -%} + {% assign presenterCount = presenterCount | minus:1 %} + {{ name }}
    + {%- endfor -%} +

    + {% endif %} +
    +
    + {%- endif -%} +{%- endfor -%} \ No newline at end of file diff --git a/_sass/_base.scss b/_sass/_base.scss index f7a3f2db..5df74a55 100644 --- a/_sass/_base.scss +++ b/_sass/_base.scss @@ -35,7 +35,8 @@ blockquote { border-left: 1px dashed var(--black); } -h2, h3 { +h2, +h3 { margin-top: 1.5em; margin-bottom: 0em; } @@ -45,19 +46,6 @@ 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; @@ -65,7 +53,38 @@ table tr { border-bottom-color: var(--black); } -table td, table th { +table td, +table th { padding: 0.5em; vertical-align: top; -} \ No newline at end of file +} + +.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); + } + tr:not(.sticky):hover .time-cell:first-child { + color: var(--accent); + } + +} diff --git a/_sass/_layout.scss b/_sass/_layout.scss index 2b05c884..0b01ac32 100644 --- a/_sass/_layout.scss +++ b/_sass/_layout.scss @@ -4,6 +4,14 @@ position: relative; } +.sticky { + position: sticky; +} + +.top-0 { + top: 0; +} + .overflow-hidden { overflow: hidden; } @@ -103,6 +111,14 @@ padding: 0; } +.pl-0 { + padding-left: 0; +} + +.pl-1 { + padding-left: 1rem; +} + .pt-4 { padding-top: 1rem; } @@ -182,6 +198,10 @@ border-width: 2px; } +.border-0 { + border-width: 0px; +} + .outlined:hover, .outlined:focus { outline: 1px solid var(--black); @@ -202,4 +222,14 @@ min-height: 2rem; overflow: hidden; margin-bottom: -4px; -} \ No newline at end of file +} + +.presenter:has(*:target) { + .presenter-name:before { + margin-right: 1ch; + margin-left: -2ch; + content: "*"; + color: var(--accent); + font-family: var(--font-family-display-mono); + } +} diff --git a/_sass/_typography.scss b/_sass/_typography.scss index 1ec00ab5..efe14f85 100644 --- a/_sass/_typography.scss +++ b/_sass/_typography.scss @@ -68,6 +68,10 @@ text-align: center; } +.text-left { + text-align: left; +} + .list-none { list-style-type: none; } @@ -99,3 +103,19 @@ .no-underline { text-decoration-line: none; } + +.whitespace-nowrap { + white-space: nowrap; +} + +.uppercase { + text-transform: uppercase; +} + +.not-italic { + font-style: normal; +} + +.tracking-wide { + letter-spacing: 0.025em; +} diff --git a/environment.md b/environment.md index 49fe265a..4f99e084 100644 --- a/environment.md +++ b/environment.md @@ -1,6 +1,6 @@ --- layout: page -order: 3 +order: 6 title: "Environment" --- diff --git a/index.md b/index.md index c965f276..6aca3edd 100644 --- a/index.md +++ b/index.md @@ -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 -%} -
      {% include presenter-details.html year=2024 %}
    -{%- endfor -%} +View program 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/).