From 12fc52e060b4f068f63b49a1df77882e61ed3c71 Mon Sep 17 00:00:00 2001
From: Chris <chris062689@gmail.com>
Date: Sat, 13 Jan 2018 13:16:41 -0500
Subject: [PATCH] Tweaked Google assets.

---
 layouts/_default/baseof.html | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 1e0de9b..75aadf8 100755
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -19,9 +19,25 @@
     <title>{{- if not .IsHome }}{{ .Title }} - {{ .Site.Title }}{{- else }}{{ .Site.Title }} - {{ .Site.Params.Tagline }}{{- end}}</title>
     <link href="https://fonts.googleapis.com/css?family=Ubuntu|Dosis" rel="stylesheet">
     <link href="https://use.fontawesome.com/releases/v5.0.2/css/all.css" rel="stylesheet">
-    <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/style.css" /> {{ if eq (getenv "HUGO_ENV") "PRD" }}
-    <meta name="robots" content="noindex,nofollow" /> {{ else }}
-    <meta name="robots" content="noindex,nofollow" /> {{ end }}
+    <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/style.css" />
+    
+    {{ if eq (getenv "HUGO_ENV") "PRD" }}
+    <meta name="robots" content="noindex,nofollow" />
+
+    <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+    <script async src="https://www.googletagmanager.com/gtag/js?id={{ .Site.Params.GoogleAnalyticsTrackingId }} }}"></script>
+
+    <!-- Google Analytics -->
+    <script type="text/javascript">
+        window.dataLayer = window.dataLayer || [];
+        function gtag() { dataLayer.push(arguments); }
+        gtag('js', new Date());
+        gtag('config', '{{ .Site.Params.GoogleAnalyticsTrackingId }}');
+    </script>
+    <!-- End Google Analytics -->
+    {{ else }}
+    <meta name="robots" content="noindex,nofollow" />
+    {{ end }}
 </head>
 
 <body>
@@ -34,23 +50,11 @@
     </div>
 
     <script src="{{ .Site.BaseURL }}/js/script.js"></script>
-    
-    {{ if eq (getenv "HUGO_ENV") "PRD" }}
-    <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-    <script async src="https://www.googletagmanager.com/gtag/js?id={{ .Site.Params.GoogleAnalyticsTrackingId }} }}"></script>
 
+    {{- if eq (getenv "HUGO_ENV") "PRD" }}
     <script type="text/javascript">
         (adsbygoogle = window.adsbygoogle || []).push({});
     </script>
-
-    <!-- Google Analytics -->
-    <script type="text/javascript">
-        window.dataLayer = window.dataLayer || [];
-        function gtag() { dataLayer.push(arguments); }
-        gtag('js', new Date());
-        gtag('config', '{{ .Site.Params.GoogleAnalyticsTrackingId }}');
-    </script>
-    <!-- End Google Analytics -->
     {{- end }}
     
     {{- block "scripts" . }}{{- end }}
