From 13bc6ffd224ebb71c8654f77a0b7700d7ab53504 Mon Sep 17 00:00:00 2001
From: Andrew Chen <chenopis@users.noreply.github.com>
Date: Fri, 13 Jul 2018 10:34:26 -0700
Subject: [PATCH] Add current version of Google Analytics code, Global Site Tag
 (gtag.js). (#9131)

---
 layouts/partials/footer-scripts.html | 7 -------
 layouts/partials/head.html           | 9 +++++++++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/layouts/partials/footer-scripts.html b/layouts/partials/footer-scripts.html
index 601ade60d8..fcfe903f70 100644
--- a/layouts/partials/footer-scripts.html
+++ b/layouts/partials/footer-scripts.html
@@ -1,13 +1,6 @@
 <button class="flyout-button" onclick="kub.toggleToc()"></button>
 
 <script>
-(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-ga('create', 'UA-36037335-10', 'auto');
-ga('send', 'pageview');
-
 // hide docs nav area if no nav is present, or if nav only contains a link to the current page
 (function () {
     window.addEventListener('DOMContentLoaded', init)
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index cabc1ff76d..80ab5cdff0 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -1,3 +1,12 @@
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-36037335-10"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-36037335-10');
+</script>
 <meta charset="utf-8">
 <title>{{ if .Title }}{{ .Title }} - {{ end }}{{ .Site.Title }}</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">