Merge branch '7.8'

Author: at055612

static/css/stroom-ui/icon-colours.css renamed to assets/css/stroom-ui/icon-colours.css

@@ -736,6 +736,7 @@ prepare_for_release() {
     ./* \
     --exclude '*/stroom-docs-v*.zip' \
     --exclude '*/stroom-docs-v*.pdf'
+
   popd
 
   echo -e "${GREEN}Dumping contents of ${BLUE}${RELEASE_ARTEFACTS_DIR}${NC}"

static/css/stroom-ui/material_design_colors.css renamed to assets/css/stroom-ui/material_design_colors.css

@@ -91,6 +91,9 @@ latexDashes = true
 
   # Custom stroom-docs param. Don't use remote CDNs for js libs
   # so the site works with no internet connection
+  # If we wanted this true for the zipped sites and false for gh-pages
+  # we would have to buiild the whole thing twice as these params are build
+  # time, not runtime.
   offline_site = true
 
   # Custom stroom-docs param to be set at build time by ci_build.sh

static/css/stroom-ui/theme-dark.css renamed to assets/css/stroom-ui/theme-dark.css

@@ -18,6 +18,21 @@
 <meta name="robots" content="noindex, nofollow">
 {{ end -}}
 
+<!-- STROOM: Pre-load the font files as they will be needed as soon as main.css gets loaded -->
+<link rel="preload" href="/fonts/google_open_sans_300.ttf" as="font" type="font/ttf" crossorigin >
+<link rel="preload" href="/fonts/google_open_sans_300i.ttf" as="font" type="font/ttf" crossorigin >
+<link rel="preload" href="/fonts/google_open_sans_400.ttf" as="font" type="font/ttf" crossorigin >
+<link rel="preload" href="/fonts/google_open_sans_400i.ttf" as="font" type="font/ttf" crossorigin >
+<link rel="preload" href="/fonts/google_open_sans_700.ttf" as="font" type="font/ttf" crossorigin >
+<link rel="preload" href="/fonts/google_open_sans_700i.ttf" as="font" type="font/ttf" crossorigin >
+<link rel="preload" href="/webfonts/fa-brands-400.ttf" as="font" type="font/ttf" crossorigin >
+<link rel="preload" href="/webfonts/fa-brands-400.woff2" as="font" type="font/woff2" crossorigin >
+<!--<link rel="preload" href="/webfonts/fa-regular-400.ttf" as="font" type="font/ttf" crossorigin >-->
+<!--<link rel="preload" href="/webfonts/fa-regular-400.woff2" as="font" type="font/woff2" crossorigin >-->
+<link rel="preload" href="/webfonts/fa-solid-900.ttf" as="font" type="font/ttf" crossorigin >
+<link rel="preload" href="/webfonts/fa-solid-900.woff2" as="font" type="font/woff2" crossorigin >
+<!--<link rel="preload" href="/webfonts/fa-v4compatibility.ttf" as="font" type="font/ttf" crossorigin >-->
+<!--<link rel="preload" href="/webfonts/fa-v4compatibility.woff2" as="font" type="font/woff2" crossorigin >-->
 
 <!-- STROOM: Add a canonical link so google indexing knows to ignore the old versions -->
 {{ if .Site.Params.archived_version }}
@@ -47,25 +62,22 @@
   integrity="sha384-vtXRMe3mGCbOeY7l30aIg8H9p3GdeSe4IFlP6G8JMa7o7lXvnz3GFKzPxzJdPfGK"
   crossorigin="anonymous"></script>
 {{ end }}
-{{ if .Site.Params.offlineSearch -}}
-  {{ if .Site.Params.offline_site }}
-<script src='{{ "/js/lunr.min.js" | relURL }}'></script>
-  {{ else }}
-<script
-  src="https://unpkg.com/[email protected]/lunr.min.js"
-  integrity="sha384-203J0SNzyqHby3iU6hzvzltrWi/M41wOP5Gu+BiJMz5nwKykbkUx8Kp7iti0Lpli"
-  crossorigin="anonymous"></script>
-  {{ end }}
-{{ end -}}
+
+<!-- STROOM - Lunr has been moved to partials/scripts.html so that it gets loaded at the end of the page. -->
 
 {{ if .Site.Params.prism_syntax_highlighting -}}
 <link rel="stylesheet" href="{{ "/css/prism.css" | relURL }}"/>
 {{ end -}}
 
-<link rel="stylesheet" href="{{ "/css/stroom-ui/icon-colours.css" | relURL }}"/>
-<link rel="stylesheet" href="{{ "/css/stroom-ui/material_design_colors.css" | relURL }}"/>
-<link rel="stylesheet" href="{{ "/css/stroom-ui/theme-root.css" | relURL }}"/>
-<link rel="stylesheet" href="{{ "/css/stroom-ui/theme-dark.css" | relURL }}"/>
+<!-- Minify all the stroom css files -->
+{{ $icon_colours_css := resources.Get "css/stroom-ui/icon-colours.css" | minify | fingerprint }}
+<link rel="stylesheet" href="{{ $icon_colours_css.RelPermalink }}" integrity="{{ $icon_colours_css.Data.Integrity }}">
+{{ $material_design_colors_css := resources.Get "css/stroom-ui/material_design_colors.css" | minify | fingerprint }}
+<link rel="stylesheet" href="{{ $material_design_colors_css.RelPermalink }}" integrity="{{ $material_design_colors_css.Data.Integrity }}">
+{{ $theme_root_css := resources.Get "css/stroom-ui/theme-root.css" | minify | fingerprint }}
+<link rel="stylesheet" href="{{ $theme_root_css.RelPermalink }}" integrity="{{ $theme_root_css.Data.Integrity }}">
+{{ $theme_dark_css := resources.Get "css/stroom-ui/theme-dark.css" | minify | fingerprint }}
+<link rel="stylesheet" href="{{ $theme_dark_css.RelPermalink }}" integrity="{{ $theme_dark_css.Data.Integrity }}">
 
 {{/*
 {{ $fonts_css := resources.Get "/css/fonts.css" | minify }}

static/css/stroom-ui/theme-root.css renamed to assets/css/stroom-ui/theme-root.css

@@ -18,6 +18,18 @@
 <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/mermaid.min.js" integrity="sha512-JERecFUBbsm75UpkVheAuDOE8NdHjQBrPACfEQYPwvPG+fjgCpHAz1Jw2ci9EXmd3DdfiWth3O3CQvcfEg8gsA==" crossorigin="anonymous"></script>
 {{ end }}
 
+<!-- STROOM - This was moved here from head.html to delay its loading -->
+{{ if .Site.Params.offlineSearch -}}
+  {{ if .Site.Params.offline_site }}
+    <script src='{{ "/js/lunr.min.js" | relURL }}'></script>
+  {{ else }}
+    <script
+      src="https://unpkg.com/[email protected]/lunr.min.js"
+      integrity="sha384-203J0SNzyqHby3iU6hzvzltrWi/M41wOP5Gu+BiJMz5nwKykbkUx8Kp7iti0Lpli"
+      crossorigin="anonymous"></script>
+  {{ end }}
+{{ end -}}
+
 {{ if .Site.Params.markmap.enable }}
 <style>
 .markmap > svg {

ci_build.sh

@@ -111,7 +111,8 @@ main() {
   local images_base_dir="${stroom_app_resources_ui_dir}/images"
   local css_base_dir="${stroom_app_resources_ui_dir}/css"
   local images_dest_dir="./assets/images/stroom-ui"
-  local css_dest_dir="./static/css/stroom-ui"
+  # Have to go in ./assets/ so they can be minified by hugo
+  local css_dest_dir="./assets/css/stroom-ui"
 
   if [ ! -d "${stroom_repo_root}" ]; then
     echo -e "${RED}ERROR${NC}: Can't find stroom repo root ${BLUE}${stroom_repo_root}${NC}"