Always load cookie assets and mount cookie banner modal

mandelstudio/templates/cookie_jar/cookie_banner.html

@@ -2,8 +2,6 @@
 {% load wagtailcore_tags ocyanjson %}
 
 {% with settings.cookie_jar.CookieSettings as cookie_settings %}
-    {% if cookie_jar.needs_approval or cookie_jar.site_settings.strict_cookies %}
-        {% if cookie_jar.needs_display or cookie_jar.site_settings.strict_cookies and not cookie_jar.cookie %}
         <div id="cookie_popup_body" class="cookie-consent-overlay" role="region" aria-label="{% trans 'Cookie settings' %}">
             <div class="cookie-consent-modal" role="dialog" aria-modal="true" aria-labelledby="cookie-consent-title">
                 <div class="cookie-consent-panel is-active" id="cookie-consent-main-panel">
@@ -55,8 +53,6 @@
                 </div>
             </div>
         </div>
-        {% endif %}
-    {% endif %}
 {% endwith %}
 
 <script>

mandelstudio/templates/layout.html

@@ -15,7 +15,7 @@
 {{ block.super }}
 {# Ensure Carbasa webshop styling is present so responsive header/footer render correctly. #}
 <link rel="stylesheet" type="text/x-scss" href="{% static 'carbasa/webshop_base.scss' %}">
-<link rel="stylesheet" type="text/css" href="{% static 'mandelstudio/css/layout_overrides.css' %}">
+<link rel="stylesheet" type="text/x-scss" href="{% static 'mandelstudio/scss/layout_overrides.scss' %}">
 {% endblock %}
 
 {% block extrahead %}
@@ -26,9 +26,7 @@
 <link rel="preconnect" href="https://www.google-analytics.com/">
 {% endif %}
 {{ block.super }}
-{% if cookie_jar.needs_approval or cookie_jar.site_settings.strict_cookies %}
 <link rel="stylesheet" type="text/css" href="{% static 'cookie_jar/css/cookie_jar.css' %}">
-{% endif %}
 {% for header_snippet in cookie_jar.activated_snippet_header_templates %}
 {% include header_snippet %}
 {% endfor %}
@@ -62,9 +60,7 @@
 {% block extrascripts %}
 {% include "oscar/partials/extrascripts.html" %}
 {{ block.super }}
-{% if cookie_jar.needs_approval or cookie_jar.site_settings.strict_cookies %}
 <script src="{% static 'cookie_jar/js/cookie_jar.js' %}"></script>
-{% endif %}
 {% endblock %}
 
 {% block onbodyload %}
@@ -94,9 +90,6 @@ oxyan.initImageZoom()
 {% for footer_snippet in cookie_jar.activated_snippet_footer_templates %}
     {% include footer_snippet %}
 {% endfor %}
-{% if cookie_jar.needs_approval or cookie_jar.site_settings.strict_cookies %}
-    <script src="{% static 'cookie_jar/js/cookie_jar.js' %}"></script>
-{% endif %}
 {% include "cookie_jar/cookie_banner.html" %}
 {% if cookie_jar.needs_approval or cookie_jar.site_settings.strict_cookies %}
     {% include "cookie_jar/partials/preferences_saved_toast.html" %}