{{ i18n "topics" }}

@@ -38,9 +38,9 @@
-

{{ .Title }}

+

{{ .Title }}

{{ .Params.Description | markdownify }}

- +
diff --git a/layouts/partials/basic-seo-tools.html b/layouts/partials/basic-seo-tools.html new file mode 100644 index 0000000..2d3f2bb --- /dev/null +++ b/layouts/partials/basic-seo-tools.html @@ -0,0 +1,168 @@ + +{{ if or (eq site.BaseURL "/") (eq site.BaseURL "http://localhost:1313/") }} +{{ else }} + +{{ end }} + + + +{{ $title := site.Title }} + +{{ if .Params.meta_title }} + {{ $title = .Params.meta_title }} + +{{ else if .Params.title }} + {{ $title = .Params.title }} +{{ end }} + + + +{{ $description := .Summary }} +{{ if .Params.meta_description }} + {{ $description = .Params.meta_description }} + +{{ else if .Params.description }} + {{ $description = .Params.description }} + +{{ else if site.Params.metadata.description }} + {{ $description = site.Params.metadata.description }} +{{ end }} + + + +{{ $imagePath := site.Params.metadata.image }} +{{ if .Params.meta_image }} + {{ $imagePath = .Params.meta_image }} + +{{ else if .Params.images }} + {{ range first 1 .Params.images }} + {{ $imagePath = . }} + {{ end }} + +{{ else if .Params.image }} + {{ $imagePath = .Params.image }} +{{ end }} + + +{{ $title }} + + +{{ if .Param "noindex" }} + +{{ end }} + + + +{{ with .Params.canonical }} + +{{ end }} + + + +{{ if .IsTranslated }} + {{ range .AllTranslations }} + + {{ end }} + +{{ end }} + + + +{{ if .Params.keywords }} + +{{ else if site.Params.metadata.keywords }} + +{{ end }} + + + + + + +{{ with site.Params.metadata.author }} + +{{ end }} + + + + + +{{ if or (hasPrefix $imagePath "http") (fileExists (add `static/` (string $imagePath))) }} + + + +{{ else }} + + + + {{ $contentImage:= .Resources.GetMatch (printf "*%s*" $imagePath) }} + {{ $assetImage:= fileExists (add `assets/` (string $imagePath)) }} + + + + {{ if or $contentImage $assetImage }} + + {{ if $contentImage }} + {{ .Scratch.Set "image-exists" $contentImage }} + {{ else if $assetImage }} + {{ .Scratch.Set "image-exists" (resources.Get $imagePath) }} + {{ end }} + + {{ $image:= .Scratch.Get "image-exists" }} + + + + {{ $imageExt:= path.Ext $image }} + + + + {{ if ne $imageExt `.svg` }} + {{ $imageWidth := $image.Width }} + {{ $imageHeight := $image.Height }} + {{ if (and (gt $imageWidth 144) (gt $imageHeight 144)) }} + + + + {{ end }} + + + + {{ end }} + + + + + {{ end }} + + + +{{ end }} + + + + + + + + + + + + + +{{ with site.Params.metadata.twitter }} + +{{ end }} +{{ with site.Params.metadata.author }} + +{{ end }} \ No newline at end of file diff --git a/static/fonts/momo.woff2 b/static/fonts/momo.woff2 new file mode 100644 index 0000000..01d68fe Binary files /dev/null and b/static/fonts/momo.woff2 differ diff --git a/static/fonts/nunito.woff2 b/static/fonts/nunito.woff2 new file mode 100644 index 0000000..e118818 Binary files /dev/null and b/static/fonts/nunito.woff2 differ diff --git a/static/robots.txt b/static/robots.txt new file mode 100644 index 0000000..acd3f69 --- /dev/null +++ b/static/robots.txt @@ -0,0 +1,5 @@ +User-agent: * +Allow: / + +Sitemap: https://mantelzorgwoning.info/nl/sitemap.xml +Sitemap: https://mantelzorgwoning.info/en/sitemap.xml diff --git a/themes/godocs-1/assets/scss/_buttons.scss b/themes/godocs-1/assets/scss/_buttons.scss index 2910e10..f864bf7 100644 --- a/themes/godocs-1/assets/scss/_buttons.scss +++ b/themes/godocs-1/assets/scss/_buttons.scss @@ -23,17 +23,17 @@ } .btn-primary { - background: $color-primary; + background: darken($color: $color-primary, $amount: 10); color: $white; - border-color: $color-primary; + border-color: darken($color: $color-primary, $amount: 10) !important; &:active, &:hover, &:focus, &.focus, &.active { - background: darken($color: $color-primary, $amount: 10) !important; - border-color: darken($color: $color-primary, $amount: 10) !important; + background: darken($color: $color-primary, $amount: 14) !important; + border-color: darken($color: $color-primary, $amount: 14) !important; } } @@ -56,8 +56,8 @@ .btn-outline-primary { background: transparent; - color: $color-primary; - border-color: $color-primary; + color: darken($color: $color-primary, $amount: 14); + border-color: darken($color: $color-primary, $amount: 14) !important; &:active, &:hover, diff --git a/themes/godocs-1/assets/scss/_typography.scss b/themes/godocs-1/assets/scss/_typography.scss index 249a134..3e12c86 100644 --- a/themes/godocs-1/assets/scss/_typography.scss +++ b/themes/godocs-1/assets/scss/_typography.scss @@ -1,6 +1,9 @@ + + /* typography */ body { - font-family: $font-primary; + // font-family: $font-primary; + font-family: "nunito-woff2", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; -webkit-font-smoothing: antialiased; font-size: $font-size; line-height: 1.6; @@ -22,7 +25,8 @@ h4, h5, h6 { color: $text-dark; - font-family: $font-secondary; + //font-family: $font-secondary; + font-family: "momo-woff2", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; line-height: 1.2; } @@ -32,7 +36,7 @@ h6 { .content h4, .content h5, .content h6 { - font-weight: 600; + font-weight: 800; } h1, diff --git a/themes/godocs-1/assets/scss/style.scss b/themes/godocs-1/assets/scss/style.scss index 8c46650..781648b 100644 --- a/themes/godocs-1/assets/scss/style.scss +++ b/themes/godocs-1/assets/scss/style.scss @@ -1,3 +1,19 @@ +@font-face { + font-family: "momo-woff2"; + src: url("/fonts/momo.woff2") format("woff2"); + font-weight: 800; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: "nunito-woff2"; + src: url("/fonts/nunito.woff2") format("woff2"); + font-weight: 400; + font-style: normal; + font-display: swap; +} + {{ with site.Params.variables }} // Color variables $color-primary: {{.color_primary}}; @@ -12,8 +28,8 @@ $light: {{.light}}; // Font Variables $font-size: {{.font_size}}; -$font-primary: '{{ replaceRE ":wght@[0-9;]+" "" .font_primary }}', {{.font_primary_type}}; -$font-secondary: '{{ replaceRE ":wght@[0-9;]+" "" .font_secondary }}', {{.font_secondary_type}}; +$font-primary: "nunito-woff2", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;; +$font-secondary: "momo-woff2", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;; $icon-font: '{{.font_icon}}'; {{ end }} diff --git a/themes/godocs-1/layouts/_default/baseof.html b/themes/godocs-1/layouts/_default/baseof.html index 27387fd..421f14e 100644 --- a/themes/godocs-1/layouts/_default/baseof.html +++ b/themes/godocs-1/layouts/_default/baseof.html @@ -1,12 +1,12 @@ - {{ partial "page-transition.html" . }} {{- partial "head.html" . -}} {{- partialCached "style.html" . -}} + {{ partial "page-transition.html" . }} {{- partialCached "preloader.html" . -}} {{- partial "header.html" . -}} {{- block "main" . }}{{- end }} diff --git a/themes/godocs-1/layouts/index.html b/themes/godocs-1/layouts/index.html index 349ce64..0906bf8 100644 --- a/themes/godocs-1/layouts/index.html +++ b/themes/godocs-1/layouts/index.html @@ -40,7 +40,7 @@

{{ .Title }}

{{ .Params.Description | markdownify }}

- +
diff --git a/themes/godocs-1/layouts/partials/footer.html b/themes/godocs-1/layouts/partials/footer.html index 5d24c62..1952839 100644 --- a/themes/godocs-1/layouts/partials/footer.html +++ b/themes/godocs-1/layouts/partials/footer.html @@ -1,4 +1,4 @@ -