From 9d946319f1b3b4397a9c1ebcfc22f17f1ac196b3 Mon Sep 17 00:00:00 2001 From: Kevin Etchells Date: Tue, 2 Jul 2024 11:10:49 +0100 Subject: [PATCH] Fix scripts load order --- django_app/frontend/style.css | 1 + django_app/redbox_app/templates/base.html | 10 ++++++++-- .../templates/macros/use-trusted-types.html | 13 ------------- 3 files changed, 9 insertions(+), 15 deletions(-) delete mode 100644 django_app/redbox_app/templates/macros/use-trusted-types.html diff --git a/django_app/frontend/style.css b/django_app/frontend/style.css index 862a8a560..142487375 100644 --- a/django_app/frontend/style.css +++ b/django_app/frontend/style.css @@ -8433,6 +8433,7 @@ body:has(.iai-environment-warning) main { .iai-chat-bubble__route { font-size: 0.625rem; line-height: 0.825rem; + display: none; } .iai-chat-bubble__sources-heading, .iai-chat-bubbles__sources-link { diff --git a/django_app/redbox_app/templates/base.html b/django_app/redbox_app/templates/base.html index ac970d4c0..87f08bcfe 100644 --- a/django_app/redbox_app/templates/base.html +++ b/django_app/redbox_app/templates/base.html @@ -1,5 +1,4 @@ {% from "macros/iai-top-nav.html" import iaiTopNav %} -{% from "macros/use-trusted-types.html" import use_trusted_types %} @@ -22,6 +21,14 @@ {% endif %} + + {% if COMPRESSION_ENABLED %} + {% compress js %} + + {% endcompress %} + {% else %} + + {% endif %} {% if environment | lower in ["dev", "preprod"] %} diff --git a/django_app/redbox_app/templates/macros/use-trusted-types.html b/django_app/redbox_app/templates/macros/use-trusted-types.html deleted file mode 100644 index 2a5576c4f..000000000 --- a/django_app/redbox_app/templates/macros/use-trusted-types.html +++ /dev/null @@ -1,13 +0,0 @@ -{% macro use_trusted_types() %} - - - - {% if COMPRESSION_ENABLED %} - {% compress js %} - - {% endcompress %} - {% else %} - - {% endif %} - -{% endmacro %} \ No newline at end of file