Merge branch '7.6'

gchq · Nov 26, 2024 · e9a363b · e9a363b
2 parents 35e3236 + 5fb86ee
commit e9a363b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@ A new version of stroom-docs is released for each commit so version tags
 are not recorded in here. Changes are in chronological order with the most
 recent at the top.
 
+
+* Make path to font files relative so they work when the site is served from the sub-directory, e.g. on github.io.
+
 * Add sections on moving/copying documents and folder permissions to the `Document Permissions` page.
 
 * Remove `Roles` section and add content to `Security` section on doc/app permissions.

diff --git a/assets/scss/_fonts_project.scss b/assets/scss/_fonts_project.scss
@@ -9,6 +9,9 @@ $font-family-sans-serif: "Open Sans", -apple-system, BlinkMacSystemFont, "Segoe
 and the font files in static/fonts/
 
 to stop docsy pulling in font files from the internet.
+
+
+NOTE: assets/scss becomes /scss in the built site
 */
 
 @font-face {
@@ -17,46 +20,46 @@ to stop docsy pulling in font files from the internet.
   font-weight: 300;
   font-stretch: normal;
   font-display: swap;
-  src: url(/fonts/google_open_sans_300i.ttf) format('truetype');
+  src: url(../fonts/google_open_sans_300i.ttf) format('truetype');
 }
 @font-face {
   font-family: 'Open Sans';
   font-style: italic;
   font-weight: 400;
   font-stretch: normal;
   font-display: swap;
-  src: url(/fonts/google_open_sans_400i.ttf) format('truetype');
+  src: url(../fonts/google_open_sans_400i.ttf) format('truetype');
 }
 @font-face {
   font-family: 'Open Sans';
   font-style: italic;
   font-weight: 700;
   font-stretch: normal;
   font-display: swap;
-  src: url(/fonts/google_open_sans_700i.ttf) format('truetype');
+  src: url(../fonts/google_open_sans_700i.ttf) format('truetype');
 }
 @font-face {
   font-family: 'Open Sans';
   font-style: normal;
   font-weight: 300;
   font-stretch: normal;
   font-display: swap;
-  src: url(/fonts/google_open_sans_300.ttf) format('truetype');
+  src: url(../fonts/google_open_sans_300.ttf) format('truetype');
 }
 @font-face {
   font-family: 'Open Sans';
   font-style: normal;
   font-weight: 400;
   font-stretch: normal;
   font-display: swap;
-  src: url(/fonts/google_open_sans_400.ttf) format('truetype');
+  src: url(../fonts/google_open_sans_400.ttf) format('truetype');
 }
 @font-face {
   font-family: 'Open Sans';
   font-style: normal;
   font-weight: 700;
   font-stretch: normal;
   font-display: swap;
-  src: url(/fonts/google_open_sans_700.ttf) format('truetype');
+  src: url(../fonts/google_open_sans_700.ttf) format('truetype');
 }