diff --git a/src/_data/meta.js b/src/_data/meta.js
index b7117e2..aaea915 100644
--- a/src/_data/meta.js
+++ b/src/_data/meta.js
@@ -2,4 +2,5 @@ module.exports = {
siteName: "Gil's Nexus",
siteDescription: "",
authorName: "Gil",
+ homepage: "/home/",
};
diff --git a/src/_includes/layouts/base.njk b/src/_includes/layouts/base.njk
index 79aa453..92cab67 100644
--- a/src/_includes/layouts/base.njk
+++ b/src/_includes/layouts/base.njk
@@ -1,11 +1,7 @@
-
-
-
- {% if title %}{{ title }} | {% endif %}{{ meta.siteName }}
-
+ {% include "partials/meta.njk" %}
diff --git a/src/_includes/layouts/default.njk b/src/_includes/layouts/default.njk
index ab2a649..24bbe21 100644
--- a/src/_includes/layouts/default.njk
+++ b/src/_includes/layouts/default.njk
@@ -3,9 +3,6 @@ layout: layouts/base.njk
---
{% include "partials/header.njk" %}
-
{{ content | safe }}
{% include "partials/footer.njk" %}
\ No newline at end of file
diff --git a/src/_includes/layouts/landing.njk b/src/_includes/layouts/landing.njk
index 704ec8b..d0563b0 100644
--- a/src/_includes/layouts/landing.njk
+++ b/src/_includes/layouts/landing.njk
@@ -1,15 +1,11 @@
-
-
-
- {% if title %}{{ title }} | {% endif %}{{ meta.siteName }}
-
+ {% include "partials/meta.njk" %}
-
+
{{ content | safe }}
diff --git a/src/_includes/partials/header.njk b/src/_includes/partials/header.njk
index 3a7743c..9c2ae17 100644
--- a/src/_includes/partials/header.njk
+++ b/src/_includes/partials/header.njk
@@ -1,4 +1,4 @@
\ No newline at end of file
diff --git a/src/_includes/partials/meta.njk b/src/_includes/partials/meta.njk
new file mode 100644
index 0000000..f4274ed
--- /dev/null
+++ b/src/_includes/partials/meta.njk
@@ -0,0 +1,5 @@
+
+
+
+{% if title %}{{ title }} | {% endif %}{{ meta.siteName }}
+
\ No newline at end of file
diff --git a/src/about.md b/src/about.md
index 753adcd..9553635 100644
--- a/src/about.md
+++ b/src/about.md
@@ -1,11 +1,11 @@
---
-title: About
date: Last Modified
eleventyNavigation:
key: About
+ order: 1
---
-
+# About
Hey. I'm Gil ([he/they](https://en.pronouns.page/@kalanggam)). I'm a software developer, game developer, and writer based in Texas. I'm one of the sysadmins for the [ogra.ph collective](https://ogra.ph/), an online collective of folk building an inclusive community centered around digital rights and liberation.
diff --git a/src/css/global.css b/src/css/global.css
index 57f7d2f..fc80972 100644
--- a/src/css/global.css
+++ b/src/css/global.css
@@ -2,7 +2,7 @@
.markup {
word-wrap: break-word;
line-height: 1.7;
- padding: 0 1.5em;
+ padding: 0;
}
.markup p,
.markup blockquote,
@@ -15,7 +15,7 @@
}
.markup ul,
.markup ol {
- all: revert;
+ list-style-type: revert;
padding-left: 30px;
}
.markup h1 {
@@ -123,9 +123,10 @@ Full license texts:
font-weight: 700;
src: local("Linux Libertine Bold Italic"), url("../font/LinLibertine_RBIah.ttf");
}
-html {
+:root {
font-size: 12pt;
font-family: "Linux Libertine", "Times New Roman", Times, serif;
+ color-scheme: light dark;
}
body {
@@ -134,17 +135,24 @@ body {
}
@media (min-width: 769px) {
body {
- grid-template-columns: 2fr 3fr 2fr;
+ grid-template-columns: repeat(10, 1fr);
+ grid-template-rows: 3;
+ column-gap: 1em;
height: 100%;
padding: 2em 0;
}
body > header {
grid-row: 1;
- grid-column: 2;
+ grid-column: 1/-1;
}
body > footer {
grid-row: 3;
- grid-column: 2;
+ grid-column: 1/-1;
+ }
+}
+@media (min-width: 1025px) {
+ body {
+ grid-template-columns: repeat(12, 1fr);
}
}
@@ -155,39 +163,39 @@ article {
@media (min-width: 769px) {
main,
article {
+ display: grid;
+ grid-template-columns: subgrid;
grid-row: 2;
- grid-column: 2;
+ grid-column: 2/span 8;
+ }
+ main *,
+ article * {
+ grid-column: 2/span 6;
}
}
-main .gba-portrait,
-article .gba-portrait {
- margin: auto;
- margin-bottom: 1em;
- width: 100%;
- height: auto;
- max-width: 192px;
-}
-@media (min-width: 769px) {
- main .gba-portrait,
- article .gba-portrait {
- float: right;
- margin: 1em;
+@media (min-width: 1025px) {
+ main,
+ article {
+ grid-column: 2/span 10;
+ }
+ main *,
+ article * {
+ grid-column: 4/span 4;
}
}
header.banner {
text-align: center;
}
-
-nav.navbar {
+header.banner nav {
margin-bottom: 1em;
}
-nav.navbar li {
+header.banner nav li {
display: inline-flex;
}
-footer.footer-main {
- margin: 2em 1em 1em 1em;
+footer {
+ margin: 1em;
text-align: center;
}
diff --git a/src/css/global.css.map b/src/css/global.css.map
index 6368401..5db2fc3 100644
--- a/src/css/global.css.map
+++ b/src/css/global.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/global.scss","../scss/_classes.scss","../scss/_vars.scss","../scss/_fonts.scss","../scss/modules/_include-media.scss"],"names":[],"mappings":"AAEA;ACFA;EACE;EACA;EACA;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAOE;;AAGF;AAAA;EAEE;EACA;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;AAAA;AAAA;AAAA;AAAA;AAAA;EAME;;AAGF;AAAA;AAAA;EAGE;;AAGF;EACE;;AAGF;AAAA;EAEE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;;AC/EJ;AAAA;AAAA;AAIA;AAGA;AAGA;AAGA;ACbA;AAAA;AAAA;AAIA;;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAWA;EACE;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;;AAIF;EACE;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;;AAKF;EACE;EACA;EACA;EACA;;AHvCF;EAEI,WEPa;EFQb,aEPe;;;AFWnB;EACE;EACA;;AIokBE;EJtkBJ;IAII;IACA;IACA;;EAEA;IACE;IACA;;EAGF;IACE;IACA;;;;AAKN;AAAA;EAEE;;AIgjBE;EJljBJ;AAAA;IAII;IACA;;;AAGF;AAAA;EACE;EACA;EACA;EACA;EACA;;AIqiBA;EJ1iBF;AAAA;IAOI;IACA;;;;AAKN;EACE;;;AAGF;EACE;;AAEA;EACE;;;AAIJ;EACE;EACA","file":"global.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/global.scss","../scss/_markup.scss","../scss/_vars.scss","../scss/_fonts.scss","../scss/modules/_include-media.scss"],"names":[],"mappings":"AAEA;ACAA;EACE;EACA;EACA;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAOE;;AAGF;AAAA;EAEE;EACA;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;AAAA;AAAA;AAAA;AAAA;AAAA;EAME;;AAGF;AAAA;AAAA;EAGE;;AAGF;EACE;;AAGF;AAAA;EAEE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;;ACjFJ;AAAA;AAAA;AAIA;AAGA;AAGA;AAGA;ACbA;AAAA;AAAA;AAIA;;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAWA;EACE;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;;AAIF;EACE;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;;AAKF;EACE;EACA;EACA;EACA;;AHvCF;EAEI,WEPa;EFQb,aEPe;EFSjB;;;AAGF;EACE;EACA;;AIskBE;EJxkBJ;IAII;IACA;IACA,YEzBK;IF0BL;IACA;;EAEA;IACE;IACA;;EAGF;IACE;IACA;;;AIujBF;EJxkBJ;IAsBI;;;;AAIJ;AAAA;EAEE;;AI4iBE;EJ9iBJ;AAAA;IAKI;IACA;IACA;IACA;;EAEA;AAAA;IACE;;;AImiBF;EJ9iBJ;AAAA;IAgBI;;EAEA;AAAA;IACE;;;;AAKN;EACE;;AACA;EACE;;AAEA;EACE;;;AAKN;EACE;EACA","file":"global.css"}
\ No newline at end of file
diff --git a/src/css/landing.css b/src/css/landing.css
index d8ee145..8552de1 100644
--- a/src/css/landing.css
+++ b/src/css/landing.css
@@ -2,7 +2,7 @@
.markup {
word-wrap: break-word;
line-height: 1.7;
- padding: 0 1.5em;
+ padding: 0;
}
.markup p,
.markup blockquote,
@@ -15,7 +15,7 @@
}
.markup ul,
.markup ol {
- all: revert;
+ list-style-type: revert;
padding-left: 30px;
}
.markup h1 {
diff --git a/src/css/landing.css.map b/src/css/landing.css.map
index 9d648c4..9731c61 100644
--- a/src/css/landing.css.map
+++ b/src/css/landing.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/landing.scss","../scss/_classes.scss","../scss/_vars.scss","../scss/_fonts.scss","../scss/modules/_include-media.scss"],"names":[],"mappings":"AAEA;ACFA;EACE;EACA;EACA;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAOE;;AAGF;AAAA;EAEE;EACA;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;AAAA;AAAA;AAAA;AAAA;AAAA;EAME;;AAGF;AAAA;AAAA;EAGE;;AAGF;EACE;;AAGF;AAAA;EAEE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;;AC/EJ;AAAA;AAAA;AAIA;AAGA;AAGA;AAGA;ACbA;AAAA;AAAA;AAIA;;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAWA;EACE;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;;AAIF;EACE;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;;AAKF;EACE;EACA;EACA;EACA;;AHtCF;EAEI,WERa;EFSb,aERe;;;AFYnB;EACE;EACA;;AImkBE;EJrkBJ;IAII;IACA,KExBK;IFyBL;IACA;;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;;AIojBE;EJ1jBJ;IAQI;;;AAIA;EACE;;AAGF;EACE;EACA;;;AIwiBF;EJniBJ;IAEI;IACA;IACA;;;AAGF;EACE;EACA;;AAEA;EACE;;;AAKN;EACE;EACA;EACA;;AI+gBE;EJlhBJ;IAKI;;;AAGF;EACE","file":"landing.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/landing.scss","../scss/_markup.scss","../scss/_vars.scss","../scss/_fonts.scss","../scss/modules/_include-media.scss"],"names":[],"mappings":"AAEA;ACAA;EACE;EACA;EACA;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAOE;;AAGF;AAAA;EAEE;EACA;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;AAAA;AAAA;AAAA;AAAA;AAAA;EAME;;AAGF;AAAA;AAAA;EAGE;;AAGF;EACE;;AAGF;AAAA;EAEE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;;ACjFJ;AAAA;AAAA;AAIA;AAGA;AAGA;AAGA;ACbA;AAAA;AAAA;AAIA;;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAWA;EACE;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;;AAIF;EACE;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;;AAKF;EACE;EACA;EACA;EACA;;AH/CF;EAEI,WECa;EFAb,aECe;;;AFGnB;EACE;EACA;;AI+kBE;EJjlBJ;IAII;IACA,KEfK;IFgBL;IACA;;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;;AIgkBE;EJtkBJ;IAQI;;;AAIA;EACE;;AAGF;EACE;EACA;;;AIojBF;EJ/iBJ;IAEI;IACA;IACA;;;AAGF;EACE;EACA;;AAEA;EACE;;;AAKN;EACE;EACA;EACA;;AI2hBE;EJ9hBJ;IAKI;;;AAGF;EACE","file":"landing.css"}
\ No newline at end of file
diff --git a/src/home.md b/src/home.md
new file mode 100644
index 0000000..86e313d
--- /dev/null
+++ b/src/home.md
@@ -0,0 +1,19 @@
+---
+date: Last Modified
+eleventyNavigation:
+ key: Home
+---
+
+# Home
+
+## Status
+
+Latest status here...
+
+## Blog
+
+- Post 1
+- Post 2
+- Post 3
+
+[feed](/rss) (not actual yet)
\ No newline at end of file
diff --git a/src/index.md b/src/index.md
index 7affed3..3929152 100644
--- a/src/index.md
+++ b/src/index.md
@@ -1,7 +1,6 @@
---
layout: layouts/landing.njk
date: Last Modified
-entry: /main/
eleventyNavigation:
key: Landing
order: 200
diff --git a/src/main.md b/src/main.md
deleted file mode 100644
index 9acaf25..0000000
--- a/src/main.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-date: Last Modified
-eleventyNavigation:
- key: Main
----
-
-
-
-# Home
-
-Another test
-
-## Support me
-
-Let's give this one more go.
-
-
diff --git a/src/ograph.md b/src/ograph.md
deleted file mode 100644
index 62bdf3b..0000000
--- a/src/ograph.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-title: Ograph Collective
-date: Last Modified
-eleventyNavigation:
- key: Ograph
- order: 1
----
-
-The Ograph Collective aims to build an online community focused on digital liberation, through the use of free, libre, and open-source software. I co-manage the Ograph Collective with [Kersed](https://kersed.net/), and together we operate three projects: a federated microblogging platform, a Git repository service, and a Keyoxide instance; however, we plan to offer other services in the future.
-
-- Microblog on [hol.ogra.ph](https://hol.ogra.ph/@gil)
-- Git projects hosted on [ide.ogra.ph](https://ide.ogra.ph/gil)
-- Keyoxide profile on [aut.ogra.ph](https://aut.ogra.ph/aspe:keyoxide.org:7IW4QEA4DIBL3YORQH3HTEGDKM)
\ No newline at end of file
diff --git a/src/scss/_colors.scss b/src/scss/_colors.scss
index 8b607de..4f73bcd 100644
--- a/src/scss/_colors.scss
+++ b/src/scss/_colors.scss
@@ -1 +1,12 @@
// _colors.scss
+
+// Palette
+// Red, green, white, black, etc.
+
+// Semantic/admonition/callout etc.
+// Primary, secondary, tertiary, emphasis info, warning, shadow, quote,
+// success, danger, etc...
+
+// $text-normal: black;
+// $text-primary: blue;
+// $text-secondary: purple;
diff --git a/src/scss/_classes.scss b/src/scss/_markup.scss
similarity index 91%
rename from src/scss/_classes.scss
rename to src/scss/_markup.scss
index 177134f..eb55dcf 100644
--- a/src/scss/_classes.scss
+++ b/src/scss/_markup.scss
@@ -1,7 +1,9 @@
+@use "modules/include-media" as *;
+
.markup {
word-wrap: break-word;
line-height: 1.7;
- padding: 0 1.5em;
+ padding: 0;
p,
blockquote,
@@ -15,7 +17,7 @@
ul,
ol {
- all: revert;
+ list-style-type: revert;
padding-left: 30px;
}
diff --git a/src/scss/global.scss b/src/scss/global.scss
index bf04b54..e3fb16d 100644
--- a/src/scss/global.scss
+++ b/src/scss/global.scss
@@ -14,71 +14,80 @@
)
);
-@use "classes" as *;
+@use "markup";
@use "vars" as *;
@use "fonts";
-html {
+:root {
font: {
size: $font-base-size;
family: $font-stack-serif;
}
+ color-scheme: light dark;
}
body {
display: grid;
padding: $gutter * 2;
@include media(">md") {
- grid-template-columns: 2fr 3fr 2fr;
+ grid-template-columns: repeat(10, 1fr);
+ grid-template-rows: 3;
+ column-gap: $gutter;
height: 100%;
padding: ($gutter * 2) 0;
& > header {
grid-row: 1;
- grid-column: 2;
+ grid-column: 1 / -1;
}
& > footer {
grid-row: 3;
- grid-column: 2;
+ grid-column: 1 / -1;
}
}
+
+ @include media(">lg") {
+ grid-template-columns: repeat(12, 1fr);
+ }
}
main,
article {
font-size: 1rem;
+
@include media(">md") {
+ display: grid;
+ grid-template-columns: subgrid;
grid-row: 2;
- grid-column: 2;
+ grid-column: 2 / span 8;
+
+ * {
+ grid-column: 2 / span 6;
+ }
}
- .gba-portrait {
- margin: auto;
- margin-bottom: 1em;
- width: 100%;
- height: auto;
- max-width: 192px;
- @include media(">md") {
- float: right;
- margin: 1em;
+ @include media(">lg") {
+ grid-column: 2 / span 10;
+
+ * {
+ grid-column: 4 / span 4;
}
}
}
header.banner {
text-align: center;
-}
+ nav {
+ margin-bottom: 1em;
-nav.navbar {
- margin-bottom: 1em;
-
- li {
- display: inline-flex;
+ li {
+ display: inline-flex;
+ }
}
}
-footer.footer-main {
- margin: 2em 1em 1em 1em;
+footer {
+ margin: 1em;
text-align: center;
}
diff --git a/src/scss/landing.scss b/src/scss/landing.scss
index cda27b1..4ab81b2 100644
--- a/src/scss/landing.scss
+++ b/src/scss/landing.scss
@@ -3,18 +3,9 @@
/* IMPORTS ================================================================= */
@use "sass:math";
-@use "modules/include-media" as * with (
- $breakpoints: (
- xs: 0,
- sm: 640px,
- md: 768px,
- lg: 1024px,
- xl: 1280px,
- 2xl: 1536px,
- )
-);
+@use "modules/include-media" as *;
-@use "classes" as *;
+@use "markup" as *;
@use "vars" as *;
@use "colors";
@use "fonts";
diff --git a/src/scss/modules/_include-media.scss b/src/scss/modules/_include-media.scss
index e073757..f1573e3 100644
--- a/src/scss/modules/_include-media.scss
+++ b/src/scss/modules/_include-media.scss
@@ -34,9 +34,12 @@
/// $breakpoints: ('phone': 320px);
///
$breakpoints: (
- 'phone': 320px,
- 'tablet': 768px,
- 'desktop': 1024px,
+ xs: 0,
+ sm: 640px,
+ md: 768px,
+ lg: 1024px,
+ xl: 1280px,
+ 2xl: 1536px,
) !default;
///