Merge pull request #37 from tomanistor/full-nav-no-scrollv1.2.0

Fixed issue #36, Moved scripts

10 files changed, 35 insertions, 15 deletions

diff --git a/layouts/404.html b/layouts/404.html
index 9a2ca6e..db9ba55 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -14,5 +14,6 @@
 
     </main>
     {{ partial "footer.html" . }}
+    {{ partial "body-bottom" . }}
   </body>
 </html>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 325907a..74416ad 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -27,5 +27,6 @@
 
     </main>
     {{ partial "footer.html" . }}
+    {{ partial "body-bottom" . }}
   </body>
 </html>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 3729d2f..efe9133 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -32,5 +32,6 @@
 
     </main>
     {{ partial "footer.html" . }}
+    {{ partial "body-bottom" . }}
   </body>
 </html>
diff --git a/layouts/index.html b/layouts/index.html
index 4e3e627..346baaf 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -12,5 +12,6 @@
 
     </main>
     {{ partial "footer.html" . }}
+    {{ partial "body-bottom" . }}
   </body>
 </html>
diff --git a/layouts/partials/body-bottom.html b/layouts/partials/body-bottom.html
new file mode 100644
index 0000000..a7beb34
--- /dev/null
+++ b/layouts/partials/body-bottom.html
@@ -0,0 +1,11 @@
+<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
+{{ if .IsHome }}
+  <script src="/scripts/{{ if .Site.Params.cacheBustJS }}{{ index .Site.Data.cachedAssets "index.js" }}{{ else }}index.min.js{{ end }}" type="text/javascript"></script>
+  {{ if .Site.Params.ajaxFormspree }}
+    <script>
+      {{ partial "scripts/contact.min.js" . | safeJS }}
+    </script>
+  {{ end }}
+{{ else }}
+  <script src="/scripts/{{ if .Site.Params.cacheBustJS }}{{ index .Site.Data.cachedAssets "main.js" }}{{ else }}main.min.js{{ end }}" type="text/javascript"></script>
+{{ end }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index afe7cc3..d18bc33 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -23,17 +23,4 @@
     </div>
   {{ end }}
 
-  <!-- Scripts -->
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
-  {{ if .IsHome }}
-    <script src="/scripts/{{ if .Site.Params.cacheBustJS }}{{ index .Site.Data.cachedAssets "index.js" }}{{ else }}index.min.js{{ end }}" type="text/javascript"></script>
-    {{ if .Site.Params.ajaxFormspree }}
-      <script>
-        {{ partial "scripts/contact.min.js" . | safeJS }}
-      </script>
-    {{ end }}
-  {{ else }}
-    <script src="/scripts/{{ if .Site.Params.cacheBustJS }}{{ index .Site.Data.cachedAssets "main.js" }}{{ else }}main.min.js{{ end }}" type="text/javascript"></script>
-  {{ end }}
-
 </footer>
diff --git a/static/scripts/index.min.js b/static/scripts/index.min.js
index 6d91790..c44dc94 100644
--- a/static/scripts/index.min.js
+++ b/static/scripts/index.min.js
@@ -1 +1 @@
-function fullMobileViewport(){function i(){e.style.height=n+"px"}var e=this,n=window.innerHeight;$(window).resize(function(){Math.abs(n-window.innerHeight)>100&&(n=window.innerHeight,i())}),i()}var $=document.querySelector.bind(document),$$=document.querySelectorAll.bind(document),toggle=function(i){if("visible"===window.getComputedStyle(i).visibility)return i.style.visibility="hidden",i.classList.add("hide"),void i.classList.remove("show");i.style.visibility="visible",i.classList.add("show"),i.classList.remove("hide")};!function(){window.onscroll=function(){(window.pageYOffset||document.documentElement.scrollTop)>(window.innerHeight||document.documentElement.clientHeight||document.body.clientHeight)-$("nav").clientHeight?($("nav").classList.add("nav-fixed"),$$("nav > .logo, nav > .nav-toggle").forEach(function(i){i.style.visibility="visible",i.classList.add("show"),i.classList.remove("hide")})):($("nav").classList.remove("nav-fixed"),$$("nav > .logo, nav > .nav-toggle").forEach(function(i){i.style.visibility="hidden",i.classList.add("hide"),i.classList.remove("show")}))},$(".nav-icon").addEventListener("click",function(){$$(".nav-full, main").forEach(function(i){i.classList.toggle("active")}),this.querySelector("img").classList.toggle("img")}),$$(".nav-full a").forEach(function(i){i.addEventListener("click",function(){$$(".nav-full, main").forEach(function(i){i.classList.toggle("active")}),this.querySelector("nav-icon").classList.toggle("nav-icon")})})}(),$$("header").forEach(function(){});
\ No newline at end of file
+function fullMobileViewport(){function i(){e.style.height=n+"px"}var e=this,n=window.innerHeight;$(window).resize(function(){Math.abs(n-window.innerHeight)>100&&(n=window.innerHeight,i())}),i()}var $=document.querySelector.bind(document),$$=document.querySelectorAll.bind(document),toggle=function(i){if("visible"===window.getComputedStyle(i).visibility)return i.style.visibility="hidden",i.classList.add("hide"),void i.classList.remove("show");i.style.visibility="visible",i.classList.add("show"),i.classList.remove("hide")};!function(){window.onscroll=function(){(window.pageYOffset||document.documentElement.scrollTop)>(window.innerHeight||document.documentElement.clientHeight||document.body.clientHeight)-$("nav").clientHeight?($("nav").classList.add("nav-fixed"),$$("nav > .logo, nav > .nav-toggle").forEach(function(i){i.style.visibility="visible",i.classList.add("show"),i.classList.remove("hide")})):($("nav").classList.remove("nav-fixed"),$$("nav > .logo, nav > .nav-toggle").forEach(function(i){i.style.visibility="hidden",i.classList.add("hide"),i.classList.remove("show")}))},$(".nav-icon").addEventListener("click",function(){$$(".nav-full, main").forEach(function(i){i.classList.toggle("active")}),this.querySelector("img").classList.toggle("img")}),$$(".nav-full a").forEach(function(i){i.addEventListener("click",function(){$$(".nav-full, main").forEach(function(i){i.classList.toggle("active")}),this.querySelector("nav-icon").classList.toggle("nav-icon")})}),$("body").addEventListener("click",function(){$(".nav-full").classList.contains("active")?$("html").style.overflowY="hidden":$("html").style.overflowY="scroll"})}(),$$("header").forEach(function(){});
diff --git a/static/scripts/main.min.js b/static/scripts/main.min.js
index 975e9ba..79e357f 100644
--- a/static/scripts/main.min.js
+++ b/static/scripts/main.min.js
@@ -1 +1 @@
-var $=document.querySelector.bind(document),$$=document.querySelectorAll.bind(document),toggle=function(i){if("visible"===window.getComputedStyle(i).visibility)return i.style.visibility="hidden",i.classList.add("hide"),void i.classList.remove("show");i.style.visibility="visible",i.classList.add("show"),i.classList.remove("hide")};!function(){$("nav").classList.add("nav-fixed"),$$("nav > .logo, nav > .nav-toggle").forEach(function(i){i.style.visibility="visible",i.classList.add("show"),i.classList.remove("hide")}),$(".nav-icon").addEventListener("click",function(){$$(".nav-full, main").forEach(function(i){i.classList.toggle("active")}),this.querySelector("img").classList.toggle("img")}),$$(".nav-full a").forEach(function(i){i.addEventListener("click",function(){$$(".nav-full, main").forEach(function(i){i.classList.toggle("active")}),this.querySelector("nav-icon").classList.toggle("nav-icon")})}),hljs.initHighlightingOnLoad()}();
\ No newline at end of file
+var $=document.querySelector.bind(document),$$=document.querySelectorAll.bind(document),toggle=function(i){if("visible"===window.getComputedStyle(i).visibility)return i.style.visibility="hidden",i.classList.add("hide"),void i.classList.remove("show");i.style.visibility="visible",i.classList.add("show"),i.classList.remove("hide")};!function(){$("nav").classList.add("nav-fixed"),$$("nav > .logo, nav > .nav-toggle").forEach(function(i){i.style.visibility="visible",i.classList.add("show"),i.classList.remove("hide")}),$(".nav-icon").addEventListener("click",function(){$$(".nav-full, main").forEach(function(i){i.classList.toggle("active")}),this.querySelector("img").classList.toggle("img")}),$$(".nav-full a").forEach(function(i){i.addEventListener("click",function(){$$(".nav-full, main").forEach(function(i){i.classList.toggle("active")}),this.querySelector("nav-icon").classList.toggle("nav-icon")})}),$("body").addEventListener("click",function(){$(".nav-full").classList.contains("active")?$("html").style.overflowY="hidden":$("html").style.overflowY="scroll"}),hljs.initHighlightingOnLoad()}();
diff --git a/static/scripts/src/index.js b/static/scripts/src/index.js
index a97690d..f818e60 100644
--- a/static/scripts/src/index.js
+++ b/static/scripts/src/index.js
@@ -61,6 +61,15 @@ var toggle = function(el) {
     });
   });
 
+  // Disable scroll when full screen nav is open
+  $('body').addEventListener('click', function() {
+    if ($('.nav-full').classList.contains('active')) {
+      $('html').style.overflowY = 'hidden';
+    } else {
+      $('html').style.overflowY = 'scroll';
+    }
+  });
+
 }());
 
 // Mobile browsers viewport height bug fix
diff --git a/static/scripts/src/main.js b/static/scripts/src/main.js
index 58f4d1e..b4dec9b 100644
--- a/static/scripts/src/main.js
+++ b/static/scripts/src/main.js
@@ -43,6 +43,15 @@ var toggle = function(el) {
     });
   });
 
+  // Disable scroll when full screen nav is open
+  $('body').addEventListener('click', function() {
+    if ($('.nav-full').classList.contains('active')) {
+      $('html').style.overflowY = 'hidden';
+    } else {
+      $('html').style.overflowY = 'scroll';
+    }
+  });
+
   // Highlight.js initialization
   hljs.initHighlightingOnLoad();
 }());