From 2d225861eae37cd2c742ac3d89602f5d6327fa5c Mon Sep 17 00:00:00 2001
From: Daniel Jowett <d.jowett@4teamwork.ch>
Date: Tue, 14 Apr 2020 18:20:36 +0200
Subject: [PATCH] Reorder HEAD elements so that CSS comes before JavaScript -
 which is correct and proper

    This solves an issue in ftw.colorbox where overlays are not always loaded
---
 docs/HISTORY.txt                      |  3 ++-
 plonetheme/onegov/resources/rules.xml | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
index b5dae82..0dc5100 100644
--- a/docs/HISTORY.txt
+++ b/docs/HISTORY.txt
@@ -4,7 +4,8 @@ Changelog
 4.0.6 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Reorder HEAD elements so that CSS comes before JavaScript - which is correct and proper 
+  [djowett-ftw]
 
 
 4.0.5 (2020-03-16)
diff --git a/plonetheme/onegov/resources/rules.xml b/plonetheme/onegov/resources/rules.xml
index 96ab3ee..1c8b232 100644
--- a/plonetheme/onegov/resources/rules.xml
+++ b/plonetheme/onegov/resources/rules.xml
@@ -38,9 +38,14 @@
     <after content="/html/head/title" theme-children="/html/head" />
 
     <after
-        content="/html/head/base | /html/head/style | /html/head/script | /html/head/link | /html/head/comment()"
+        content="/html/head/base | /html/head/style | /html/head/link | /html/head/comment()"
         theme-children="/html/head"
         />
+    <after theme-children="/html/head" css:content="#portal-top style"/>
+    <after theme-children="/html/head" css:content="#portal-top link"/>
+
+    <after theme-children="/html/head" content="/html/head/script"/>
+    <after theme-children="/html/head" css:content="#portal-top script"/>
 
     <!-- Copy html lang -->
     <copy attributes="lang" content="/html" theme="/html" />
@@ -49,9 +54,6 @@
       <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=5.0, minimum-scale=1.0" />
     </replace>
 
-    <after theme-children="/html/head" css:content="#portal-top script"/>
-    <after theme-children="/html/head" css:content="#portal-top style"/>
-    <after theme-children="/html/head" css:content="#portal-top link"/>
 
     <replace css:content="#portal-logo" css:theme="#portal-logo" />
     <replace css:content="#portal-globalnav-wrapper" css:theme="#portal-globalnav" />