From 24edb85379c8a90e2944a33fb03fcc0e65e9db9b Mon Sep 17 00:00:00 2001
From: Jake Jarvis <jake@jarv.is>
Date: Thu, 14 May 2020 13:36:27 -0400
Subject: [PATCH] create inline-svg partial function

[skip ci]
---
 .eslintrc.json                                         |  3 +--
 .lighthouserc.json                                     |  2 --
 .markdownlintrc                                        |  7 +------
 .stylelintrc                                           | 10 +---------
 layouts/_default/single.amp.html                       |  2 +-
 .../{svg/logo.svg.html => functions/inline-svg.html}   |  3 ++-
 layouts/partials/page/header.html                      |  2 +-
 7 files changed, 7 insertions(+), 22 deletions(-)
 rename layouts/partials/{svg/logo.svg.html => functions/inline-svg.html} (80%)

diff --git a/.eslintrc.json b/.eslintrc.json
index c2bb3138..967ce5b8 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -7,6 +7,5 @@
     "browser": true,
     "es6": true
   },
-  "rules": {
-  }
+  "rules": {}
 }
diff --git a/.lighthouserc.json b/.lighthouserc.json
index 63f92e3d..c44826f9 100644
--- a/.lighthouserc.json
+++ b/.lighthouserc.json
@@ -7,8 +7,6 @@
       "preset": "lighthouse:no-pwa",
       "assertions": {
         "color-contrast": "warn",
-        "errors-in-console": "warn",
-        "frame-title": "warn",
         "link-text": "warn",
         "total-byte-weight": ["warn", {"minScore": 0.9}],
         "unminified-javascript": "warn",
diff --git a/.markdownlintrc b/.markdownlintrc
index cd7f5667..e259029a 100644
--- a/.markdownlintrc
+++ b/.markdownlintrc
@@ -3,16 +3,11 @@
   "code-block-style": { "style": "fenced" },
   "code-fence-style": { "style": "backtick" },
   "fenced-code-language": true,
-  "heading-increment": false,
   "heading-style": { "style": "atx" },
   "hr-style": { "style": "---" },
   "line-length": false,
-  "no-bare-urls": false,
-  "no-blanks-blockquote": true,
   "no-empty-links": false,
-  "no-hard-tabs": false,
-  "no-inline-html": { "allowed_elements": [ "p", "a", "strong", "em", "img", "svg", "path", "polygon", "circle", "g", "h2", "h3", "code", "span", "sup", "figure", "figcaption", "iframe" ] },
-  "no-multiple-blanks": false,
+  "no-inline-html": { "allowed_elements": [ "p", "a", "strong", "em", "img", "svg", "path", "polygon", "circle", "g", "code", "span", "sup", "figure", "figcaption", "iframe" ] },
   "no-trailing-punctuation": false,
   "single-h1": false,
   "whitespace": false
diff --git a/.stylelintrc b/.stylelintrc
index 7ab4f3de..e38bbfaa 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -6,20 +6,12 @@
   "plugins": ["stylelint-prettier"],
   "rules": {
     "color-hex-length": "long",
-    "function-parentheses-space-inside": null,
     "function-url-quotes": null,
-    "indentation": [ 2, { "severity": "warning" } ],
     "max-nesting-depth": 6,
-    "number-no-trailing-zeros": null,
     "order/properties-alphabetical-order": null,
-    "rule-empty-line-before": null,
-    "scss/dollar-variable-colon-space-after": null,
-    "selector-list-comma-newline-after": null,
     "selector-max-compound-selectors": null,
     "selector-max-id": null,
     "selector-no-qualifying-type": null,
-    "selector-pseudo-element-no-unknown": [ true, { "ignorePseudoElements": [ "cue" ] } ],
-    "shorthand-property-no-redundant-values": null,
-    "string-quotes": [ "double", { "severity": "warning" } ]
+    "shorthand-property-no-redundant-values": null
   }
 }
diff --git a/layouts/_default/single.amp.html b/layouts/_default/single.amp.html
index 4b5eacc3..591a2157 100644
--- a/layouts/_default/single.amp.html
+++ b/layouts/_default/single.amp.html
@@ -250,7 +250,7 @@
     <header>
       <nav>
         <a id="logo" href="{{ .Site.BaseURL }}" title="{{ .Site.Title }}">
-          {{ partial "svg/logo.svg" (dict "width" 30 "height" 45) }}
+          {{ partial "functions/inline-svg" (dict "src" "img/logo.svg" "width" 30 "height" 45) }}
           <span id="name">{{ .Site.Title }}</span>
         </a>
 
diff --git a/layouts/partials/svg/logo.svg.html b/layouts/partials/functions/inline-svg.html
similarity index 80%
rename from layouts/partials/svg/logo.svg.html
rename to layouts/partials/functions/inline-svg.html
index e3ec4375..563bac6c 100644
--- a/layouts/partials/svg/logo.svg.html
+++ b/layouts/partials/functions/inline-svg.html
@@ -1,4 +1,4 @@
-{{ $svg := resources.Get "img/logo.svg" -}}
+{{ $svg := resources.Get .src -}}
 {{ $html := $svg.Content -}}
 
 {{/* remove unneeded tags/attributes when SVG is inlined versus a .svg file */}}
@@ -10,5 +10,6 @@
 
 {{ $html = replace $html "<svg" $wxh -}}
 
+{{/* bit of a hack: calling .Permalink so that the SVG file is published too */}}
 {{ printf "<!-- auto-inlined from: %s -->" $svg.Permalink | safeHTML }}
 {{ $html | safeHTML -}}
diff --git a/layouts/partials/page/header.html b/layouts/partials/page/header.html
index 14ed90f5..dd77e8ca 100644
--- a/layouts/partials/page/header.html
+++ b/layouts/partials/page/header.html
@@ -1,7 +1,7 @@
 <header>
   <nav>
     <a class="no-underline" href="{{ .Site.BaseURL }}" id="logo" rel="me author" aria-label="{{ .Site.Title }}">
-      {{ partial "svg/logo.svg" (dict "width" 28 "height" 40) }}
+      {{ partial "functions/inline-svg" (dict "src" "img/logo.svg" "width" 28 "height" 40) }}
       <h1 id="name">{{ .Site.Title }}</h1>
     </a>
     <ul>