Merge branch 'master' into develop

adamwathan · adamwathan · commit a379d80aa753 · 2017-11-17T08:39:33.000-05:00
diff --git a/docs/source/_assets/js/nav.js b/docs/source/_assets/js/nav.js
@@ -1,4 +1,11 @@
 $.when($.ready).then(function() {
+  window.history.replaceState({
+    'href': window.location.href,
+    'title': $(document).filter('title').text(),
+    'nav': $(document).find('#nav').html(),
+    'content': $(document).find('#content').html()
+  }, '', window.location.href)
+
   $('#nav').on('click', 'a', function (event) {
 
     // Allow opening links in new tabs
@@ -45,8 +52,10 @@ $.when($.ready).then(function() {
       }, '', href)
 
       // Track on Google Analytics
-      ga('set', 'page', href)
-      ga('send', 'pageview')
+      if (typeof(ga) === 'function') {
+        ga('set', 'page', href)
+        ga('send', 'pageview')
+      }
     })
   })
 
@@ -59,8 +68,10 @@ $.when($.ready).then(function() {
       $('#content').html(e.state.content)
 
       // Track on Google Analytics
-      ga('set', 'page', e.state.href)
-      ga('send', 'pageview')
+      if (typeof(ga) === 'function') {
+        ga('set', 'page', e.state.href)
+        ga('send', 'pageview')
+      }
     }
   }
 
diff --git a/docs/source/_layouts/documentation.blade.php b/docs/source/_layouts/documentation.blade.php
@@ -14,6 +14,10 @@
 <meta property="og:image" content="https://tailwindcss.com/img/twitter-card.png" />
 @endsection
 
+@push('headScripts')
+<script src="{{ mix('/js/nav.js') }}"></script>
+@endpush
+
 @section('body')
 <div class="min-h-screen">
   <div id="sidebar" class="hidden z-50 fixed pin-y pin-l overflow-y-scroll md:overflow-visible scrolling-touch md:scrolling-auto bg-smoke-light w-4/5 md:w-full md:max-w-xs flex-none border-r-2 border-smoke md:flex flex-col">
diff --git a/docs/source/_layouts/master.blade.php b/docs/source/_layouts/master.blade.php
@@ -16,7 +16,7 @@
   <link rel="stylesheet" href="{{ mix('/css/main.css') }}">
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css">
   <script src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
-  <script src="{{ mix('/js/nav.js') }}"></script>
+  @stack('headScripts')
 </head>
 <body data-sidebar-visible="true" class="font-sans font-normal text-slate-darker leading-normal">
 
diff --git a/docs/source/index.blade.php b/docs/source/index.blade.php
@@ -61,7 +61,7 @@
       </div>
       <div class="mb-8 w-64 md:flex-x-center">
         <div class="flex items-center">
-          <img class="h-16 w-16 rounded-full" src="https://pbs.twimg.com/profile_images/892478120829239296/U1KUwGJO_400x400.jpg">
+          <img class="h-16 w-16 rounded-full" src="https://pbs.twimg.com/profile_images/929910740156215296/yDEC9GW9_400x400.jpg">
           <div class="pl-4">
             <a href="https://twitter.com/davidhemphill" class="block hover:underline text-dark text-lg text-medium">David Hemphill</a>
             <a href="https://twitter.com/davidhemphill" class="block hover:underline text-tailwind-teal-dark text-sm">@davidhemphill</a>
