From 0c20def9e66b3d57d42c45b987316d95da08a232 Mon Sep 17 00:00:00 2001
From: David Kebler <d@kebler.net>
Date: Thu, 20 Apr 2017 13:11:36 -0700
Subject: [PATCH] few minor changes - and offpage modal filter

---
 layouts/partials/head/fonts.html |  2 +-
 layouts/partials/modals.html     |  2 +-
 static/css/base.css              |  3 ++-
 static/css/page.css              |  3 ++-
 static/js/fitToWindow.js         | 16 ++++++++--------
 static/js/page.js                |  4 ++--
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/layouts/partials/head/fonts.html b/layouts/partials/head/fonts.html
index ccf1344..71a635b 100644
--- a/layouts/partials/head/fonts.html
+++ b/layouts/partials/head/fonts.html
@@ -21,7 +21,7 @@
   <link href="//fonts.googleapis.com/css?family={{ . }}" rel="stylesheet" type="text/css">
   {{ end }}
 
-  {{ with .hero.headline_font }}
+  {{ with .hero.headlines_font }}
   <link href="//fonts.googleapis.com/css?family={{ . }}" rel="stylesheet" type="text/css">
   {{ end }}
 
diff --git a/layouts/partials/modals.html b/layouts/partials/modals.html
index cf1e043..00d64f2 100644
--- a/layouts/partials/modals.html
+++ b/layouts/partials/modals.html
@@ -1,4 +1,4 @@
-{{ range where .Site.RegularPages  "Section" "modal" }}
+{{ range where .Site.RegularPages  "Section" "modals" }}
 <div id="modal-{{ .File.BaseFileName }}" class="section section--modal">
 	<div class="section__container	section__container--modal">
 		<div class="section__headline section__headline--modal">
diff --git a/static/css/base.css b/static/css/base.css
index 4bde20a..a63d8d0 100644
--- a/static/css/base.css
+++ b/static/css/base.css
@@ -157,11 +157,12 @@ figcaption {
 hr {
   width: 50%;
   height: 0;
-  margin: 4px auto;
   border-top-color: white;
   border-bottom-color: rgba(0, 0, 0, 0.2);
   border-width: 2px;
   border-style: solid;
+  margin-top: 0.5em;
+  margin-bottom: 1em;
 }
 
 .flex-col-center {
diff --git a/static/css/page.css b/static/css/page.css
index 9187246..aa99b20 100644
--- a/static/css/page.css
+++ b/static/css/page.css
@@ -217,7 +217,8 @@
 }
 
 .box--btn {
-  padding: 0.5rem;
+  padding: 0.5em;
+  margin-bottom: 0.5em;
 }
 
 .box--btn-bar > .box--btn {
diff --git a/static/js/fitToWindow.js b/static/js/fitToWindow.js
index 78c060a..a63a8d2 100644
--- a/static/js/fitToWindow.js
+++ b/static/js/fitToWindow.js
@@ -7,14 +7,14 @@
 
   $.fn.fitToWindow = function (maxWidth, wPad) {
 
-    console.log("in fit to Window")
+    // console.log("in fit to Window")
 
     // if more than one element
     this.each(function () {
       let $el = $(this);
 
-      console.log(`element ${$el.prop("tagName")} ${$el.attr("class")} parent ${$el.parent().attr('class')}`)
-      console.log(`before ${maxWidth} ${wPad} ${$el.data('maxWidth')} ${$el.data('wPad')}`)
+      // console.log(`element ${$el.prop("tagName")} ${$el.attr("class")} parent ${$el.parent().attr('class')}`)
+      // console.log(`before ${maxWidth} ${wPad} ${$el.data('maxWidth')} ${$el.data('wPad')}`)
       var mw = $el.parent().attr('maxWidth');
       maxWidth = mw ? mw : maxWidth
       maxWidth = (maxWidth || $el.data('maxWidth')) || 450
@@ -25,7 +25,7 @@
       let windowWidth = $(window).width()
       let newWidth = (windowWidth > maxWidth) ? maxWidth : windowWidth - 2 * wPad
 
-      console.log(`after ${maxWidth} ${wPad} ${newWidth}`)
+      // console.log(`after ${maxWidth} ${wPad} ${newWidth}`)
 
       // Initial Aspect given in attributes by element itself
       let setWidth = $el.attr('width');
@@ -41,11 +41,11 @@
       if (!aspect) {
         aspect = setWidth / setHeight;
         $el.data('aspect', aspect);
-        console.log(`aspect set ${aspect} = ${$el.data('aspect')}`)
+        // console.log(`aspect set ${aspect} = ${$el.data('aspect')}`)
         $el.data('maxWidth', maxWidth)
         $el.data('wPad', wPad)
-        console.log(`values set ${maxWidth} = ${$el.data('maxWidth')} ${wPad} = ${$el.data('wPad')}`)
-        console.log("REGISTERING RESIZE")
+          // console.log(`values set ${maxWidth} = ${$el.data('maxWidth')} ${wPad} = ${$el.data('wPad')}`)
+          // console.log("REGISTERING RESIZE")
         $(window).resize({ el: $el }, function (event) {
           event.data.el.fitToWindow()
         })
@@ -70,7 +70,7 @@
       //   newWidth = (newHeight * aspect);
       // }
 
-      console.log(`new width and height before setting ${newWidth} ${newHeight}`)
+      // console.log(`new width and height before setting ${newWidth} ${newHeight}`)
 
       // Set new size of element
       $el.width(newWidth);
diff --git a/static/js/page.js b/static/js/page.js
index 5f68e92..02fd0d2 100644
--- a/static/js/page.js
+++ b/static/js/page.js
@@ -1,6 +1,6 @@
 // Smooth Scroll Init - Register click handler for ID anchors
 $('a[href*="#"]:not(a[modal])').click(function () {
-  if (location.pathname.replace(/^\//, '') == this.pathname.replace(/^\//, '') && location.hostname == this.hostname) {
+  if (location.pathname.replace(/\/$/, "") == this.pathname.replace(/\/$/, "") && location.hostname == this.hostname) {
     var target = $(this.hash);
     target = target.length ? target : $('[name=' + this.hash.slice(1) + ']');
     if (target.length) {
@@ -147,7 +147,7 @@ function lightgallery(id) {
 
   // Register click event for all modal links on page
   $("a[modal]").click(function () {
-    if (location.pathname.replace(/^\//, '') == this.pathname.replace(/^\//, '') && location.hostname == this.hostname) {
+    if (location.pathname.replace(/\/$/, "") == this.pathname.replace(/\/$/, "") && location.hostname == this.hostname) {
       var target = this.hash;
       modalShow(target);
     } else {