diff --git a/.drone.yml b/.drone.yml
index 1547c8c..cc5de9f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -20,4 +20,3 @@ steps:
target: /home/jakew/public_html/
source: _site
strip_components: 1
- rm: true
diff --git a/.eleventy.js b/.eleventy.js
index 31f39ea..58ea42a 100644
--- a/.eleventy.js
+++ b/.eleventy.js
@@ -2,7 +2,8 @@ const eleventyNavigationPlugin = require("@11ty/eleventy-navigation");
module.exports = function(eleventyConfig) {
eleventyConfig.addPlugin(eleventyNavigationPlugin);
- // eleventyConfig.addGlobalData("layout", "main");
+ eleventyConfig.addPassthroughCopy("static");
+ eleventyConfig.addWatchTarget("static");
return {
pathPrefix: "/~jakew/"
diff --git a/_includes/base.njk b/_includes/base.njk
new file mode 100644
index 0000000..19ef32d
--- /dev/null
+++ b/_includes/base.njk
@@ -0,0 +1,26 @@
+---
+title: jakew
+---
+
+
+
+
+ {{ title }}
+
+
+
+
+
+
+
+
+
+ {{ content | safe }}
+
+
+
diff --git a/_includes/components/footer.njk b/_includes/components/footer.njk
new file mode 100644
index 0000000..d289797
--- /dev/null
+++ b/_includes/components/footer.njk
@@ -0,0 +1,3 @@
+
diff --git a/_includes/components/nav.njk b/_includes/components/nav.njk
new file mode 100644
index 0000000..af14b9d
--- /dev/null
+++ b/_includes/components/nav.njk
@@ -0,0 +1,11 @@
+
+ {% set navPages = collections.all | eleventyNavigation %}
+
+
+ {%- for entry in navPages -%}
+
+ [{{ entry.title }}]
+
+ {%- endfor -%}
+
+
diff --git a/_includes/main.njk b/_includes/main.njk
index 8f24293..9e4dfe1 100644
--- a/_includes/main.njk
+++ b/_includes/main.njk
@@ -1,79 +1,16 @@
---
-title: jakew
+layout: base
---
+{% include 'components/nav.njk' %}
-
-
-
- {{ title }}
-
-
-
-
-
-
-
-
-
-
+
+ {{ content | safe }}
+
-
-
- {% set navPages = collections.all | eleventyNavigation %}
+
+
-
- {%- for entry in navPages -%}
-
- {{ entry.title }}
-
- {% if not loop.last %}
- •
- {% endif %}
- {%- endfor -%}
-
-
-
-
-
-
- {{ content | safe }}
-
-
-
-
-
- ↜ prev •
- random •
- ↝ next
- how to join this webring
-
-
- [source code]
-
-
-
+{% include 'components/footer.njk' %}
diff --git a/_includes/tips.njk b/_includes/tips.njk
index a8657c9..23371a4 100644
--- a/_includes/tips.njk
+++ b/_includes/tips.njk
@@ -1,85 +1,23 @@
---
-title: jakew
+title: tips
+layout: base
---
+{% include 'components/nav.njk' %}
-
-
-
- {{ title }}
-
-
-
-
-
-
-
-
-
-
+
+
-
-
- {% set navPages = collections.all | eleventyNavigation %}
+
+ {{ content | safe }}
+
-
- {%- for entry in navPages -%}
-
- {{ entry.title }}
-
- {% if not loop.last %}
- •
- {% endif %}
- {%- endfor -%}
-
+
+
-
- ↜ back to tips
-
-
+↜ back to tips
-
-
-
- {{ content | safe }}
-
-
-
-
- ↜ back to tips
-
-
- ↜ prev •
- random •
- ↝ next
- how to join this webring
-
-
- [source code]
-
-
-
+{% include 'components/footer.njk' %}
diff --git a/index.md b/index.md
index b43b242..0b8faaf 100644
--- a/index.md
+++ b/index.md
@@ -1,21 +1,23 @@
---
title: jakew
+subtitle: Code Wrangler and Average Tilde Enjoyer
layout: main
eleventyNavigation:
key: Home
---
-Welcome, I'm Jake! I'm from the UK and I love to tinker around with things.
+Hiya! I'm Jake from the United Kingdom. I like to code, make things and try to cook.
-
-## sl projects
+## Projects
- [tips](/~jakew/tips)
-- [webring](/~jakew/ring)
+- ~~[webring](/~jakew/ring)~~ _(currently borked)_
-## where you can find me
+## Where you can find me
-- IRC: jakew on [irc.tilde.chat](https://tilde.chat)
-- Email: my username at omg.lol
-- Tildegit: [jakew](https://tildegit.org/jakew)
-- My other website: [jakew.me](https://jakew.me)
+- **Mastodon:** [@jakew@tilde.zone](https://tilde.zone/@jakew)
+- **IRC:** jakew on [irc.tilde.chat](https://tilde.chat)
+- **Email:** my username at omg.lol
+- **Tildegit:** [jakew](https://tildegit.org/jakew)
+- **My other website:** [jakew.me](https://jakew.me)
+- **Twitter:** [_jakewalker1](https://twitter.com/_jakewalker1)
diff --git a/package.json b/package.json
index dcee481..1be770b 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
"@11ty/eleventy-navigation": "^0.1.6"
},
"scripts": {
- "build": "eleventy"
+ "build": "eleventy",
+ "dev": "eleventy --watch --serve"
}
}
diff --git a/static/main.css b/static/main.css
new file mode 100644
index 0000000..602641f
--- /dev/null
+++ b/static/main.css
@@ -0,0 +1,90 @@
+@import "https://tilde.team/~ben/fonts/inconsolata/font.css";
+
+:root {
+ --purple-dark: #2E1C4A;
+ --purple: #5D3991;
+ --purple-light: #CBB2F0;
+ --purple-lighter: #DED0F2;
+ --purple-lightest: #F0E9FA;
+}
+
+html, body {
+ margin: 0;
+ padding: 0;
+}
+
+body {
+ text-transform: lowercase;
+ font-family: "Inconsolata", monospace;
+ font-size: 1.1em;
+ line-height: 1.3em;
+}
+
+.content {
+ max-width: 800px;
+ margin-left: auto;
+ margin-right: auto;
+ padding: 1em;
+}
+
+hr.zig, hr.zag {
+ border: none;
+ height: 30px;
+ margin: 12px 0;
+}
+hr.zig{
+ background: linear-gradient(-135deg, #FFF 20px, rgba(0, 0, 0, 0) 0) 0 5px, linear-gradient(135deg, #FFF 20px, rgba(0, 0, 0, 0) 0) 0 5px;
+ background-color: rgba(0, 0, 0, 0);
+ background-position: center bottom;
+ background-repeat: repeat-x;
+ background-size: 20px 40px;
+ z-index: 100;
+ position: relative;
+}
+hr.zag {
+ background: linear-gradient(-135deg, #b1b1b1 20px, rgba(0, 0, 0, 0) 0) 0 5px, linear-gradient(135deg, #b1b1b1 20px, #FFF 0) 0 5px;
+ background-color: rgba(0, 0, 0, 0);
+ background-position: center bottom;
+ background-repeat: repeat-x;
+ background-size: 20px 40px;
+ z-index: 50;
+ margin-top: -40px;
+}
+
+.header {
+ text-align: center;
+ background-color: var(--purple-light);
+ color: var(--purple-dark);
+ padding: 70px 1em;
+}
+
+a {
+ color: var(--purple);
+}
+
+a:hover {
+ background-color: var(--purple-lighter);
+}
+
+code {
+ padding-left: 5px;
+ padding-right: 5px;
+
+ background-color: var(--purple-lightest);
+ color: var(--purple-dark);
+}
+
+pre {
+ padding: 1em;
+
+ background-color: var(--purple-lightest);
+ color: var(--purple-dark);
+}
+
+.nav-link > a {
+ text-decoration: none;
+}
+
+.nav-link.active > a {
+ background-color: var(--purple-lighter);
+}