2 Commits

2 changed files with 2 additions and 4 deletions

View File

@@ -2,8 +2,7 @@
{% load wagtailcore_tags ocyanjson %} {% load wagtailcore_tags ocyanjson %}
{% with settings.cookie_jar.CookieSettings as cookie_settings %} {% 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 or not cookie_jar.cookie %}
{% 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 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-modal" role="dialog" aria-modal="true" aria-labelledby="cookie-consent-title">
<div class="cookie-consent-panel is-active" id="cookie-consent-main-panel"> <div class="cookie-consent-panel is-active" id="cookie-consent-main-panel">
@@ -56,7 +55,6 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% endif %}
{% endwith %} {% endwith %}
<script> <script>

View File

@@ -15,7 +15,7 @@
{{ block.super }} {{ block.super }}
{# Ensure Carbasa webshop styling is present so responsive header/footer render correctly. #} {# 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/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 %} {% endblock %}
{% block extrahead %} {% block extrahead %}