diff options
author | James Tharpe <james@brainbytescreative.com> | 2017-10-16 13:33:52 +0300 |
---|---|---|
committer | James Tharpe <james@brainbytescreative.com> | 2017-10-16 13:33:52 +0300 |
commit | 26f2a0bd2bbfe855498b011b3a529bcb79bc8d2b (patch) | |
tree | 4f51ed2b6e8327e2f2a4c4e29c1f21c8f94618d0 | |
parent | 47851d627e5679b834e2b4a713605b3b65a306ab (diff) | |
parent | d2564cbb4bcd456946affc088d467d5dbaf3f75f (diff) |
Merge branch 'master' of github.com:calintat/minimal
# Conflicts:
# layouts/partials/header.html
-rw-r--r-- | exampleSite/config.toml | 1 | ||||
-rw-r--r-- | layouts/partials/css.html | 2 | ||||
-rw-r--r-- | layouts/partials/footer.html | 2 | ||||
-rw-r--r-- | layouts/partials/header.html | 13 |
4 files changed, 15 insertions, 3 deletions
diff --git a/exampleSite/config.toml b/exampleSite/config.toml index ab5db12..9f87860 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -3,6 +3,7 @@ languageCode = "en-us" title = "Minimal" theme = "minimal" disqusShortname = "username" # delete this to disable disqus comments +googleAnalytics = "" [params] author = "Calin Tataru" diff --git a/layouts/partials/css.html b/layouts/partials/css.html index 702e969..405fecd 100644 --- a/layouts/partials/css.html +++ b/layouts/partials/css.html @@ -1,7 +1,7 @@ <style> html body { - font-family: {{ .Site.Params.font }}, sans-serif; + font-family: '{{ .Site.Params.font }}', sans-serif; background-color: {{ .Site.Params.backgroundColor | default "white" }}; } diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index c5d4fb0..8a0706f 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -3,7 +3,7 @@ <p class="copyright text-muted">{{ .Site.Params.copyright | default "© All rights reserved. Powered by [Hugo](https://gohugo.io) and [Minimal](https://github.com/calintat/minimal)" | markdownify }}</p> </footer> - + </body> </html> diff --git a/layouts/partials/header.html b/layouts/partials/header.html index a7fe630..a28a851 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -10,7 +10,18 @@ <link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" /> <link href="{{ .RSSLink }}" rel="feed" type="application/rss+xml" title="{{ .Site.Title }}" /> {{ end }} - {{ partial "head-close" . }} + + {{ if .Site.GoogleAnalytics }} + <!-- Global Site Tag (gtag.js) - Google Analytics --> + <script async src="https://www.googletagmanager.com/gtag/js?id={{ .Site.GoogleAnalytics }}"></script> + <script> + window.dataLayer = window.dataLayer || []; + function gtag(){dataLayer.push(arguments)}; + gtag('js', new Date()); + + gtag('config', '{{ .Site.GoogleAnalytics }}'); + </script> + {{ end }} </head> <body> |