diff --git a/.stylelintrc b/.stylelintrc index 1f041daa..4c6895aa 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -1,8 +1,6 @@ { "extends": "stylelint-config-sass-guidelines", - "plugins": [ - "stylelint-declaration-block-no-ignored-properties" - ], + "plugins": [], "rules": { "color-hex-length": "long", "function-parentheses-space-inside": null, @@ -11,7 +9,6 @@ "max-nesting-depth": 5, "number-no-trailing-zeros": null, "order/properties-alphabetical-order": null, - "plugin/declaration-block-no-ignored-properties": true, "rule-empty-line-before": null, "scss/dollar-variable-colon-space-after": null, "selector-list-comma-newline-after": null, diff --git a/assets/sass/components/_wave.scss b/assets/sass/components/_wave.scss index 393101ab..2f9b2a98 100644 --- a/assets/sass/components/_wave.scss +++ b/assets/sass/components/_wave.scss @@ -10,6 +10,7 @@ span.wave { transform-origin: 70% 70%; } +// stylelint-disable indentation @keyframes wave { 0% { transform: rotate( 0.0deg); } 10% { transform: rotate(-10.0deg); } diff --git a/assets/sass/pages/_videos.scss b/assets/sass/pages/_videos.scss index da41844c..b16f5fea 100644 --- a/assets/sass/pages/_videos.scss +++ b/assets/sass/pages/_videos.scss @@ -31,12 +31,6 @@ main#video { video { width: $responsive-width; height: auto; - - // Subtitle caption styling - // stylelint-disable-next-line selector-pseudo-element-no-unknown - &::cue { - font-family: inherit; - } } } diff --git a/layouts/rss.xml b/layouts/rss.xml index 073ba514..3d2ac4f7 100644 --- a/layouts/rss.xml +++ b/layouts/rss.xml @@ -21,7 +21,7 @@ {{ .Title }} {{ .Permalink }} {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} - {{ with .Site.Author.email }}{{ . }}{{ with $.Site.Author.name }} ({{ . }}){{ end }}{{ end }} + {{ with .Site.Author.name }}{{ . }}{{ end }} {{ .Permalink }} {{ .Content | html }} diff --git a/netlify.toml b/netlify.toml index 4b698547..60ca150c 100644 --- a/netlify.toml +++ b/netlify.toml @@ -44,7 +44,7 @@ # X-XSS-Protection = "1; mode=block; report=https://jarvis.report-uri.com/r/d/xss/enforce" X-Pingback = "https://jarv.is/ping/xmlrpc" X-Got-Milk = "always" - X-View-Source = "https://go.jarv.is/source" + X-View-Source = "https://github.com/jakejarvis/jarv.is" # PGP file: open in browser, download correctly [[headers]] @@ -54,7 +54,7 @@ Content-Type = "text/plain; charset=UTF-8" Content-Disposition = "inline; filename=\"jarvis.asc\"" -# Redirect www and Netlify subdomains to primary domain: +# Redirect Netlify and www subdomains to primary domain: [[redirects]] from = "https://jakejarvis.netlify.com/*" to = "https://jarv.is/:splat" @@ -71,32 +71,26 @@ from = "/feed" to = "/feed.xml" status = 301 - force = true [[redirects]] from = "/rss" to = "/feed.xml" status = 301 - force = true [[redirects]] from = "/index.xml" to = "/feed.xml" status = 301 - force = true [[redirects]] from = "/index.php*" to = "/" status = 301 - force = true [[redirects]] from = "/blog/*" to = "/notes/" status = 301 - force = true [[redirects]] from = "/archives/*" to = "/notes/" status = 301 - force = true # Proxy these directories from elsewhere to mimic GitHub Pages behavior and # keep this main repository squeaky clean. @@ -156,19 +150,15 @@ from = "*/wp-login.php" to = "/403.html" status = 403 - force = true [[redirects]] from = "*/wp-admin/*" to = "/403.html" status = 403 - force = true [[redirects]] from = "/login" to = "/403.html" status = 403 - force = true [[redirects]] from = "*/login.php" to = "/403.html" status = 403 - force = true diff --git a/package.json b/package.json index 7fe3bd95..481046e7 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,6 @@ "rimraf": "^3.0.0", "stylelint": "~12.0.1", "stylelint-config-sass-guidelines": "~6.2.0", - "stylelint-declaration-block-no-ignored-properties": "~2.2.0", "stylelint-scss": "~3.13.0" }, "engines": { diff --git a/yarn.lock b/yarn.lock index 340f193b..2baff372 100644 --- a/yarn.lock +++ b/yarn.lock @@ -732,9 +732,9 @@ caw@^2.0.0, caw@^2.0.1: url-to-options "^1.0.1" ccount@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.4.tgz#9cf2de494ca84060a2a8d2854edd6dfb0445f386" - integrity sha512-fpZ81yYfzentuieinmGnphk0pLkOTMm6MZdVqwd77ROvhko6iujLNGrHH5E7utq3ygWklwfmwuG+A7P+NpqT6w== + version "1.0.5" + resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.5.tgz#ac82a944905a65ce204eb03023157edf29425c17" + integrity sha512-MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw== chalk@^1.0.0: version "1.1.3" @@ -2543,7 +2543,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: +inherits@2, inherits@2.0.4, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -5052,9 +5052,9 @@ stable@^0.1.8: integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== state-toggle@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.2.tgz#75e93a61944116b4959d665c8db2d243631d6ddc" - integrity sha512-8LpelPGR0qQM4PnfLiplOQNJcIN1/r2Gy0xKB2zKnIW2YzPMt2sR4I/+gtPjhN7Svh9kw+zqEg2SFwpBO9iNiw== + version "1.0.3" + resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe" + integrity sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ== static-extend@^0.1.1: version "0.1.2" @@ -5229,13 +5229,6 @@ stylelint-config-sass-guidelines@~6.2.0: stylelint-order "^3.0.0" stylelint-scss "^3.4.0" -stylelint-declaration-block-no-ignored-properties@~2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/stylelint-declaration-block-no-ignored-properties/-/stylelint-declaration-block-no-ignored-properties-2.2.0.tgz#fdde13fdd53b2f7e8930e5986e768f41649a576e" - integrity sha512-SUq40z02Cu0SHF7tY4TLQG88qSPE55R2AZlczHOt/j6IEN8vk2o1mEr+HIWVqOS31sK2JtdvCQzvGSM7R5nOWw== - dependencies: - postcss "^7.0.17" - stylelint-order@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/stylelint-order/-/stylelint-order-3.1.1.tgz#ba9ea6844d1482f97f31204e7c9605c7b792c294" @@ -5570,12 +5563,12 @@ unbzip2-stream@^1.0.9: through "^2.3.8" unherit@^1.0.4: - version "1.1.2" - resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.2.tgz#14f1f397253ee4ec95cec167762e77df83678449" - integrity sha512-W3tMnpaMG7ZY6xe/moK04U9fBhi6wEiCYHUW5Mop/wQHf12+79EQGwxYejNdhEz2mkqkBlGwm7pxmgBKMVUj0w== + version "1.1.3" + resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22" + integrity sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ== dependencies: - inherits "^2.0.1" - xtend "^4.0.1" + inherits "^2.0.0" + xtend "^4.0.0" unified@^7.0.0: version "7.1.0"