From 236ee5b0afa31a2b10d4120ac74a2a79f18d6114 Mon Sep 17 00:00:00 2001 From: Jake Jarvis Date: Fri, 3 Apr 2020 17:09:46 -0400 Subject: [PATCH] small fix to spacing on responsive list pages and make CI & Netlify use a newest version of Go (required for modules) --- .dependabot/config.yml | 8 ++++++-- .github/workflows/ci.yml | 3 +++ .lighthouserc.json | 5 ++--- README.md | 6 +++--- assets/sass/pages/_list.scss | 3 ++- assets/sass/pages/_single.scss | 3 ++- layouts/_default/single.amp.html | 2 +- netlify.toml | 1 + package.json | 2 +- 9 files changed, 21 insertions(+), 12 deletions(-) diff --git a/.dependabot/config.yml b/.dependabot/config.yml index f1dc849a..9c703e64 100644 --- a/.dependabot/config.yml +++ b/.dependabot/config.yml @@ -5,8 +5,12 @@ update_configs: update_schedule: "live" default_labels: - "dependencies" - - package_manager: "docker" + default_reviewers: + - "jakejarvis" + - package_manager: "go:modules" directory: "/" - update_schedule: "weekly" + update_schedule: "daily" default_labels: - "dependencies" + default_reviewers: + - "jakejarvis" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3bf91505..c9035a32 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,6 +63,9 @@ jobs: - uses: actions/setup-node@v1 with: node-version: '12.x' + - uses: actions/setup-go@v2-beta + with: + go-version: '1.14.x' # https://github.com/actions/cache/blob/master/examples.md#node---yarn # https://github.com/actions/cache/issues/60 - name: Get yarn cache location diff --git a/.lighthouserc.json b/.lighthouserc.json index 696be188..12947554 100644 --- a/.lighthouserc.json +++ b/.lighthouserc.json @@ -6,15 +6,14 @@ "assert": { "preset": "lighthouse:no-pwa", "assertions": { - "color-contrast": ["warn", {"minScore": 0.9}], "errors-in-console": "warn", + "frame-title": "warn", "link-text": "warn", - "offscreen-images": "warn", - "tap-targets": ["warn", {"minScore": 0.6}], "total-byte-weight": ["warn", {"minScore": 0.9}], "unused-css-rules": "warn", "uses-rel-preconnect": "warn", "is-crawlable": "off", + "offscreen-images": "off", "redirects-http": "off", "uses-http2": "off", "uses-long-cache-ttl": "off", diff --git a/README.md b/README.md index eb8a08fa..c594447e 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Personal website of [@jakejarvis](https://github.com/jakejarvis), created and deployed using the following: -- [Hugo extended](https://github.com/gohugoio/hugo) +- [Hugo Extended](https://github.com/gohugoio/hugo) - [Netlify](https://www.netlify.com/) - [Simple Analytics](https://referral.simpleanalytics.com/jake-jarvis) (referral link) - [utteranc.es](https://utteranc.es/) @@ -22,7 +22,7 @@ I keep an ongoing list of [blog post ideas](https://github.com/jakejarvis/jarv.i #### Using Yarn/NPM: -Run `yarn install` ([Yarn must be installed](https://yarnpkg.com/en/docs/install) first, or use `npm install`) and `yarn start` (or `npm start`), then open [http://localhost:1337/](http://localhost:1337/). Pages will live-refresh when source files are changed. +Run `yarn install` ([Yarn must be installed](https://yarnpkg.com/en/docs/install) first, or use `npm install` if you insist) and `yarn start` (or `npm start`), then open [http://localhost:1337/](http://localhost:1337/). Pages will live-refresh when source files are changed. #### Using Docker: @@ -33,7 +33,7 @@ docker build -t jarv.is -f Dockerfile . docker run -v $(pwd):/src -p 1337:1337 jarv.is ``` -...then open [http://localhost:1337/](http://localhost:1337/) as above. +...then open [http://localhost:1337/](http://localhost:1337/). ## Licenses diff --git a/assets/sass/pages/_list.scss b/assets/sass/pages/_list.scss index f836e201..88a466d7 100644 --- a/assets/sass/pages/_list.scss +++ b/assets/sass/pages/_list.scss @@ -24,6 +24,7 @@ main#list { li { display: flex; letter-spacing: -0.011em; + line-height: 1.75; div.date { color: $color-medium; @@ -32,7 +33,7 @@ main#list { } + li { - margin-top: 1.3em; + margin-top: 1em; } &:last-child { diff --git a/assets/sass/pages/_single.scss b/assets/sass/pages/_single.scss index c7d9a0db..adaadc3e 100644 --- a/assets/sass/pages/_single.scss +++ b/assets/sass/pages/_single.scss @@ -26,7 +26,7 @@ main#single { margin-top: 0.3em; margin-bottom: 0.5em; font-size: 2.2em; - line-height: 1.25; + line-height: 1.3; font-weight: 700; a { @@ -52,6 +52,7 @@ main#single { padding: 0.8em 1.1em; h1#title { + margin-top: 0.5em; font-size: 1.8em; } diff --git a/layouts/_default/single.amp.html b/layouts/_default/single.amp.html index 2285284e..13042204 100644 --- a/layouts/_default/single.amp.html +++ b/layouts/_default/single.amp.html @@ -102,7 +102,7 @@ p.meta { text-align: center; margin: 0.25em; - color: #777777; + color: #757575; } p.meta a { text-decoration: none; diff --git a/netlify.toml b/netlify.toml index 1bcb2f64..8e9f10a1 100644 --- a/netlify.toml +++ b/netlify.toml @@ -6,6 +6,7 @@ NODE_VERSION = "12.16.1" YARN_VERSION = "1.22.4" YARN_FLAGS = "--no-ignore-optional --frozen-lockfile" + GO_VERSION = "1.14.1" # Ensure *only* Pretty URLs are enabled, even though this is already set up in # the Netlify dashboard. diff --git a/package.json b/package.json index 01c111e2..d8171e05 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "build:preview": "run-s clean hugo:dev", "hugo": "hugo --gc --cleanDestinationDir --verbose", "hugo:dev": "hugo --environment development --baseURL \"${DEPLOY_PRIME_URL:-/}\" --buildDrafts --buildFuture --gc --cleanDestinationDir --verbose", - "start": "hugo server --buildDrafts --buildFuture --port 1337 --bind 0.0.0.0 --verbose", + "start": "hugo server --disableFastRender --buildDrafts --buildFuture --port 1337 --bind 0.0.0.0 --verbose", "optimize": "run-s optimize:**", "optimize:emoji": "rimraf public/twemoji/{*.html,72x72}", "optimize:html": "html-minifier --html5 --collapse-whitespace --collapse-boolean-attributes --preserve-line-breaks --minify-css --file-ext html --input-dir public --output-dir public **/*.html",