Skip to content

Commit

Permalink
2024 setup (#276)
Browse files Browse the repository at this point in the history
* update year

* remove 2022 from index and add to previous years
  • Loading branch information
dcwalk authored Jan 31, 2024
1 parent ab42fa0 commit 3eb8d2b
Show file tree
Hide file tree
Showing 47 changed files with 203 additions and 910 deletions.
9 changes: 9 additions & 0 deletions 2022.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
layout: page
order: 5
section: "2022"
titleDisplay: "2̶0̶2̶2̶ 2047"
parent: "Previous years"
redirect_to:
- "https://2047.ournetworks.ca"
---
2 changes: 1 addition & 1 deletion 404.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ order: 0

<div class="container">
<div class="post">
<h1 class="heading-2 authentic-condensed-60">404: Page Not Found</h1>
<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>
</div>
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Logo by [Marlo Yarlo](http://www.marloyarlo.com/).

## License & Copyright

Copyright (C) 2022 garrying, dcwalk, benhylau, sarah, patcon, eloisa, mauve, amelia
Copyright (C) 2024 garrying, dcwalk, benhylau, sarah, patcon, eloisa, mauve, amelia

Ournetworks.ca **code** at [ournetworks/ournetworks.ca](https://github.com/ournetworks/ournetworks.ca/) is licensed under a [GNU General Public License v3.0](https://www.gnu.org/licenses/gpl.html). This program is free software: you can redistribute it and/or modify it under the terms of the [GNU General Public License](https://www.gnu.org/licenses/gpl.html) as published by the Free Software Foundation, version 3.0. A copy is distributed with the code at [`LICENSE.md`](./LICENSE.md).

Expand Down
9 changes: 1 addition & 8 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
<footer class="footer mt-2 mb-2 pb-s pt-s fs-small w-main">
<div class="container mb-4 mt-2">
<h2 class="authentic-condensed-60 mb-05 mt-0">Production partner</h2>
<a href="https://unfinished.com/" target="_blank" rel="noopener">
<img src="/images/logos/unfinished-logo.svg" width="240" alt="white Unfinished logo">
</a>
</div>

<footer class="footer mt-2 mb-2 pb-s pt-s w-main">
<div class="container flex">
<div class="w-50">
<p><a href="https://twitter.com/{{ site.twitter_username }}" target="_blank" rel="noopener">@{{ site.twitter_username }}</a></p>
Expand Down
8 changes: 0 additions & 8 deletions _includes/registration-panel.html

This file was deleted.

2 changes: 1 addition & 1 deletion _includes/session-video.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</a>
</div>
<header class="m-1">
<h3 class="mb-0 mt-0 authentic-condensed-60">{{ session.title }}</h3>
<h3 class="mb-0 mt-0">{{ session.title }}</h3>
{%- if session.presenterID -%}
<h4 class="session-presenter fs-small mt-1 fw-normal">
{% assign presenters = site.data.presenters[include.year] %}
Expand Down
2 changes: 1 addition & 1 deletion _layouts/page.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="container">
<article class="post w-main">
<header>
<h1 class="heading-2 authentic-condensed-60 {{ page.titleClasses }}">{{ page.title }}</h1>
<h1 class="{{ page.titleClasses }}">{{ page.title }}</h1>
</header>

<div class="post-content">
Expand Down
24 changes: 5 additions & 19 deletions _layouts/splash.html
Original file line number Diff line number Diff line change
@@ -1,23 +1,9 @@
---
layout: default
---
<div class="splash mb-2 flex flex-wrap">
<div class="splash-hero pb-s w-50 relative">
<header class="splash-text">
<h1 class="heading-display lh-09 mt-0 mb-0 authentic-condensed-60 uppercase overflow-wrap">Our Networks 2047 Redistributing the Future</h1>
<div class="container">
<h2 class="heading-3 mb-0 authentic-condensed-60">November 14&ndash;27, 2022</h2>
<h2 class="heading-3 mb-0 mt-0 authentic-condensed-60">Online, Distributed</h2>
</div>
</header>
<div class="splash-graphic absolute">
<img src="/images/item1.png" class="splash-graphic-1 absolute" alt="decorative grayscale image of a rock on a black background with irregular edges" />
<img src="/images/item2.png" class="splash-graphic-2 absolute" alt="decorative grayscale image of rocks with irregular edges" />
<img src="/images/item3.png" class="splash-graphic-3 absolute" alt="decorative grayscale image of lines on a black background with irregular edges" />
<img src="/images/item5.png" class="splash-graphic-5 absolute" alt="decorative grayscale image of networking equiptment with irregular edges" />
</div>
</div>
<div class="container w-50">
{{ content }}
</div>
<div class="container">
<header>
<h1 class="heading-display fw-normal">Our Networks 2024</h1>
</header>
{{ content }}
</div>
79 changes: 1 addition & 78 deletions _sass/_base.scss
Original file line number Diff line number Diff line change
@@ -1,103 +1,26 @@
// Base Styling

html {
box-sizing: border-box;
}

*,
*:before,
*:after {
box-sizing: inherit;
}

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


// Images

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

// Figures

figure {
margin: 0;
}

figure > img {
display: block;
margin-bottom: 1em;
}

// Links

a {
color: var(--white);
color: var(--black);

&:hover,
&:focus,
&.active {
text-decoration: none;
}
}

// hr

hr {
margin-top: 2em;
margin-bottom: 2em;
border-width: 0;
border-top-width: 1px;
border-style: solid;
border-color: var(--white);

&.full-width {
margin-left: -30px;
margin-right: -30px;

@media (max-width: $on-palm) {
margin-left: -20px;
margin-right: -20px;
}
}

&.full-stroke {
border-top-width: 5px;
}
}

// mark

mark {
border-radius: 20px;
padding: 8px 15px;
}

// Code formatting

code {
padding: 1px 5px;
}

pre {
font-size: 15px;
white-space: nowrap;
border-radius: 3px;
padding: 8px 12px;
overflow-x: auto;

> code {
display: block;
border: 0;
padding: 1rem 0;
white-space: pre;
}
}
29 changes: 3 additions & 26 deletions _sass/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,44 +3,25 @@
.button,
button {
display: inline-flex;
align-items: flex-end;
padding: 1em;
font-family: $base-font-family;
text-decoration: none;
white-space: nowrap;
cursor: pointer;
line-height: 1em;
border: 0;
font-weight: inherit;
color: var(--black);
background-color: var(--white);
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
color: var(--white);
background-color: var(--black);
}

.button:hover,
button:hover,
.button:focus,
button:focus {
color: var(--white);
background-color: var(--black);
background-color: var(--grey);
text-decoration: none;
}

.button:active,
button:active {
background-color: var(--accent);
}

.button.primary,
button.primary {
color: var(--dusk);
background-color: var(--white);
}

.button.primary:hover,
button.primary:hover {
color: var(--white);
background-color: var(--black);
}

Expand All @@ -55,7 +36,3 @@ button.primary:hover {
width: 40px;
height: 40px;
}

.square {
aspect-ratio: 1/1;
}
76 changes: 0 additions & 76 deletions _sass/_fonts.scss

This file was deleted.

Loading

0 comments on commit 3eb8d2b

Please sign in to comment.