2 files changed, 19 insertions, 12 deletions
diff --git a/_includes/views/banner.html b/_includes/views/banner.html
index a6b503f..d77e42c 100644
--- a/_includes/views/banner.html
+++ b/_includes/views/banner.html
@@ -3,11 +3,6 @@
 {%- include functions.html func='get_value' -%}
 {% assign banner_html = return %}
 
-{%- include functions.html func='log' level='debug' msg='Get banner value' -%}
-{% assign name = 'banner' %}
-{%- include functions.html func='get_value' -%}
-{% assign banner = return %}
-
 {%- include functions.html func='log' level='debug' msg='Get heading value' -%}
 {% assign name = 'heading' %}
 {%- include functions.html func='get_value' -%}
@@ -18,10 +13,25 @@
 {%- include functions.html func='get_value' -%}
 {% assign subheading = return %}
 
-{% if banner %}
+{%- include functions.html func='get_banner' -%}
+
+{% if banner_image %}
+  <style>
+    html .page-banner {
+      height: {{ banner_height }};
+    }
+
+    html .page-banner .page-banner-img > *:first-child {
+      opacity: {{ banner_opacity }};
+    }
+
+    html[data-theme="dark"] .page-banner .page-banner-img > *:first-child {
+      opacity: {{ banner_opacity | times: 0.6 }};
+    }
+  </style>
   <section class="page-banner">
     <div class="page-banner-img">
-      <div style="background-image: url({{ banner | relative_url }})"></div>
+      <div style="background-image: url({{ banner_image }})"></div>
     </div>
     <div class="wrapper">
       <div class="page-banner-inner">
diff --git a/_includes/views/header.html b/_includes/views/header.html
index 3bd063c..d8b43f4 100644
--- a/_includes/views/header.html
+++ b/_includes/views/header.html
@@ -1,15 +1,12 @@
 
-{%- include functions.html func='log' level='debug' msg='Get banner value' -%}
-{%- assign name = 'banner' -%}
-{%- include functions.html func='get_value' -%}
-{% assign banner = return %}
+{%- include functions.html func='get_banner' -%}
 
 {%- include functions.html func='log' level='debug' msg='Get header_transparent value' -%}
 {%- assign name = 'header_transparent' -%}
 {%- include functions.html func='get_value' default=true -%}
 {%- assign header_transparent = return -%}
 
-{%- if banner and header_transparent -%}
+{%- if banner_image and header_transparent -%}
   {%- assign header_transparent_class = "site-header-transparent" -%}
 {%- endif -%}