Updated favicons

Signed-off-by: Marcus Noble <github@marcusnoble.co.uk>

.nvmrc

@@ -1 +1 @@
-8
+16

.tool-versions

@@ -1 +0,0 @@
-nodejs 12.22.4

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"]

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"
   }
 }

src/browserconfig.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig><msapplication><tile><square70x70logo src="/images/favico/ms-icon-70x70.png"/><square150x150logo src="/images/favico/ms-icon-150x150.png"/><square310x310logo src="/images/favico/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>

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 {

src/manifest.json

@@ -2,37 +2,37 @@
  "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"

templates/partials/head.html

@@ -18,24 +18,33 @@
   <!-- Twitter Do Not Track -->
   <meta name="twitter:dnt" content="on">
 
-  <link rel="apple-touch-icon" href="/images/favico/apple-icon-180x180.png"/>
-  <link rel="apple-touch-icon" sizes="57x57" href="/images/favico/apple-icon-57x57.png">
-  <link rel="apple-touch-icon" sizes="60x60" href="/images/favico/apple-icon-60x60.png">
-  <link rel="apple-touch-icon" sizes="72x72" href="/images/favico/apple-icon-72x72.png">
-  <link rel="apple-touch-icon" sizes="76x76" href="/images/favico/apple-icon-76x76.png">
-  <link rel="apple-touch-icon" sizes="114x114" href="/images/favico/apple-icon-114x114.png">
-  <link rel="apple-touch-icon" sizes="120x120" href="/images/favico/apple-icon-120x120.png">
-  <link rel="apple-touch-icon" sizes="144x144" href="/images/favico/apple-icon-144x144.png">
-  <link rel="apple-touch-icon" sizes="152x152" href="/images/favico/apple-icon-152x152.png">
-  <link rel="apple-touch-icon" sizes="180x180" href="/images/favico/apple-icon-180x180.png">
-  <link rel="icon" type="image/png" sizes="192x192"  href="/images/favico/android-icon-192x192.png">
-  <link rel="icon" type="image/png" sizes="32x32" href="/images/favico/favicon-32x32.png">
-  <link rel="icon" type="image/png" sizes="96x96" href="/images/favico/favicon-96x96.png">
-  <link rel="icon" type="image/png" sizes="16x16" href="/images/favico/favicon-16x16.png">
-  <link rel="manifest" href="/manifest.json">
-  <meta name="msapplication-TileColor" content="#ffffff">
-  <meta name="msapplication-TileImage" content="/images/favico/ms-icon-144x144.png">
+  <!-- For old IEs -->
+  <link rel="shortcut icon" href="/images/favico/favicon.ico" />
+  <!-- For new browsers - multisize ico  -->
+  <link rel="icon" type="image/x-icon" sizes="16x16 32x32" href="/images/favico/favicon.ico">
+  <!-- For iPad with high-resolution Retina display running iOS ≥ 7: -->
+  <link rel="apple-touch-icon" sizes="152x152" href="/images/favico/favicon-152-precomposed.png">
+  <!-- For iPad with high-resolution Retina display running iOS ≤ 6: -->
+  <link rel="apple-touch-icon" sizes="144x144" href="/images/favico/favicon-144-precomposed.png">
+  <!-- For iPhone with high-resolution Retina display running iOS ≥ 7: -->
+  <link rel="apple-touch-icon" sizes="120x120" href="/images/favico/favicon-120-precomposed.png">
+  <!-- For iPhone with high-resolution Retina display running iOS ≤ 6: -->
+  <link rel="apple-touch-icon" sizes="114x114" href="/images/favico/favicon-114-precomposed.png">
+  <!-- For iPhone 6+ -->
+  <link rel="apple-touch-icon" sizes="180x180" href="/images/favico/favicon-180-precomposed.png">
+  <!-- For first- and second-generation iPad: -->
+  <link rel="apple-touch-icon" sizes="72x72" href="/images/favico/favicon-72-precomposed.png">
+  <!-- For non-Retina iPhone, iPod Touch, and Android 2.1+ devices: -->
+  <link rel="apple-touch-icon" sizes="57x57" href="/images/favico/favicon-57.png">
+  <!-- For Old Chrome -->
+  <link rel="icon" sizes="32x32" href="/images/favico/favicon-32.png" >
+  <!-- For IE10 Metro -->
+  <meta name="msapplication-TileColor" content="#FFFFFF">
+  <meta name="msapplication-TileImage" content="/images/favico/favicon-192.png">
   <meta name="theme-color" content="#ffffff">
+  <!-- Chrome for Android -->
+  <link rel="manifest" href="manifest.json">
+  <link rel="icon" sizes="192x192" href="/images/favico/favicon-192.png">
 
   <link rel="stylesheet" href="/css/main.css?{{moment date 'YYYYMMDDHHMM'}}">
   <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ site.url }}/feed.xml">

templates/partials/header.html

@@ -1,6 +1,6 @@
 <header class="container">
   <h1>
-    <a href="/"><img src="/images/marcus.jpg" />{{site.title}}</a>
+    <a href="/"><img src="/images/marcus-transparent.png" />{{site.title}}</a>
 
     <a href="https://www.github.com/AverageMarcus" class="social github-icon" title="View my projects on GitHub">
       <svg viewBox="0 0 16 16"><path fill="#000" d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761 c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32 c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472 c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037 C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65 c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261 c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082 c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129 c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z"></path></svg>