temporary styling to extra pages

nudge4 · Feb 15, 2018 · 19ba9b5 · 19ba9b5
1 parent db58090
commit 19ba9b5
Show file tree

Hide file tree

Showing 7 changed files with 187 additions and 34 deletions.
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -0,0 +1,22 @@
+<!-- Javascript -->
+<script src="https://api.mapbox.com/mapbox-gl-js/v{{ site.mbgl_ver }}/mapbox-gl.js"></script>
+<script src="https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-geocoder/v2.1.1/mapbox-gl-geocoder.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+<script defer src="https://use.fontawesome.com/releases/v5.0.6/js/all.js"></script>
+{% if page.custom_js %}
+{% for js_file in page.custom_js %}
+<script src="{{ site.js }}/{{ js_file }}.js" type="text/javascript"></script>
+{% endfor %}
+{% endif %}
+
+<!-- Google Analytics -->
+{% if site.google_analytics %}
+<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', '{{ site.google_analytics }}', 'auto');
+  ga('send', 'pageview');
+</script>
+{% endif %}
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -12,28 +12,8 @@
     <!-- primary content -->
     {{ content }}
 
-    <!-- Javascript -->
-    <script src="https://api.mapbox.com/mapbox-gl-js/v{{ site.mbgl_ver }}/mapbox-gl.js"></script>
-    <script src="https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-geocoder/v2.1.1/mapbox-gl-geocoder.min.js"></script>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
-    <script defer src="https://use.fontawesome.com/releases/v5.0.6/js/all.js"></script>
-    {% if page.custom_js %}
-    {% for js_file in page.custom_js %}
-    <script src="{{ site.js }}/{{ js_file }}.js" type="text/javascript"></script>
-    {% endfor %}
-    {% endif %}
-
-    <!-- Google Analytics -->
-    {% if site.google_analytics %}
-    <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', '{{ site.google_analytics }}', 'auto');
-      ga('send', 'pageview');
-    </script>
-    {% endif %}
+    <!-- footer information -->
+    {% include footer.html %}
 
   </body>
 </html>
diff --git a/_layouts/page.html b/_layouts/page.html
@@ -1,7 +1,18 @@
----
-layout: default
----
-<article class="page">
-    <h2 class="page-header">{{ page.title }}</h2>
-    {{ content }}
-</article>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    {% include header.html %}
+  </head>
+  <body>
+    <main>
+      <header class="page-header">
+	<h1>{{ page.title }}</h1>
+      </header>
+      <div class="line"></div>
+      {{ content }}
+      <div class="line"></div>
+      <div class="footer"></div>
+    </main>
+    {% include footer.html %}
+  </body>
+</html>
diff --git a/about/index.md b/about/index.md
@@ -1,5 +1,58 @@
 ---
-layout: default
+layout: page
+title: About
 ---
 
-# About
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed eleifend
+diam condimentum risus vulputate, a aliquam urna aliquet. Morbi vel
+tortor laoreet, aliquet ipsum non, porttitor tortor. Nunc condimentum
+sem egestas, consectetur leo nec, accumsan risus. Quisque at ligula
+augue. Pellentesque pharetra dui a turpis pharetra, a luctus neque
+dapibus. Proin ut nisl convallis, lobortis nulla in, blandit
+elit. Integer interdum risus leo, at sollicitudin metus rutrum
+sed. Vivamus dapibus massa vulputate, scelerisque justo id,
+pellentesque purus. In quis sapien velit. Sed vel dignissim
+velit. Vestibulum tempus leo eget ante vulputate porttitor. Integer
+mollis elementum massa et efficitur. Sed in consequat libero, a
+imperdiet ante. Donec nec posuere ex. In eu metus lacus. Nulla et
+lorem risus.
+
+Aliquam ex tellus, dictum et vestibulum auctor, commodo sed
+diam. Pellentesque a ex erat. Vivamus a dui sem. Pellentesque
+molestie, elit quis placerat volutpat, sapien odio iaculis enim, eu
+scelerisque diam libero sit amet neque. Suspendisse vehicula placerat
+tortor at rutrum. Etiam massa sapien, bibendum a libero at, vulputate
+lobortis neque. Fusce condimentum tellus nec arcu hendrerit
+pellentesque. Integer tortor leo, sollicitudin in erat ac, convallis
+hendrerit sapien. Vestibulum erat augue, interdum vel odio et,
+ultrices tempus quam. Aliquam ut tortor dolor.
+
+Sed vulputate a turpis sed fermentum. Nam ultricies, dui vitae auctor
+posuere, orci elit commodo diam, ac rutrum dolor massa in dolor. Donec
+id commodo sem, quis porta massa. Morbi varius sem metus, a interdum
+libero varius quis. Curabitur posuere gravida tortor, vitae aliquam
+quam placerat vitae. Aenean ut tortor auctor, aliquam purus hendrerit,
+elementum metus. Sed finibus eros nec pellentesque laoreet. Nulla
+eleifend pulvinar metus eget rhoncus.
+
+Praesent euismod finibus nisl eu facilisis. Quisque tempor est est,
+luctus convallis eros tincidunt sit amet. Sed accumsan magna tincidunt
+nulla maximus auctor id id sem. Vivamus eleifend ullamcorper
+semper. Etiam luctus est ac lectus ullamcorper aliquam. Donec in dolor
+metus. Nam pharetra et leo sed auctor. Phasellus a massa quis enim
+suscipit venenatis. Ut eleifend dolor nec vehicula imperdiet. Praesent
+mollis nisi magna, eget pharetra ante semper eget. Curabitur sed
+feugiat massa. Fusce eu dapibus enim, vitae auctor metus.
+
+Ut nisi nibh, suscipit id quam eu, convallis bibendum arcu. Donec
+suscipit, diam consectetur sagittis ultricies, orci justo euismod leo,
+et lobortis ipsum enim vitae ante. Curabitur viverra sapien ac
+eleifend euismod. Phasellus mattis risus a venenatis auctor. In mollis
+odio lectus, vel pulvinar tortor malesuada vitae. Etiam sed ultricies
+purus. Phasellus lectus ipsum, gravida eu bibendum id, feugiat a
+sem. Morbi et metus est. Proin vel odio neque. Mauris dolor tortor,
+auctor nec finibus sit amet, porta at dolor. Nunc molestie dignissim
+luctus. Duis lacus magna, tincidunt a consectetur non, tincidunt vel
+risus. Phasellus maximus laoreet ex, at finibus metus consequat
+eu. Praesent et neque dolor. Cras luctus fringilla ullamcorper. Aenean
+egestas tellus ac convallis luctus.
diff --git a/assets/css/main.scss b/assets/css/main.scss
@@ -412,4 +412,38 @@ table {
     padding-right: .5rem;
 }
 
+// -----------------------------------------------------------------------------
+// page
+// -----------------------------------------------------------------------------
+
+$main-width-sm: 80%;
+$main-width-md: 70%;
+$main-width-lg: 50%;
+
+main {
+    width: $main-width-sm;
+    margin: 0 auto 3rem;
+    padding: 0 2rem;
+    @include medium {
+	width: $main-width-md;
+    }
+    @include large {
+	width: $main-width-lg;
+    }
+
+    .line { 
+	margin: 2rem 0;
+	height: 1px;
+	background: black;
+	background: -webkit-gradient(linear, 0 0, 100% 0, from(white),
+				     to(white), color-stop(50%, black));
+}
+}
+
+.page-header {
+    > h1 {
+	text-align: center;
+    }
+}
+
 
diff --git a/assets/js/index_map.js b/assets/js/index_map.js
@@ -184,7 +184,7 @@ map.on('load', function () {
     // SIDEBAR -------------------------------------------------------
 
     // add to visible variable on these events, which triggers sidebar
-    map.on('zoomend', addToVisible);
+    map.on('zoom', addToVisible);
     map.on('move', addToVisible);
 
     // POPUPS --------------------------------------------------------

diff --git a/corrections/index.md b/corrections/index.md
@@ -1,5 +1,58 @@
 ---
-layout: default
+layout: page
+title: Corrections
 ---
 
-# Corrections
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed eleifend
+diam condimentum risus vulputate, a aliquam urna aliquet. Morbi vel
+tortor laoreet, aliquet ipsum non, porttitor tortor. Nunc condimentum
+sem egestas, consectetur leo nec, accumsan risus. Quisque at ligula
+augue. Pellentesque pharetra dui a turpis pharetra, a luctus neque
+dapibus. Proin ut nisl convallis, lobortis nulla in, blandit
+elit. Integer interdum risus leo, at sollicitudin metus rutrum
+sed. Vivamus dapibus massa vulputate, scelerisque justo id,
+pellentesque purus. In quis sapien velit. Sed vel dignissim
+velit. Vestibulum tempus leo eget ante vulputate porttitor. Integer
+mollis elementum massa et efficitur. Sed in consequat libero, a
+imperdiet ante. Donec nec posuere ex. In eu metus lacus. Nulla et
+lorem risus.
+
+Aliquam ex tellus, dictum et vestibulum auctor, commodo sed
+diam. Pellentesque a ex erat. Vivamus a dui sem. Pellentesque
+molestie, elit quis placerat volutpat, sapien odio iaculis enim, eu
+scelerisque diam libero sit amet neque. Suspendisse vehicula placerat
+tortor at rutrum. Etiam massa sapien, bibendum a libero at, vulputate
+lobortis neque. Fusce condimentum tellus nec arcu hendrerit
+pellentesque. Integer tortor leo, sollicitudin in erat ac, convallis
+hendrerit sapien. Vestibulum erat augue, interdum vel odio et,
+ultrices tempus quam. Aliquam ut tortor dolor.
+
+Sed vulputate a turpis sed fermentum. Nam ultricies, dui vitae auctor
+posuere, orci elit commodo diam, ac rutrum dolor massa in dolor. Donec
+id commodo sem, quis porta massa. Morbi varius sem metus, a interdum
+libero varius quis. Curabitur posuere gravida tortor, vitae aliquam
+quam placerat vitae. Aenean ut tortor auctor, aliquam purus hendrerit,
+elementum metus. Sed finibus eros nec pellentesque laoreet. Nulla
+eleifend pulvinar metus eget rhoncus.
+
+Praesent euismod finibus nisl eu facilisis. Quisque tempor est est,
+luctus convallis eros tincidunt sit amet. Sed accumsan magna tincidunt
+nulla maximus auctor id id sem. Vivamus eleifend ullamcorper
+semper. Etiam luctus est ac lectus ullamcorper aliquam. Donec in dolor
+metus. Nam pharetra et leo sed auctor. Phasellus a massa quis enim
+suscipit venenatis. Ut eleifend dolor nec vehicula imperdiet. Praesent
+mollis nisi magna, eget pharetra ante semper eget. Curabitur sed
+feugiat massa. Fusce eu dapibus enim, vitae auctor metus.
+
+Ut nisi nibh, suscipit id quam eu, convallis bibendum arcu. Donec
+suscipit, diam consectetur sagittis ultricies, orci justo euismod leo,
+et lobortis ipsum enim vitae ante. Curabitur viverra sapien ac
+eleifend euismod. Phasellus mattis risus a venenatis auctor. In mollis
+odio lectus, vel pulvinar tortor malesuada vitae. Etiam sed ultricies
+purus. Phasellus lectus ipsum, gravida eu bibendum id, feugiat a
+sem. Morbi et metus est. Proin vel odio neque. Mauris dolor tortor,
+auctor nec finibus sit amet, porta at dolor. Nunc molestie dignissim
+luctus. Duis lacus magna, tincidunt a consectetur non, tincidunt vel
+risus. Phasellus maximus laoreet ex, at finibus metus consequat
+eu. Praesent et neque dolor. Cras luctus fringilla ullamcorper. Aenean
+egestas tellus ac convallis luctus.