diff --git a/.github/workflows/build-and-lint.yml b/.github/workflows/build-and-lint.yml index c3d64d4e..22537daf 100644 --- a/.github/workflows/build-and-lint.yml +++ b/.github/workflows/build-and-lint.yml @@ -31,16 +31,11 @@ jobs: key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} restore-keys: | ${{ runner.os }}-yarn- - - name: Install dependencies - run: yarn install --no-ignore-optional --frozen-lockfile - - name: Hugo version - run: yarn debug:hugo - - name: Build Hugo - run: yarn build:preview - - name: Lint Styles - run: yarn lint:sass - - name: Lint Markdown - run: yarn lint:markdown + - run: yarn install --no-ignore-optional --frozen-lockfile + - run: yarn debug:hugo + - run: yarn build:preview + - run: yarn lint + continue-on-error: true - uses: actions/upload-artifact@v1 if: github.event_name == 'pull_request' with: diff --git a/layouts/index.manifest.json b/layouts/index.manifest.json index 0f12d601..b7ba39b4 100644 --- a/layouts/index.manifest.json +++ b/layouts/index.manifest.json @@ -3,39 +3,14 @@ "short_name": "{{ .Site.Params.domain }}", "icons": [ { - "src": "{{ "favicon-512.png" | absURL }}", + "src": "{{ "android-chrome-512x512.png" | absURL }}", "sizes": "512x512", "type": "image/png" }, { - "src": "{{ "favicon-192.png" | absURL }}", + "src": "{{ "android-chrome-192x192.png" | absURL }}", "sizes": "192x192", "type": "image/png" - }, - { - "src": "{{ "favicon-180.png" | absURL }}", - "sizes": "180x180", - "type": "image/png" - }, - { - "src": "{{ "favicon-152.png" | absURL }}", - "sizes": "152x152", - "type": "image/png" - }, - { - "src": "{{ "favicon-128.png" | absURL }}", - "sizes": "128x128", - "type": "image/png" - }, - { - "src": "{{ "favicon-96.png" | absURL }}", - "sizes": "96x96", - "type": "image/png" - }, - { - "src": "{{ "favicon-64.png" | absURL }}", - "sizes": "64x64", - "type": "image/png" } ], "start_url": "{{ .Site.BaseURL }}", diff --git a/layouts/index.redirects b/layouts/index.redirects index 063f6709..a184d7c9 100644 --- a/layouts/index.redirects +++ b/layouts/index.redirects @@ -11,3 +11,4 @@ # https://github.com/w3c/manifest/issues/689 /manifest.webmanifest /manifest.json 200 +/site.webmanifest /manifest.json 200 diff --git a/layouts/partials/head/favicons.html b/layouts/partials/head/favicons.html index 3afa9e61..5624fea3 100644 --- a/layouts/partials/head/favicons.html +++ b/layouts/partials/head/favicons.html @@ -1,4 +1,4 @@ - + {{ range (split .png_sizes " ") -}} diff --git a/layouts/partials/head/head.html b/layouts/partials/head/head.html index 62f52662..a34d3bee 100644 --- a/layouts/partials/head/head.html +++ b/layouts/partials/head/head.html @@ -4,10 +4,12 @@ + {{ partialCached "head/preload" . -}} {{ partialCached "head/styles" . -}} {{ partialCached "head/favicons" (dict "png_sizes" "192 48 32 16" "ico_sizes" "16 32 48") -}} + diff --git a/netlify.toml b/netlify.toml index a090ede7..538c767b 100644 --- a/netlify.toml +++ b/netlify.toml @@ -43,6 +43,7 @@ X-XSS-Protection = "1; mode=block" # X-XSS-Protection = "1; mode=block; report=https://jarvis.report-uri.com/r/d/xss/enforce" X-Got-Milk = "always" + X-View-Source = "https://go.jarv.is/source" # PGP file: open in browser, download correctly [[headers]] @@ -52,12 +53,17 @@ Content-Type = "text/plain; charset=utf-8" Content-Disposition = "inline; filename=\"jarvis.asc\"" -# Redirect default Netlify subdomain to primary domain: +# Redirect www and Netlify subdomains to primary domain: [[redirects]] from = "https://jakejarvis.netlify.com/*" to = "https://jarv.is/:splat" status = 301 force = true +[[redirects]] + from = "https://www.jarv.is/*" + to = "https://jarv.is/:splat" + status = 301 + force = true # Support ancient RSS subscriptions and links from WordPress era: [[redirects]] @@ -95,11 +101,11 @@ # and keep the main repository squeaky clean: [[redirects]] from = "/y2k/*" - to = "https://jakejarvis.github.io/y2k/:splat" + to = "https://modest-jackson-d5516b.netlify.com/y2k/:splat" status = 200 [[redirects]] from = "/ios-trackers/*" - to = "https://jakejarvis.github.io/ios-trackers/:splat" + to = "https://modest-jackson-d5516b.netlify.com/ios-trackers/:splat" status = 200 [[redirects]] from = "/scrabble/*" @@ -118,6 +124,11 @@ to = "https://modest-jackson-d5516b.netlify.com/awesome/:splat" status = 200 +# More miscellaneous mirrors: +[[redirects]] + from = "/apple-touch-icon-precomposed.png" + to = "/apple-touch-icon.png" + status = 200 [[redirects]] from = "/me_lg.jpg" to = "/me_large.jpg" diff --git a/static/android-chrome-192x192.png b/static/android-chrome-192x192.png new file mode 100644 index 00000000..155f0141 Binary files /dev/null and b/static/android-chrome-192x192.png differ diff --git a/static/android-chrome-512x512.png b/static/android-chrome-512x512.png new file mode 100644 index 00000000..a09f36c7 Binary files /dev/null and b/static/android-chrome-512x512.png differ diff --git a/static/apple-touch-icon.png b/static/apple-touch-icon.png index 9e1bc270..bef1e452 100644 Binary files a/static/apple-touch-icon.png and b/static/apple-touch-icon.png differ diff --git a/static/browserconfig.xml b/static/browserconfig.xml new file mode 100644 index 00000000..d3cb8fd1 --- /dev/null +++ b/static/browserconfig.xml @@ -0,0 +1,10 @@ + + + + + + + #0e6dc2 + + + diff --git a/static/mstile-150x150.png b/static/mstile-150x150.png new file mode 100644 index 00000000..de277d2a Binary files /dev/null and b/static/mstile-150x150.png differ diff --git a/static/mstile-310x310.png b/static/mstile-310x310.png new file mode 100644 index 00000000..709be6f9 Binary files /dev/null and b/static/mstile-310x310.png differ