From edc1307b1ac0d9f4b6287a9ec7e1283b9a51f525 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Wed, 22 Jul 2020 23:41:46 +0200 Subject: [PATCH] refactor head partials --- CHANGELOG.md | 8 +++----- gulpfile.js | 15 ++++++++------- layouts/404.html | 6 +++++- layouts/_default/baseof.html | 6 +++++- layouts/partials/head/favicons.html | 1 + layouts/partials/{head.html => head/meta.html} | 13 ------------- layouts/partials/head/others.html | 10 ++++++++++ layouts/partials/site-header.html | 2 +- src/favicon/faviconData.json | 2 +- src/sass/_base.scss | 4 ++++ 10 files changed, 38 insertions(+), 29 deletions(-) create mode 100644 layouts/partials/head/favicons.html rename layouts/partials/{head.html => head/meta.html} (56%) create mode 100644 layouts/partials/head/others.html diff --git a/CHANGELOG.md b/CHANGELOG.md index 9dcd711..19fb632 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,4 @@ - ENHANCEMENT - - allow setting some common meta elements e.g. description and authors - - prevent duplicate title on the start page - - add basic robots.txt -- BUGFIX - - dont display duplicate title on home page + - split head partials into smaller parts to allow simple overwrites for e.g. custom favicons + - scale down page title on mobile media-query + - add missing title to branding image diff --git a/gulpfile.js b/gulpfile.js index 9510793..fca759e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -36,7 +36,7 @@ gulp.task('favicon-generate', function (done) { design: { ios: { pictureAspect: 'backgroundAndMargin', - backgroundColor: '#ffffff', + backgroundColor: '#2f333e', margin: '14%', assets: { ios6AndPriorIcons: false, @@ -48,7 +48,7 @@ gulp.task('favicon-generate', function (done) { desktopBrowser: {}, windows: { pictureAspect: 'whiteSilhouette', - backgroundColor: '#2b5797', + backgroundColor: '#2f333e', onConflict: 'override', assets: { windows80Ie10Tile: false, @@ -61,8 +61,10 @@ gulp.task('favicon-generate', function (done) { } }, androidChrome: { - pictureAspect: 'shadow', - themeColor: '#ffffff', + pictureAspect: 'backgroundAndMargin', + margine: '14px', + backgroundColor: '#2f333e', + themeColor: '#2f333e', manifest: { display: 'standalone', orientation: 'notSet', @@ -75,9 +77,8 @@ gulp.task('favicon-generate', function (done) { } }, safariPinnedTab: { - pictureAspect: 'blackAndWhite', - threshold: 74.21875, - themeColor: '#5bbad5' + pictureAspect: 'silhouette', + themeColor: '#2f333e' } }, settings: { diff --git a/layouts/404.html b/layouts/404.html index a33d51e..60f81d5 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -2,7 +2,11 @@ - {{ partial "head" . }} + {{ partial "head/meta" . }} + {{ if not (eq .Kind "home") }}{{ partial "title" . }} | {{ end }}{{ .Site.Title }} + + {{ partial "head/favicons" . }} + {{ partial "head/others" . }} diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 1748880..2b30e2a 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -2,7 +2,11 @@ - {{ partial "head" . }} + {{ partial "head/meta" . }} + {{ if not (eq .Kind "home") }}{{ partial "title" . }} | {{ end }}{{ .Site.Title }} + + {{ partial "head/favicons" . }} + {{ partial "head/others" . }} diff --git a/layouts/partials/head/favicons.html b/layouts/partials/head/favicons.html new file mode 100644 index 0000000..4326806 --- /dev/null +++ b/layouts/partials/head/favicons.html @@ -0,0 +1 @@ + diff --git a/layouts/partials/head.html b/layouts/partials/head/meta.html similarity index 56% rename from layouts/partials/head.html rename to layouts/partials/head/meta.html index 8cb7beb..ff94e66 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head/meta.html @@ -20,16 +20,3 @@ {{ end }} {{ end }} -{{ if not (eq .Kind "home") }}{{ partial "title" . }} | {{ end }}{{ .Site.Title }} - - - - - -{{ with .OutputFormats.Get "atom" }} - {{ printf `` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }} -{{ end }} - -{{ "" | safeHTML }} diff --git a/layouts/partials/head/others.html b/layouts/partials/head/others.html new file mode 100644 index 0000000..47b2be0 --- /dev/null +++ b/layouts/partials/head/others.html @@ -0,0 +1,10 @@ + + + +{{ with .OutputFormats.Get "atom" }} + {{ printf `` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }} +{{ end }} + +{{ "" | safeHTML }} diff --git a/layouts/partials/site-header.html b/layouts/partials/site-header.html index 482decc..3f9295b 100644 --- a/layouts/partials/site-header.html +++ b/layouts/partials/site-header.html @@ -2,7 +2,7 @@
- {{ .Site.Title }} + {{ .Site.Title }} {{ .Site.Title }} {{ with .Site.Params.GeekblogSubtitle }} diff --git a/src/favicon/faviconData.json b/src/favicon/faviconData.json index 8cabda4..de8b2d4 100644 --- a/src/favicon/faviconData.json +++ b/src/favicon/faviconData.json @@ -1 +1 @@ -{"result":{"status":"success"},"favicon":{"package_url":"https://realfavicongenerator.net/files/932583a8226fc43ee3fda9a9340275d34ce6f5b5/favicon_package_v0.16.zip","files_urls":["https://realfavicongenerator.net/files/932583a8226fc43ee3fda9a9340275d34ce6f5b5/package_files/android-chrome-192x192.png","https://realfavicongenerator.net/files/932583a8226fc43ee3fda9a9340275d34ce6f5b5/package_files/android-chrome-512x512.png","https://realfavicongenerator.net/files/932583a8226fc43ee3fda9a9340275d34ce6f5b5/package_files/apple-touch-icon.png","https://realfavicongenerator.net/files/932583a8226fc43ee3fda9a9340275d34ce6f5b5/package_files/browserconfig.xml","https://realfavicongenerator.net/files/932583a8226fc43ee3fda9a9340275d34ce6f5b5/package_files/favicon-16x16.png","https://realfavicongenerator.net/files/932583a8226fc43ee3fda9a9340275d34ce6f5b5/package_files/favicon-32x32.png","https://realfavicongenerator.net/files/932583a8226fc43ee3fda9a9340275d34ce6f5b5/package_files/favicon.ico","https://realfavicongenerator.net/files/932583a8226fc43ee3fda9a9340275d34ce6f5b5/package_files/mstile-144x144.png","https://realfavicongenerator.net/files/932583a8226fc43ee3fda9a9340275d34ce6f5b5/package_files/mstile-150x150.png","https://realfavicongenerator.net/files/932583a8226fc43ee3fda9a9340275d34ce6f5b5/package_files/mstile-310x150.png","https://realfavicongenerator.net/files/932583a8226fc43ee3fda9a9340275d34ce6f5b5/package_files/mstile-310x310.png","https://realfavicongenerator.net/files/932583a8226fc43ee3fda9a9340275d34ce6f5b5/package_files/mstile-70x70.png","https://realfavicongenerator.net/files/932583a8226fc43ee3fda9a9340275d34ce6f5b5/package_files/safari-pinned-tab.svg","https://realfavicongenerator.net/files/932583a8226fc43ee3fda9a9340275d34ce6f5b5/package_files/site.webmanifest"],"html_code":"\n\n\n\n\n\n\n","compression":"false","overlapping_markups":["link[rel=\"apple-touch-icon\"]","link[rel=\"shortcut\"]","link[rel=\"shortcut icon\"]","link[rel=\"icon\",sizes=\"16x16\"]","link[rel=\"icon\",sizes=\"32x32\"]","meta[name=\"msapplication-TileColor\"]","meta[name=\"msapplication-TileImage\"]","link[rel=\"manifest\"]","meta[name=\"theme-color\"]","link[rel=\"mask-icon\"]"]},"files_location":{"type":"path","path":"/"},"preview_picture_url":"https://realfavicongenerator.net/files/932583a8226fc43ee3fda9a9340275d34ce6f5b5/favicon_preview.png","version":"0.16"} \ No newline at end of file +{"result":{"status":"success"},"favicon":{"package_url":"https://realfavicongenerator.net/files/a4f0eaa3aee2ec1ff38aa6a49585781a75bbd7f9/favicon_package_v0.16.zip","files_urls":["https://realfavicongenerator.net/files/a4f0eaa3aee2ec1ff38aa6a49585781a75bbd7f9/package_files/android-chrome-192x192.png","https://realfavicongenerator.net/files/a4f0eaa3aee2ec1ff38aa6a49585781a75bbd7f9/package_files/android-chrome-512x512.png","https://realfavicongenerator.net/files/a4f0eaa3aee2ec1ff38aa6a49585781a75bbd7f9/package_files/apple-touch-icon.png","https://realfavicongenerator.net/files/a4f0eaa3aee2ec1ff38aa6a49585781a75bbd7f9/package_files/browserconfig.xml","https://realfavicongenerator.net/files/a4f0eaa3aee2ec1ff38aa6a49585781a75bbd7f9/package_files/favicon-16x16.png","https://realfavicongenerator.net/files/a4f0eaa3aee2ec1ff38aa6a49585781a75bbd7f9/package_files/favicon-32x32.png","https://realfavicongenerator.net/files/a4f0eaa3aee2ec1ff38aa6a49585781a75bbd7f9/package_files/favicon.ico","https://realfavicongenerator.net/files/a4f0eaa3aee2ec1ff38aa6a49585781a75bbd7f9/package_files/mstile-144x144.png","https://realfavicongenerator.net/files/a4f0eaa3aee2ec1ff38aa6a49585781a75bbd7f9/package_files/mstile-150x150.png","https://realfavicongenerator.net/files/a4f0eaa3aee2ec1ff38aa6a49585781a75bbd7f9/package_files/mstile-310x150.png","https://realfavicongenerator.net/files/a4f0eaa3aee2ec1ff38aa6a49585781a75bbd7f9/package_files/mstile-310x310.png","https://realfavicongenerator.net/files/a4f0eaa3aee2ec1ff38aa6a49585781a75bbd7f9/package_files/mstile-70x70.png","https://realfavicongenerator.net/files/a4f0eaa3aee2ec1ff38aa6a49585781a75bbd7f9/package_files/safari-pinned-tab.svg","https://realfavicongenerator.net/files/a4f0eaa3aee2ec1ff38aa6a49585781a75bbd7f9/package_files/site.webmanifest"],"html_code":"\n\n\n\n\n\n\n","compression":"false","overlapping_markups":["link[rel=\"apple-touch-icon\"]","link[rel=\"shortcut\"]","link[rel=\"shortcut icon\"]","link[rel=\"icon\",sizes=\"16x16\"]","link[rel=\"icon\",sizes=\"32x32\"]","meta[name=\"msapplication-TileColor\"]","meta[name=\"msapplication-TileImage\"]","link[rel=\"manifest\"]","meta[name=\"theme-color\"]","link[rel=\"mask-icon\"]"]},"files_location":{"type":"path","path":"/"},"preview_picture_url":"https://realfavicongenerator.net/files/a4f0eaa3aee2ec1ff38aa6a49585781a75bbd7f9/favicon_preview.png","version":"0.16"} \ No newline at end of file diff --git a/src/sass/_base.scss b/src/sass/_base.scss index 140be19..1cc9375 100644 --- a/src/sass/_base.scss +++ b/src/sass/_base.scss @@ -373,6 +373,10 @@ img { } @media screen and (max-width: $sm-breakpoint) { + .gblog-brand { + font-size: $font-size-32 * 1.1; + } + .gblog-nav { .container { padding: 0;