new icons

11 files changed, 107 insertions, 78 deletions

diff --git a/db.json b/db.json
index f295601..5a0c2d8 100644
--- a/db.json
+++ b/db.json
@@ -5,20 +5,13 @@
       "title": "How to catch a riffraff!",
       "date": "2017.08.26",
       "tags": "#rifraff #youngboys #police #grass #1930s",
-      "body": "David Simpson, a Folkestone local born in the 1920 has agreed to explain to us what the local politics involving local grass were back in the day!",
+      "body": "David Simpson, a Folkestone local born in 1920, has agreed to explain to us what the local politics involving local grass were back in the day!",
       "gallery": false,
       "disabled": false,
       "__index": 0,
       "dateCreated": "Fri, 18 Aug 2017 21:05:58 GMT",
       "media": [
         {
-          "uri": "https://marsupial.s3.amazonaws.com/folkestone/f24a93e0-8b39-11e7-ad44-cbee73b467bc.png",
-          "width": "800",
-          "height": "480",
-          "caption": "Plaque on the fence at the end of the Leas",
-          "type": "image"
-        },
-        {
           "type": "youtube",
           "token": "vl_zTjfrJ8k",
           "uri": "",
@@ -28,6 +21,13 @@
           "thumb": "http://i.ytimg.com/vi/vl_zTjfrJ8k/hqdefault.jpg",
           "autoplay": "false",
           "loop": "false"
+        },
+        {
+          "uri": "https://marsupial.s3.amazonaws.com/folkestone/f24a93e0-8b39-11e7-ad44-cbee73b467bc.png",
+          "width": "800",
+          "height": "480",
+          "caption": "Plaque on the fence at the end of the Leas",
+          "type": "image"
         }
       ]
     },
diff --git a/public/assets/bird.png b/public/assets/bird.png
new file mode 100644
index 0000000..9f5edc0
--- /dev/null
+++ b/public/assets/bird.png
diff --git a/public/assets/csm.png b/public/assets/csm.png
new file mode 100644
index 0000000..18dea2d
--- /dev/null
+++ b/public/assets/csm.png
diff --git a/public/assets/css.css b/public/assets/css.css
index 46057a8..79c6989 100644
--- a/public/assets/css.css
+++ b/public/assets/css.css
@@ -2,6 +2,7 @@
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box;
+  border-radius: 5px;
 }
 html,body {
   padding: 0;
@@ -27,21 +28,33 @@ a {
 }
 #header {
   width: 100%;
-  margin: 0;
-  background: #fff;
-  padding: 20px;
-  box-shadow: 0 5px 10px rgba(0,0,0,0.2);
-  background-image: url(header.jpg);
-  background-size: cover;
-  background-position: bottom center;
 }
-
 #footer {
   width: 100%;
   margin: 0;
+  background-image: url(footer.jpg);
+  background-size: cover;
+  background-position: center;
+}
+#coda {
   padding: 10px 0;
   padding-top: 15px;
-  height: 300px;
+}
+#coda a {
+  display: inline-block;
+  font-size: 16px;
+  padding: 5px;
+  border-radius: 4px;
+  background: white;
+  margin: 10px;
+}
+#logos {
+  background: rgba(255,255,255,0.2);
+  padding: 20px 0;
+}
+#logos img {
+  max-height: 12vh;
+  margin: 5px;
 }
 
 h1, h2 {
@@ -90,53 +103,50 @@ h2 {
 
 /* GRID OF POSTS */
 
-#posts {
-  padding: 40px 0;
-}
 .cell {
-  display: inline-block;
-  width: 26vw;
-  height: 23vw;
-  margin: 2vw;
-  color: white;
+  display: block;
   cursor: pointer;
   background-size: cover;
   background-position: center center;
   position: relative;
+  background-image: url(postbg.jpg);
+  background-size: cover;
+  background-position: center center;
+  padding: 20px;
+  text-align: center;
 }
 .cell .title {
-  position: absolute;
-  top: 50%; left: 50%;
-  transform: translate3d(-50%, -50%, 0);
   text-transform: uppercase;
   font-weight: bold;
   text-align: center;
+  margin: 20px;
+}
+.cell .title span {
   font-size: 20px;
-  color: black;
-  background: white;
+  color: white;
   padding: 5px;
+  text-shadow: 0 1px 2px #000;
 }
-.desktop .cell {
-  opacity: 0.9;
-  transition: opacity 0.2s;
-}
-.desktop .cell:hover {
-  opacity: 1;
-}
-.cell:nth-child(2n+1) { background-color: #4f658e; }
-.cell:nth-child(2n+2) { background-color: #7a7067; }
-
 
 /* SINGLE POST VIEW */
 
 .media {
   width: 100%;
-  max-height: 50vh;
+}
+.media iframe {
+  margin: 10px auto;
+  max-height: 30vh;
+  max-width: 100%;
+}
+.media img {
+  display: block;
+  margin: 10px auto;
+  max-width: 100%;
 }
 .content {
-  text-align: left;
-  padding: 20px 50px;
+  padding: 20px;
   line-height: 1.5;   
+  background: white;
 }
 .close {
   position: absolute;
@@ -154,10 +164,6 @@ h2 {
 #testimonials {
   margin-top: 15px;
   box-shadow: 0 0 20px 0px rgba(0,0,0,0.4);
-  background-image: url(testimonials.jpg);
-  background-size: cover;
-  background-position: bottom center;
-  background-repeat: no-repeat;
   width: 100%;
   height: 300px;
 }
@@ -185,16 +191,11 @@ h2 {
   .cell {
     display: block;
     width: 100vw;
-    height: 20vh;
-    margin: 0;
   }
   #posts {
     margin: 0;
     padding: 0;
   }
-  body {
-    background-image: none;
-  }
   #testimonials {
     margin: 0;
   }
diff --git a/public/assets/footer.jpg b/public/assets/footer.jpg
new file mode 100644
index 0000000..6a485c9
--- /dev/null
+++ b/public/assets/footer.jpg
diff --git a/public/assets/geidai.png b/public/assets/geidai.png
new file mode 100644
index 0000000..7dd78b6
--- /dev/null
+++ b/public/assets/geidai.png
diff --git a/public/assets/header.jpg b/public/assets/header.jpg
index 3a16ef3..0839c17 100644
--- a/public/assets/header.jpg
+++ b/public/assets/header.jpg
diff --git a/public/assets/postbg.jpg b/public/assets/postbg.jpg
index 9fc5c3a..61a193e 100644
--- a/public/assets/postbg.jpg
+++ b/public/assets/postbg.jpg
diff --git a/public/assets/site.js b/public/assets/site.js
index eb38891..f875fee 100644
--- a/public/assets/site.js
+++ b/public/assets/site.js
@@ -3,6 +3,7 @@ var isIpad = !! (navigator.userAgent.match(/iPad/i))
 var isAndroid = !! (navigator.userAgent.match(/Android/i))
 var isMobile = isIphone || isIpad || isAndroid
 var isDesktop = ! isMobile
+var youtubePlayer = null
 
 document.body.classList.add(isDesktop ? 'desktop' : 'mobile')
 
@@ -17,7 +18,14 @@ $(function(){
       })
     })
     ready()
-  })
+  });
+  (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','https://www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-35821710-3', 'auto');
+  ga('send', 'pageview');
 })
 
 function ready() {
@@ -59,6 +67,7 @@ function build(){
     var entry = site.entries[id]
     if (! entry) return
     if (entry.media && entry.media.length) {
+      /*
       var media = entry.media[0]
       switch (media.type) {
         case 'youtube':
@@ -68,7 +77,12 @@ function build(){
           bg = media.uri
           break
       }
-      $(this).css('background-image', 'url(' + bg + ')')
+      */
+      // $(this).css('background-image', 'url(' + bg + ')')
+			if (youtubePlayer) {
+				youtubePlayer.seekTo(0, true)
+				return youtubePlayer.playVideo()
+			}
     }
   })
 }
diff --git a/public/assets/wayshape.png b/public/assets/wayshape.png
new file mode 100644
index 0000000..089f223
--- /dev/null
+++ b/public/assets/wayshape.png
diff --git a/templates/index.liquid b/templates/index.liquid
index cd22794..f8df776 100644
--- a/templates/index.liquid
+++ b/templates/index.liquid
@@ -23,19 +23,26 @@
 </head>
 <body>
 
-<div id='header'>
-  <h1>How to make a Folkestone.</h1>
-  <br>
-  <a href="https://docs.google.com/forms/d/10dqrK_3UZW_xlPWQLERd0xTwVONryyicNuz2aYz3X_I/edit?c=0&w=1"><h2>Participate!</h2></a>
-  <div id='tags'></div>
-</div>
+<img src="/assets/header.jpg" id="header">
 
 <div id='posts'>
   {% for entry in entries %}
     {% unless entry.disabled %}
       <div class='cell' data-id='{{ entry.id }}'>
         <div class='title'>
-          {{ entry.title }}
+          <span>{{ entry.title }}</span>
+        </div>
+        <div class='media'>
+        {% for media in entry.media %}
+          {% if media.type == 'youtube' %}
+            <iframe src="https://www.youtube.com/embed/{{ media.token }}?modestbranding=1&rel=0" width="{{media.width}}" height="{{media.height}}" frameborder="0" allowfullscreen></iframe>
+          {% else %}
+            <img src="{{media.uri}}">
+          {% endif %}
+        {% endfor %}
+        </div>
+        <div class="content">
+          {{ entry.body | newline_to_br }}
         </div>
       </div>
     {% endunless %}
@@ -53,24 +60,30 @@
   {% endunless %}
 {% endfor %}
 
-<div id="testimonials">
-  {% for testimonial in testimonials %}
-    {% unless testimonial.disabled %}
-      <div id='{{ testimonial.id }}' class='testimonial'>
-        <span class="blurb">
-          {{ testimonial.body | newline_to_br }}
-          &mdash;{{ testimonial.byline }}
-        </span>
-      </div>
-    {% endunless %}
-  {% endfor %}
-</div>
-
 <div id="footer">
-  How to make a Folkestone.<br>
-  Tokyo University of the Arts<br>
-  Central Saint Martins
-  <a href="http://howtomakeafolkestone.life/acknowledgements">Acknowledgements</a>  
+  <div id="testimonials">
+    {% for testimonial in testimonials %}
+      {% unless testimonial.disabled %}
+        <div id='{{ testimonial.id }}' class='testimonial'>
+          <span class="blurb">
+            {{ testimonial.body | newline_to_br }}
+            &mdash;{{ testimonial.byline }}
+          </span>
+        </div>
+      {% endunless %}
+    {% endfor %}
+  </div>
+
+  <div id="coda">
+    <a href="http://howtomakeafolkestone.life/acknowledgements">Acknowledgements</a>  
+    <a href="https://docs.google.com/forms/d/10dqrK_3UZW_xlPWQLERd0xTwVONryyicNuz2aYz3X_I/edit?c=0&w=1">Participate!</a>
+  </div>
+  <div id="logos">
+    <a target="_blank" href="http://www.arts.ac.uk/csm/"><img src="/assets/csm.png"></a>
+    <a target="_blank" href="http://www.geidai.ac.jp/english/"><img src="/assets/geidai.png"></a>
+    <a target="_blank" href="http://catalinavallejos.com/"><img src="/assets/wayshape.png"></a>
+    <a target="_blank" href="http://asdf.us/"><img src="/assets/bird.png"></a>
+  </div>
 </div>
 
 <div id='entry'>
@@ -82,6 +95,7 @@
   </div>
 </div>
 </body>
+<script src="http://www.youtube.com/player_api"></script>
 <script src="/assets/jquery.min.js"></script>
 <script src="/assets/flickity.pkgd.js"></script>
 <script src="/assets/site.js"></script>