diff --git a/assets/sass/components/_footer.scss b/assets/sass/components/_footer.scss index db198bd9..f9253dea 100644 --- a/assets/sass/components/_footer.scss +++ b/assets/sass/components/_footer.scss @@ -11,7 +11,6 @@ footer { color: $color-light; border-top: 1px solid $color-super-light; - /* stylelint-disable-next-line no-descending-specificity */ a { color: inherit; } diff --git a/assets/sass/pages/_list.scss b/assets/sass/pages/_list.scss index 2bac2716..57b97d48 100644 --- a/assets/sass/pages/_list.scss +++ b/assets/sass/pages/_list.scss @@ -9,20 +9,17 @@ main#list { section.year { font-size: 1.1em; - /* stylelint-disable-next-line no-descending-specificity */ h2 { font-size: 1.8em; margin: 0; } - /* stylelint-disable-next-line no-descending-specificity */ ul { list-style-type: none; padding-left: 0; display: block; } - /* stylelint-disable-next-line no-descending-specificity */ li { display: flex; @@ -38,12 +35,10 @@ main#list { clear: both; } - /* stylelint-disable-next-line no-descending-specificity */ &:last-child { margin-bottom: 1.8em; } - /* stylelint-disable-next-line no-descending-specificity */ + li { margin-top: 1.3em; } diff --git a/layouts/partials/schema-article.html b/layouts/partials/schema-article.html index 408f7f6f..f97eaf20 100644 --- a/layouts/partials/schema-article.html +++ b/layouts/partials/schema-article.html @@ -20,7 +20,7 @@ "headline": {{ .Title }}, "datePublished": {{ .PublishDate.Format "2006-01-02T15:04:05-07:00" }}, "dateModified": {{ .PublishDate.Format "2006-01-02T15:04:05-07:00" }}, - "keywords": "{{ with .Params.tags }}{{ range $index, $tag := . }}{{ if gt $index 0 }}, {{ end }}{{ $tag }}{{ end }}{{ end }}", + "keywords": {{ with .Params.tags }}{{ delimit . ", " }}{{ end }}, "description": {{ if .Description }}{{ .Description }}{{ else }}{{ .Site.Params.description }}{{ end }}, "wordCount": "{{ .WordCount }}", "author": { diff --git a/package.json b/package.json index dc3f8128..e341a95f 100644 --- a/package.json +++ b/package.json @@ -17,8 +17,9 @@ "hugo:serve": "hugo server --buildDrafts --buildFuture --port 1313 --bind=0.0.0.0 --verbose", "docker:serve": "docker build -t jarv.is:develop -f Dockerfile . && docker run -v $(pwd):/src -p 1313:1313 jarv.is:develop", "netlify:serve": "netlify dev --command 'yarn hugo:serve'", - "optimize": "yarn optimize:html && yarn optimize:img", + "optimize": "yarn optimize:html && yarn optimize:css && yarn optimize:img", "optimize:html": "html-minifier --html5 --collapse-whitespace --preserve-line-breaks --minify-css --file-ext html --input-dir public --output-dir public **/*.html", + "optimize:css": "cleancss -O0 --format 'keep-breaks' -o public/style.css public/style.css", "optimize:img": "find public/ -type d -exec imagemin {}/* --plugin=jpegoptim --plugin=pngquant --plugin=optipng --plugin=svgo --plugin=gifsicle --out-dir={} \\;", "lint": "yarn lint:markdown; yarn lint:sass", "lint:markdown": "markdownlint content/notes/**/*.md", @@ -28,6 +29,7 @@ }, "dependencies": {}, "devDependencies": { + "clean-css-cli": "~4.3.0", "html-minifier": "~4.0.0", "imagemin-cli": "^5.0.0", "imagemin-gifsicle": "^6.0.1", diff --git a/yarn.lock b/yarn.lock index fbdd592e..2270bb53 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1345,6 +1345,15 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" +clean-css-cli@~4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/clean-css-cli/-/clean-css-cli-4.3.0.tgz#8502aa86d1879e5b111af51b3c2abb799e0684ce" + integrity sha512-8GHZfr+mG3zB/Lgqrr27qHBFsPSn0fyEI3f2rIZpxPxUbn2J6A8xyyeBRVTW8duDuXigN0s80vsXiXJOEFIO5Q== + dependencies: + clean-css "^4.2.1" + commander "2.x" + glob "7.x" + clean-css@^4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17" @@ -1553,7 +1562,7 @@ colors@^1.1.2: resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== -commander@^2.19.0, commander@^2.3.0, commander@~2.20.3: +commander@2.x, commander@^2.19.0, commander@^2.3.0, commander@~2.20.3: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -3092,7 +3101,7 @@ glob-to-regexp@^0.3.0: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs= -glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.2: +glob@7.x, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.2: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==