Merge branch post-branch into master via CloudCannon

_includes/hero.html

@@ -1,8 +1,8 @@
 <!-- BEGIN hero.html -->
-<div id="banner" style={% if page.url == "/" %}"height:100%"{% else %}"height:60%; background-image:url('{{ page.image }}');background-size:cover;background-position:center;"{% endif %}>
+<div id="banner" style={% if page.url == "/" %}"height:100%"{% else %}"height:60%;"{% endif %}>
 
   <div>
-    <a href="{{ site.baseurl }}/" class="nodecoration"><img
+    <a href="{{ site.baseurl }}/" class="nodecoration"><img id="logo"
         src="{{ site.baseurl }}/assets/img/logo%20galleri%20momangen.svg" alt="{{ site.title }}" title="{{ site.title }}" /></a>
     {% if page.url == "/" %}
     <div id="poster">
@@ -21,7 +21,11 @@
       {% break %}       {% endif %}       {% endfor %}
       <!-- end Up next-->
     </div>
-    {% else %}{% endif %}
+    {% else %}
+    <div id="flyer" style="background-image: url({{ page.image }})"></div>
+    {% endif %}
+
   </div>
+  <div id="decoration"></div>
 </div>
 <!-- END hero.html -->

_sass/stylish.scss

@@ -78,14 +78,11 @@ a:active {
   display: flex;
   width: 100%;
   height: 100vh;
-  background-color: rgba(201, 246, 236, 0.3);
+
   z-index: -10;
   div {
     align-self: flex-end ;
     flex: 1 1 auto;
-    margin-left:5px;
-    margin-right: 5px;
-    margin-bottom: 3px;
     padding: 0;
   }
   img {
@@ -106,7 +103,8 @@ a:active {
 
   width: 90vw;
   margin-right: auto !important;
-  margin-bottom: 150px;
+  margin-bottom: 50px;
+  margin-left: 15px;
   display: flex;
   flex-wrap: wrap;
   div {
@@ -119,8 +117,7 @@ a:active {
 }
 
 #poster img {
-  margin-top: 5px;
+  margin: 0 0 50px 15px;
-  margin-bottom: 15px;
   border-radius: 5px;
   -moz-border-radius-topright: 9px;
   -moz-border-radius-bottomright: 9px;
@@ -142,8 +139,28 @@ canvas {
   width:100%;
   z-index: -3;
 }
-
+#flyer {
- 
+  z-index: -2;
+  position: fixed;
+  top:0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  padding: 0;
+  margin: 0;
+  background-position: center;
+  background-size: cover;
+  background-repeat: no-repeat;
+}
+#decoration {
+  position: absolute;
+  height: 50px;
+  width: 100%;
+  background: url(/assets/img/topbg.png) ;
+}
+#logo {
+  z-index: 1000;
+}
  /*
   * Layout
   */
@@ -162,7 +179,7 @@ canvas {
   display: flex;
   flex-wrap: wrap;
   overflow-x: hidden;
-  background: rgba(255, 255, 255, 0.5) url('/assets/img/bg.png');
+  background:url('/assets/img/bg.png');
   z-index: 10;
 
 }