Merge branch 'master' of git.njae.me.uk:ghost-theme-willow into HEAD

diff --git a/partials/sidebar.hbs b/partials/sidebar.hbs
index 63d72d8f924cb3e89a512c6ae3cc55bb4b045a69..9dc2a183f12979f26808a636ccdf58fbb4c6b19b 100644 (file)
--- a/partials/sidebar.hbs
+++ b/partials/sidebar.hbs
@@ -50,12 +50,24 @@
             • Publications
         </a>
 
-        <a class="c-sidebar-promotion-links__item" href="https://www.njae.me.uk" target="_blank">
+        <a class="c-sidebar-promotion-links__item" href="https://www.njae.me.uk/Main_Page" target="_blank">
             &bull; Personal site
         </a>
 
-        <a class="c-sidebar-promotion-links__item" href="/about">
+        <a class="c-sidebar-promotion-links__item" href="/about/">
             &bull; About
         </a>
+        <script>
+          (function() {
+            var cx = '013315344946609450626:fw_7x1auhwa';
+            var gcse = document.createElement('script');
+            gcse.type = 'text/javascript';
+            gcse.async = true;
+            gcse.src = 'https://cse.google.com/cse.js?cx=' + cx;
+            var s = document.getElementsByTagName('script')[0];
+            s.parentNode.insertBefore(gcse, s);
+          })();
+        </script>
+        <gcse:search></gcse:search>
     </div>
 </div>
\ No newline at end of file

diff --git a/post.hbs b/post.hbs
index 650eb23065342d6ef8338e187653866f340e7d3e..526612ff0878cae7c79d5e272bb4b038bf3f69bb 100644 (file)
--- a/post.hbs
+++ b/post.hbs
@@ -14,6 +14,11 @@
             {{> "post-meta"}}
         </div>
 
+        {{#if feature_image}}
+        <figure class="c-post-full-image" style="background-image: url({{feature_image}})">
+        </figure>
+        {{/if}}
+
         <div class="c-post-view__content">
             {{content}}
         </div>

diff --git a/source/sass/components/_post-view.scss b/source/sass/components/_post-view.scss
index bc7e55178cd09fcc7242255a33b32be3c75d00d3..aeaa58f54204303253d6d75f5157320b60267c00 100644 (file)
--- a/source/sass/components/_post-view.scss
+++ b/source/sass/components/_post-view.scss
@@ -25,6 +25,31 @@ img[src$="#full"] { max-width:none;width:100vw }
   border-top: 1px solid $c-gray;
 }
 
+// Feature image
+.c-post-full-image {
+    height: 800px;
+    margin: 0 -10vw -165px;
+    background: var(--lightgrey) center center;
+    background-size: cover;
+    border-radius: 5px;
+}
+
+
+@media (max-width: 1170px) {
+    .c-post-full-image {
+        height: 600px;
+        margin: 0 -4vw -100px;
+        border-radius: 0;
+        background-size: cover; 
+    }
+}
+
+@media (max-width: 800px) {
+    .c-post-full-image {
+        height: 400px;
+    }
+}
+
 /*
 |-------------------------------------------------------------------------------
 | Post view meta - date & tags