diff options
author | Robert Austin <rob@jugglerdigital.com> | 2022-08-15 10:11:44 +0300 |
---|---|---|
committer | Robert Austin <rob@jugglerdigital.com> | 2022-08-15 10:11:44 +0300 |
commit | 05e24dea26998cdbb38857de6479187f4b4fe99c (patch) | |
tree | 420a17b9b2bb4c68524407ef492955c1fe7e4b47 | |
parent | 95aa132ee1441c65cf67dba2e345900748f77959 (diff) | |
parent | 399c23b3d8b31c47053d1b93887bd1e420a360a4 (diff) |
Merge branch 'master' of github.com:zerostaticthemes/hugo-serif-theme
-rw-r--r-- | README.md | 7 | ||||
-rw-r--r-- | assets/scss/components/_main-menu-mobile.scss | 3 | ||||
-rw-r--r-- | layouts/_default/baseof.html | 32 | ||||
-rw-r--r-- | layouts/index.html | 1 | ||||
-rw-r--r-- | layouts/partials/google-analytics.html | 27 | ||||
-rw-r--r-- | layouts/partials/google-fonts.html | 6 | ||||
-rw-r--r-- | layouts/partials/google-tag-manager-noscript.html | 13 | ||||
-rw-r--r-- | layouts/partials/google-tag-manager.html | 13 | ||||
-rw-r--r-- | layouts/partials/sub-footer.html | 6 | ||||
-rw-r--r-- | layouts/services/single.html | 13 | ||||
-rw-r--r--[-rwxr-xr-x] | layouts/services/summary.html | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | layouts/team/summary-large.html | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | layouts/team/summary.html | 0 |
13 files changed, 48 insertions, 73 deletions
@@ -232,9 +232,16 @@ You can configure og meta data global settings in the config. ### Other Hugo Themes by Zerostatic +<<<<<<< HEAD - [Hugo Hero](https://github.com/zerostaticthemes/hugo-serif-theme) - Open Source: business theme - [Hugo Whisper](https://github.com/zerostaticthemes/hugo-whisper-theme) - Open Source: documentation theme - [Hugo Winston](https://github.com/zerostaticthemes/hugo-winston-theme) Open Source:- blog theme +======= + +- [Hugo Hero](https://github.com/zerostaticthemes/hugo-hero-theme) - Free: business theme +- [Hugo Whisper](https://github.com/zerostaticthemes/hugo-whisper-theme) - Free: documentation theme +- [Hugo Winston](https://github.com/zerostaticthemes/hugo-winston-theme) Free:- blog theme +>>>>>>> 399c23b3d8b31c47053d1b93887bd1e420a360a4 - [Hugo Advance](https://www.zerostatic.io/theme/hugo-advance/) Premium: advanced multi page business and marketing theme - [Hugo Paradigm](https://www.zerostatic.io/theme/hugo-paradigm/) Premium: landing page / site builder theme diff --git a/assets/scss/components/_main-menu-mobile.scss b/assets/scss/components/_main-menu-mobile.scss index 9c654ab..b66a70e 100644 --- a/assets/scss/components/_main-menu-mobile.scss +++ b/assets/scss/components/_main-menu-mobile.scss @@ -37,6 +37,9 @@ animation-delay: 0.6s; } } + @include media-breakpoint-up(md) { + display: none; + } } ul { font-size: 30px; diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 90b2e77..ace52a2 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -4,33 +4,32 @@ <head> <meta charset="utf-8"> <meta http-equiv="x-ua-compatible" content="ie=edge"> - <title>{{ block "title" . }}{{ if .Params.meta_title }}{{ .Params.meta_title }}{{ else }}{{ .Title }} - {{ .Site.Title }}{{ end }}{{ end }}</title> + <title>{{ block "title" . }}{{ .Params.meta_title | default (printf "%s - %s" .Title .Site.Title) }}{{ end }}</title> <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="icon" type="image/png" href="{{ "favicon-32x32.svg" | relURL }}"> {{ partial "google-fonts.html" . }} <!-- CSS--> - {{ if .Site.IsServer }} - {{ $style := resources.Get "scss/style.scss" | resources.ExecuteAsTemplate "style.scss" . | toCSS (dict "targetPath" "css/style.css" "enableSourceMap" true) }} - <link rel="stylesheet" href="{{ ($style).RelPermalink }}"> - {{ else }} - {{ $style := resources.Get "scss/style.scss" | resources.ExecuteAsTemplate "style.scss" . | toCSS (dict "targetPath" "css/style.css" "enableSourceMap" false) }} - <link rel="stylesheet" href="{{ ($style | minify | fingerprint).RelPermalink }}"> + {{ $css_options := dict "targetPath" "css/style.css" "enableSourceMap" (not hugo.IsProduction) }} + {{ $style := resources.Get "scss/style.scss" | resources.ExecuteAsTemplate "style.scss" . | toCSS $css_options }} + {{ if hugo.IsProduction }} + {{ $style = $style | minify | fingerprint }} {{ end }} + <link rel="stylesheet" href="{{ $style.RelPermalink }}"> {{ block "header_css" . }}{{ end }} {{ block "meta_tags" . }} - {{ if .Params.description }}<meta name="description" content="{{ .Params.description }}"/>{{ end }} - {{ if .Params.meta_title }}<meta property="og:title" content="{{ .Params.meta_title }}"/>{{ else }}<meta property="og:title" content="{{ .Title }}"/>{{ end }} + {{ with .Params.description }}<meta name="description" content="{{ . }}"/>{{ end }} + <meta property="og:title" content="{{ .Params.meta_title | default .Title }}"/> <meta property="og:type" content="website"/> <meta property="og:url" content="{{ .Permalink }}"/> - {{ if .Params.image }}<meta property="og:image" content="{{ .Params.image | absURL }}"/>{{ else if .Site.Params.seo.meta_og_image }}<meta property="og:image" content="{{ .Site.Params.seo.meta_og_image | absURL }}"/>{{ end }} - {{ if .Params.description }}<meta property="og:description" content="{{ .Params.description }}"/>{{ end }} + {{ with .Params.image | default .Site.Params.seo.meta_og_image }}<meta property="og:image" content="{{ . | absURL }}"/>{{ end }} + {{ with .Params.description }}<meta property="og:description" content="{{ . }}"/>{{ end }} <meta name="twitter:card" content="summary"/> - {{ if .Site.Params.seo.meta_twitter_site }}<meta name="twitter:site" content="{{ .Site.Params.seo.meta_twitter_site }}"/>{{ end }} - {{ if .Site.Params.seo.meta_twitter_creator }}<meta name="twitter:creator" content="{{ .Site.Params.seo.meta_twitter_creator }}"/>{{ end }} + {{ with .Site.Params.seo.meta_twitter_site }}<meta name="twitter:site" content="{{ . }}"/>{{ end }} + {{ with .Site.Params.seo.meta_twitter_creator }}<meta name="twitter:creator" content="{{ . }}"/>{{ end }} {{ end }} </head> @@ -51,11 +50,10 @@ {{ block "footer_js" . }} {{ end }} - {{ if .Site.IsServer }} - <script type="text/javascript" src="{{ $scripts.RelPermalink }}"></script> - {{ else }} - <script type="text/javascript" src="{{ ($scripts | minify | fingerprint).RelPermalink }}"></script> + {{ if hugo.IsProduction }} + {{ $scripts = $scripts | minify | fingerprint }} {{ end }} + <script type="text/javascript" src="{{ $scripts.RelPermalink }}"></script> {{ partial "google-tag-manager.html" . }} {{ partial "google-analytics.html" . }} diff --git a/layouts/index.html b/layouts/index.html index 8dcae98..ff9b078 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -24,7 +24,6 @@ <div class="strip"> <div class="container pt-6 pb-6 pb-md-10"> <div class="row justify-content-start"> - {{ $services := where (where .Site.RegularPages "Type" "services") ".Params.featured" true }} {{ range first 6 (sort $services ".Params.weight") }} <div class="col-12 col-md-4 mb-1"> {{ .Render "summary" }} diff --git a/layouts/partials/google-analytics.html b/layouts/partials/google-analytics.html index 296d4af..8a58a62 100644 --- a/layouts/partials/google-analytics.html +++ b/layouts/partials/google-analytics.html @@ -1,10 +1,7 @@ -{{- if .Site.IsServer -}} -<!-- Dont add Google analytics to localhost --> -{{ else }} -{{ $gid := (getenv "HUGO_GOOGLE_ANALYTICS_ID") }} -{{ if $gid }} +{{- if and (not .Site.IsServer) hugo.IsProduction -}} +{{ with getenv "HUGO_GOOGLE_ANALYTICS_ID" | default .Site.Params.google_analytics_id }} <!-- Global site tag (gtag.js) - Google Analytics --> -<script async src="https://www.googletagmanager.com/gtag/js?id={{- $gid -}}"></script> +<script async src="https://www.googletagmanager.com/gtag/js?id={{- . -}}"></script> <script> window.dataLayer = window.dataLayer || []; @@ -12,21 +9,7 @@ dataLayer.push(arguments); } gtag('js', new Date()); - gtag('config', '{{- $gid -}}'); -</script> -{{ else }} -{{ if .Site.Params.google_analytics_id }} -<!-- Global site tag (gtag.js) - Google Analytics --> -<script async src="https://www.googletagmanager.com/gtag/js?id={{- .Site.Params.google_analytics_id -}}"></script> -<script> - window.dataLayer = window.dataLayer || []; - - function gtag() { - dataLayer.push(arguments); - } - gtag('js', new Date()); - gtag('config', '{{- .Site.Params.google_analytics_id -}}'); + gtag('config', '{{ . }}'); </script> {{ end }} -{{ end}} -{{ end }}
\ No newline at end of file +{{ end }} diff --git a/layouts/partials/google-fonts.html b/layouts/partials/google-fonts.html index 410a0f6..daec7c3 100644 --- a/layouts/partials/google-fonts.html +++ b/layouts/partials/google-fonts.html @@ -1,5 +1,5 @@ -{{ with .Site.Params.fonts }} +{{ with .Site.Params.fonts.google_fonts }} <link rel="preconnect" href="https://fonts.googleapis.com"> <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin> - <link href="{{ .google_fonts }}" rel="stylesheet"> -{{ end }}
\ No newline at end of file + <link href="{{ . }}" rel="stylesheet"> +{{ end }} diff --git a/layouts/partials/google-tag-manager-noscript.html b/layouts/partials/google-tag-manager-noscript.html index 0292e6e..c29c381 100644 --- a/layouts/partials/google-tag-manager-noscript.html +++ b/layouts/partials/google-tag-manager-noscript.html @@ -1,12 +1,5 @@ -{{- if .Site.IsServer -}} -<!-- Dont add Google Tag Manager to localhost --> -{{ else }} -{{ $gid := (getenv "HUGO_GTM_ID") }} -{{ if $gid }} -<!-- Google Tag Manager (noscript) --> <noscript><iframe src="https://www.googletagmanager.com/ns.html?id={{- $gid -}}" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> <!-- End Google Tag Manager (noscript) --> -{{ else }} -{{ if .Site.Params.google_tag_manager_id }} -<!-- Google Tag Manager (noscript) --> <noscript><iframe src="https://www.googletagmanager.com/ns.html?id={{- .Site.Params.google_tag_manager_id -}}" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> <!-- End Google Tag Manager (noscript) --> -{{ end }} +{{- if and (not .Site.IsServer) hugo.IsProduction -}} +{{ with getenv "HUGO_GTM_ID" | default .Site.Params.google_tag_manager_id }} +<!-- Google Tag Manager (noscript) --> <noscript><iframe src="https://www.googletagmanager.com/ns.html?id={{ . }}" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> <!-- End Google Tag Manager (noscript) --> {{ end }} {{ end }} diff --git a/layouts/partials/google-tag-manager.html b/layouts/partials/google-tag-manager.html index 950eac8..48cfa6f 100644 --- a/layouts/partials/google-tag-manager.html +++ b/layouts/partials/google-tag-manager.html @@ -1,12 +1,5 @@ -{{- if .Site.IsServer -}} -<!-- Dont add Google Tag Manager to localhost --> -{{ else }} -{{ $gid := (getenv "HUGO_GTM_ID") }} -{{ if $gid }} -<!-- Google Tag Manager --> <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); })(window,document,'script','dataLayer','{{- $gid -}}');</script> <!-- End Google Tag Manager --> -{{ else }} -{{ if .Site.Params.google_tag_manager_id }} -<!-- Google Tag Manager --> <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); })(window,document,'script','dataLayer','{{- .Site.Params.google_tag_manager_id -}}');</script> <!-- End Google Tag Manager --> -{{ end }} +{{- if and (not .Site.IsServer) hugo.IsProduction -}} +{{ with getenv "HUGO_GTM_ID" | default .Site.Params.google_tag_manager_id }} +<!-- Google Tag Manager --> <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); })(window,document,'script','dataLayer','{{ . }}');</script> <!-- End Google Tag Manager --> {{ end }} {{ end }} diff --git a/layouts/partials/sub-footer.html b/layouts/partials/sub-footer.html index 297b782..3e56837 100644 --- a/layouts/partials/sub-footer.html +++ b/layouts/partials/sub-footer.html @@ -6,11 +6,11 @@ {{ if .Site.Data.social }} {{ partial "social.html" . }} {{ end }} - {{ if .Site.Params.footer.copyright_text }} - <div class="copyright">{{ .Site.Params.footer.copyright_text | safeHTML }}</div> + {{ with .Site.Params.footer.copyright_text }} + <div class="copyright">{{ . | safeHTML }}</div> {{ end }} </div> </div> </div> </div> -</div>
\ No newline at end of file +</div> diff --git a/layouts/services/single.html b/layouts/services/single.html index ef4a7fd..3b62ec1 100644 --- a/layouts/services/single.html +++ b/layouts/services/single.html @@ -16,10 +16,9 @@ {{ define "footer_js" }} {{ $library := resources.Get "js/libs/library.js" }} {{ $services := resources.Get "js/pages/services.js" }} -{{ $servicesJS := slice $library $services |resources.Concat "js/services.js" }} -{{ if .Site.IsServer }} - <script type="text/javascript" src="{{ $servicesJS.RelPermalink }}"></script> - {{ else }} - <script type="text/javascript" src="{{ ($servicesJS | minify | fingerprint).RelPermalink }}"></script> - {{ end }} -{{ end }}
\ No newline at end of file +{{ $servicesJS := slice $library $services | resources.Concat "js/services.js" }} +{{ if hugo.IsProduction }} + {{ $servicesJS = $servicesJS | minify | fingerprint }} +{{ end }} +<script type="text/javascript" src="{{ $servicesJS.RelPermalink }}"></script> +{{ end }} diff --git a/layouts/services/summary.html b/layouts/services/summary.html index 57d46ee..57d46ee 100755..100644 --- a/layouts/services/summary.html +++ b/layouts/services/summary.html diff --git a/layouts/team/summary-large.html b/layouts/team/summary-large.html index d5bee09..d5bee09 100755..100644 --- a/layouts/team/summary-large.html +++ b/layouts/team/summary-large.html diff --git a/layouts/team/summary.html b/layouts/team/summary.html index 1dbff41..1dbff41 100755..100644 --- a/layouts/team/summary.html +++ b/layouts/team/summary.html |