diff --git a/.nvmrc b/.nvmrc
index 45a4fb7..b6a7d89 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-8
+16
diff --git a/.tool-versions b/.tool-versions
deleted file mode 100644
index fa99f44..0000000
--- a/.tool-versions
+++ /dev/null
@@ -1 +0,0 @@
-nodejs 12.22.4
diff --git a/Dockerfile b/Dockerfile
index 56d76a8..458f85a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,14 @@
-FROM node:12-alpine
+FROM node:16-alpine
+
+RUN apk update && apk add python3 make gcc g++
+
+WORKDIR /app
+
+ADD package.json .
+RUN npm install
ADD . .
-RUN npm install
-
EXPOSE 8000
CMD ["npm", "start"]
diff --git a/package.json b/package.json
index a166034..7ae6171 100644
--- a/package.json
+++ b/package.json
@@ -20,15 +20,16 @@
"metalsmith-markdownit": "^0.3.0",
"metalsmith-pagination": "^1.4.0",
"metalsmith-permalinks": "^0.5.0",
- "metalsmith-sass": "^1.7.0",
+ "metalsmith-sass": "^2.0.0",
"metalsmith-sitemap": "^1.2.2",
"moment": "^2.13.0",
+ "node-sass": "^6.0.0",
"striptags": "^2.1.1"
},
"devDependencies": {
"nodemon": "^1.12.1"
},
"engines": {
- "node": "12"
+ "node": "16"
}
}
diff --git a/src/browserconfig.xml b/src/browserconfig.xml
deleted file mode 100644
index 3e75bb7..0000000
--- a/src/browserconfig.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#ffffff
\ No newline at end of file
diff --git a/src/css/main.scss b/src/css/main.scss
index ccac3a3..f01017a 100644
--- a/src/css/main.scss
+++ b/src/css/main.scss
@@ -42,18 +42,13 @@ header {
font-family: 'Lucida Grande', Arial, sans-serif;
font-size: .8em;
- a:not(.social) {
- @include linkUnderlines($background-color, #4a4a4a, $link-color);
- }
-
h1 {
font-weight: normal;
- margin: .8em 0 .8em 8px;
+ margin: .8em 0 .2em 8px;
img {
- height: 1.2em;
- float: left;
- border-radius: 20px;
+ height: 2em;
+ border-radius: 8px;
}
a {
diff --git a/src/favicon.ico b/src/favicon.ico
index c70e4ae..f78f4ae 100644
Binary files a/src/favicon.ico and b/src/favicon.ico differ
diff --git a/src/images/favico/android-icon-144x144.png b/src/images/favico/android-icon-144x144.png
deleted file mode 100644
index 079658c..0000000
Binary files a/src/images/favico/android-icon-144x144.png and /dev/null differ
diff --git a/src/images/favico/android-icon-192x192.png b/src/images/favico/android-icon-192x192.png
deleted file mode 100644
index 6a985d8..0000000
Binary files a/src/images/favico/android-icon-192x192.png and /dev/null differ
diff --git a/src/images/favico/android-icon-36x36.png b/src/images/favico/android-icon-36x36.png
deleted file mode 100644
index b973de0..0000000
Binary files a/src/images/favico/android-icon-36x36.png and /dev/null differ
diff --git a/src/images/favico/android-icon-48x48.png b/src/images/favico/android-icon-48x48.png
deleted file mode 100644
index 4701b8c..0000000
Binary files a/src/images/favico/android-icon-48x48.png and /dev/null differ
diff --git a/src/images/favico/android-icon-72x72.png b/src/images/favico/android-icon-72x72.png
deleted file mode 100644
index 4749e2f..0000000
Binary files a/src/images/favico/android-icon-72x72.png and /dev/null differ
diff --git a/src/images/favico/android-icon-96x96.png b/src/images/favico/android-icon-96x96.png
deleted file mode 100644
index 585c283..0000000
Binary files a/src/images/favico/android-icon-96x96.png and /dev/null differ
diff --git a/src/images/favico/apple-icon-114x114.png b/src/images/favico/apple-icon-114x114.png
deleted file mode 100644
index b3a0f26..0000000
Binary files a/src/images/favico/apple-icon-114x114.png and /dev/null differ
diff --git a/src/images/favico/apple-icon-120x120.png b/src/images/favico/apple-icon-120x120.png
deleted file mode 100644
index 7dff5b8..0000000
Binary files a/src/images/favico/apple-icon-120x120.png and /dev/null differ
diff --git a/src/images/favico/apple-icon-144x144.png b/src/images/favico/apple-icon-144x144.png
deleted file mode 100644
index 079658c..0000000
Binary files a/src/images/favico/apple-icon-144x144.png and /dev/null differ
diff --git a/src/images/favico/apple-icon-152x152.png b/src/images/favico/apple-icon-152x152.png
deleted file mode 100644
index 1551f9a..0000000
Binary files a/src/images/favico/apple-icon-152x152.png and /dev/null differ
diff --git a/src/images/favico/apple-icon-180x180.png b/src/images/favico/apple-icon-180x180.png
deleted file mode 100644
index 0fb9aa2..0000000
Binary files a/src/images/favico/apple-icon-180x180.png and /dev/null differ
diff --git a/src/images/favico/apple-icon-57x57.png b/src/images/favico/apple-icon-57x57.png
deleted file mode 100644
index 50d173b..0000000
Binary files a/src/images/favico/apple-icon-57x57.png and /dev/null differ
diff --git a/src/images/favico/apple-icon-60x60.png b/src/images/favico/apple-icon-60x60.png
deleted file mode 100644
index 028abb2..0000000
Binary files a/src/images/favico/apple-icon-60x60.png and /dev/null differ
diff --git a/src/images/favico/apple-icon-72x72.png b/src/images/favico/apple-icon-72x72.png
deleted file mode 100644
index 4749e2f..0000000
Binary files a/src/images/favico/apple-icon-72x72.png and /dev/null differ
diff --git a/src/images/favico/apple-icon-76x76.png b/src/images/favico/apple-icon-76x76.png
deleted file mode 100644
index 34aad77..0000000
Binary files a/src/images/favico/apple-icon-76x76.png and /dev/null differ
diff --git a/src/images/favico/apple-icon-precomposed.png b/src/images/favico/apple-icon-precomposed.png
deleted file mode 100644
index 0b7df6e..0000000
Binary files a/src/images/favico/apple-icon-precomposed.png and /dev/null differ
diff --git a/src/images/favico/apple-icon.png b/src/images/favico/apple-icon.png
deleted file mode 100644
index 0b7df6e..0000000
Binary files a/src/images/favico/apple-icon.png and /dev/null differ
diff --git a/src/images/favico/apple-touch-icon-precomposed.png b/src/images/favico/apple-touch-icon-precomposed.png
deleted file mode 100644
index 0b7df6e..0000000
Binary files a/src/images/favico/apple-touch-icon-precomposed.png and /dev/null differ
diff --git a/src/images/favico/apple-touch-icon.png b/src/images/favico/apple-touch-icon.png
deleted file mode 100644
index 0b7df6e..0000000
Binary files a/src/images/favico/apple-touch-icon.png and /dev/null differ
diff --git a/src/images/favico/favicon-114-precomposed.png b/src/images/favico/favicon-114-precomposed.png
new file mode 100644
index 0000000..18e13d0
Binary files /dev/null and b/src/images/favico/favicon-114-precomposed.png differ
diff --git a/src/images/favico/favicon-120-precomposed.png b/src/images/favico/favicon-120-precomposed.png
new file mode 100644
index 0000000..3e59445
Binary files /dev/null and b/src/images/favico/favicon-120-precomposed.png differ
diff --git a/src/images/favico/favicon-144-precomposed.png b/src/images/favico/favicon-144-precomposed.png
new file mode 100644
index 0000000..484da5e
Binary files /dev/null and b/src/images/favico/favicon-144-precomposed.png differ
diff --git a/src/images/favico/favicon-152-precomposed.png b/src/images/favico/favicon-152-precomposed.png
new file mode 100644
index 0000000..338a5e6
Binary files /dev/null and b/src/images/favico/favicon-152-precomposed.png differ
diff --git a/src/images/favico/favicon-16x16.png b/src/images/favico/favicon-16x16.png
deleted file mode 100644
index 7aee9d2..0000000
Binary files a/src/images/favico/favicon-16x16.png and /dev/null differ
diff --git a/src/images/favico/favicon-180-precomposed.png b/src/images/favico/favicon-180-precomposed.png
new file mode 100644
index 0000000..8825754
Binary files /dev/null and b/src/images/favico/favicon-180-precomposed.png differ
diff --git a/src/images/favico/favicon-192.png b/src/images/favico/favicon-192.png
new file mode 100644
index 0000000..5b6883d
Binary files /dev/null and b/src/images/favico/favicon-192.png differ
diff --git a/src/images/favico/favicon-32.png b/src/images/favico/favicon-32.png
new file mode 100644
index 0000000..7bee869
Binary files /dev/null and b/src/images/favico/favicon-32.png differ
diff --git a/src/images/favico/favicon-32x32.png b/src/images/favico/favicon-32x32.png
deleted file mode 100644
index 3501034..0000000
Binary files a/src/images/favico/favicon-32x32.png and /dev/null differ
diff --git a/src/images/favico/favicon-36.png b/src/images/favico/favicon-36.png
new file mode 100644
index 0000000..0ff4875
Binary files /dev/null and b/src/images/favico/favicon-36.png differ
diff --git a/src/images/favico/favicon-48.png b/src/images/favico/favicon-48.png
new file mode 100644
index 0000000..293e6a8
Binary files /dev/null and b/src/images/favico/favicon-48.png differ
diff --git a/src/images/favico/favicon-57.png b/src/images/favico/favicon-57.png
new file mode 100644
index 0000000..0157637
Binary files /dev/null and b/src/images/favico/favicon-57.png differ
diff --git a/src/images/favico/favicon-60.png b/src/images/favico/favicon-60.png
new file mode 100644
index 0000000..ef1a732
Binary files /dev/null and b/src/images/favico/favicon-60.png differ
diff --git a/src/images/favico/favicon-72-precomposed.png b/src/images/favico/favicon-72-precomposed.png
new file mode 100644
index 0000000..15cea82
Binary files /dev/null and b/src/images/favico/favicon-72-precomposed.png differ
diff --git a/src/images/favico/favicon-72.png b/src/images/favico/favicon-72.png
new file mode 100644
index 0000000..15cea82
Binary files /dev/null and b/src/images/favico/favicon-72.png differ
diff --git a/src/images/favico/favicon-76.png b/src/images/favico/favicon-76.png
new file mode 100644
index 0000000..fc948eb
Binary files /dev/null and b/src/images/favico/favicon-76.png differ
diff --git a/src/images/favico/favicon-96.png b/src/images/favico/favicon-96.png
new file mode 100644
index 0000000..509f8e1
Binary files /dev/null and b/src/images/favico/favicon-96.png differ
diff --git a/src/images/favico/favicon-96x96.png b/src/images/favico/favicon-96x96.png
deleted file mode 100644
index 585c283..0000000
Binary files a/src/images/favico/favicon-96x96.png and /dev/null differ
diff --git a/src/images/favico/favicon.ico b/src/images/favico/favicon.ico
index 190a07f..1ab7a16 100644
Binary files a/src/images/favico/favicon.ico and b/src/images/favico/favicon.ico differ
diff --git a/src/images/favico/ms-icon-144x144.png b/src/images/favico/ms-icon-144x144.png
deleted file mode 100644
index 079658c..0000000
Binary files a/src/images/favico/ms-icon-144x144.png and /dev/null differ
diff --git a/src/images/favico/ms-icon-150x150.png b/src/images/favico/ms-icon-150x150.png
deleted file mode 100644
index ba26298..0000000
Binary files a/src/images/favico/ms-icon-150x150.png and /dev/null differ
diff --git a/src/images/favico/ms-icon-310x310.png b/src/images/favico/ms-icon-310x310.png
deleted file mode 100644
index 198370a..0000000
Binary files a/src/images/favico/ms-icon-310x310.png and /dev/null differ
diff --git a/src/images/favico/ms-icon-70x70.png b/src/images/favico/ms-icon-70x70.png
deleted file mode 100644
index 01624b2..0000000
Binary files a/src/images/favico/ms-icon-70x70.png and /dev/null differ
diff --git a/src/images/marcus-transparent.png b/src/images/marcus-transparent.png
new file mode 100755
index 0000000..bafaba1
Binary files /dev/null and b/src/images/marcus-transparent.png differ
diff --git a/src/images/marcus.jpg b/src/images/marcus.jpg
old mode 100644
new mode 100755
index 55dec2c..2362609
Binary files a/src/images/marcus.jpg and b/src/images/marcus.jpg differ
diff --git a/src/images/marcus.png b/src/images/marcus.png
index de0de2b..4e39596 100644
Binary files a/src/images/marcus.png and b/src/images/marcus.png differ
diff --git a/src/manifest.json b/src/manifest.json
index 511a4ae..7402040 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -2,40 +2,40 @@
"name": "Marcus Noble - Blog",
"icons": [
{
- "src": "\/images\/favico\/android-icon-36x36.png",
+ "src": "\/images\/favico\favicon-36.png",
"sizes": "36x36",
"type": "image\/png",
"density": "0.75"
},
{
- "src": "\/images\/favico\/android-icon-48x48.png",
+ "src": "\/images\/favico\favicon-48.png",
"sizes": "48x48",
"type": "image\/png",
"density": "1.0"
},
{
- "src": "\/images\/favico\/android-icon-72x72.png",
+ "src": "\/images\/favico\favicon-72.png",
"sizes": "72x72",
"type": "image\/png",
"density": "1.5"
},
{
- "src": "\/images\/favico\/android-icon-96x96.png",
+ "src": "\/images\/favico\favicon-96.png",
"sizes": "96x96",
"type": "image\/png",
"density": "2.0"
},
{
- "src": "\/images\/favico\/android-icon-144x144.png",
+ "src": "\/images\/favico\favicon-144.png",
"sizes": "144x144",
"type": "image\/png",
"density": "3.0"
},
{
- "src": "\/images\/favico\/android-icon-192x192.png",
+ "src": "\/images\/favico\favicon-192.png",
"sizes": "192x192",
"type": "image\/png",
"density": "4.0"
}
]
-}
\ No newline at end of file
+}
diff --git a/templates/partials/head.html b/templates/partials/head.html
index 81de46b..0225f1b 100644
--- a/templates/partials/head.html
+++ b/templates/partials/head.html
@@ -18,24 +18,33 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/templates/partials/header.html b/templates/partials/header.html
index f1a0365..e2bec73 100644
--- a/templates/partials/header.html
+++ b/templates/partials/header.html
@@ -1,6 +1,6 @@