From: Michael Tremer Date: Tue, 9 Jan 2024 18:12:07 +0000 (+0000) Subject: error-pages: Ship font files X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=549c804d49d0b98a1a9748586a45a4049e5bccc0;p=ipfire.org.git error-pages: Ship font files Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index 46d0b6dc..a8eb7e53 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1081,7 +1081,8 @@ EXTRA_DIST += \ .PHONY: error-pages error-pages: - $(AM_V_GEN)cd src/error-pages && $(JEKYLL) build --quiet --incremental + $(AM_V_GEN)cd src/error-pages && JEKYLL_ENV=production \ + $(JEKYLL) build --quiet --incremental .PHONY: upload-error-pages upload-error-pages: error-pages diff --git a/src/error-pages/assets/fonts/Prompt-Black.ttf b/src/error-pages/assets/fonts/Prompt-Black.ttf new file mode 100644 index 00000000..624fe85b Binary files /dev/null and b/src/error-pages/assets/fonts/Prompt-Black.ttf differ diff --git a/src/error-pages/assets/fonts/Prompt-BlackItalic.ttf b/src/error-pages/assets/fonts/Prompt-BlackItalic.ttf new file mode 100644 index 00000000..49ebb167 Binary files /dev/null and b/src/error-pages/assets/fonts/Prompt-BlackItalic.ttf differ diff --git a/src/error-pages/assets/fonts/Prompt-Bold.ttf b/src/error-pages/assets/fonts/Prompt-Bold.ttf new file mode 100644 index 00000000..6cdd89b4 Binary files /dev/null and b/src/error-pages/assets/fonts/Prompt-Bold.ttf differ diff --git a/src/error-pages/assets/fonts/Prompt-BoldItalic.ttf b/src/error-pages/assets/fonts/Prompt-BoldItalic.ttf new file mode 100644 index 00000000..a9effd7f Binary files /dev/null and b/src/error-pages/assets/fonts/Prompt-BoldItalic.ttf differ diff --git a/src/error-pages/assets/fonts/Prompt-ExtraBold.ttf b/src/error-pages/assets/fonts/Prompt-ExtraBold.ttf new file mode 100644 index 00000000..ded930f2 Binary files /dev/null and b/src/error-pages/assets/fonts/Prompt-ExtraBold.ttf differ diff --git a/src/error-pages/assets/fonts/Prompt-ExtraBoldItalic.ttf b/src/error-pages/assets/fonts/Prompt-ExtraBoldItalic.ttf new file mode 100644 index 00000000..6c076ed2 Binary files /dev/null and b/src/error-pages/assets/fonts/Prompt-ExtraBoldItalic.ttf differ diff --git a/src/error-pages/assets/fonts/Prompt-ExtraLight.ttf b/src/error-pages/assets/fonts/Prompt-ExtraLight.ttf new file mode 100644 index 00000000..7f946761 Binary files /dev/null and b/src/error-pages/assets/fonts/Prompt-ExtraLight.ttf differ diff --git a/src/error-pages/assets/fonts/Prompt-ExtraLightItalic.ttf b/src/error-pages/assets/fonts/Prompt-ExtraLightItalic.ttf new file mode 100644 index 00000000..4ca72e3a Binary files /dev/null and b/src/error-pages/assets/fonts/Prompt-ExtraLightItalic.ttf differ diff --git a/src/error-pages/assets/fonts/Prompt-Italic.ttf b/src/error-pages/assets/fonts/Prompt-Italic.ttf new file mode 100644 index 00000000..05457347 Binary files /dev/null and b/src/error-pages/assets/fonts/Prompt-Italic.ttf differ diff --git a/src/error-pages/assets/fonts/Prompt-Light.ttf b/src/error-pages/assets/fonts/Prompt-Light.ttf new file mode 100644 index 00000000..0c5d1eb5 Binary files /dev/null and b/src/error-pages/assets/fonts/Prompt-Light.ttf differ diff --git a/src/error-pages/assets/fonts/Prompt-LightItalic.ttf b/src/error-pages/assets/fonts/Prompt-LightItalic.ttf new file mode 100644 index 00000000..8bb339a5 Binary files /dev/null and b/src/error-pages/assets/fonts/Prompt-LightItalic.ttf differ diff --git a/src/error-pages/assets/fonts/Prompt-Medium.ttf b/src/error-pages/assets/fonts/Prompt-Medium.ttf new file mode 100644 index 00000000..adf72c9f Binary files /dev/null and b/src/error-pages/assets/fonts/Prompt-Medium.ttf differ diff --git a/src/error-pages/assets/fonts/Prompt-MediumItalic.ttf b/src/error-pages/assets/fonts/Prompt-MediumItalic.ttf new file mode 100644 index 00000000..7b87fdb6 Binary files /dev/null and b/src/error-pages/assets/fonts/Prompt-MediumItalic.ttf differ diff --git a/src/error-pages/assets/fonts/Prompt-Regular.ttf b/src/error-pages/assets/fonts/Prompt-Regular.ttf new file mode 100644 index 00000000..2a736dbb Binary files /dev/null and b/src/error-pages/assets/fonts/Prompt-Regular.ttf differ diff --git a/src/error-pages/assets/fonts/Prompt-SemiBold.ttf b/src/error-pages/assets/fonts/Prompt-SemiBold.ttf new file mode 100644 index 00000000..011a0507 Binary files /dev/null and b/src/error-pages/assets/fonts/Prompt-SemiBold.ttf differ diff --git a/src/error-pages/assets/fonts/Prompt-SemiBoldItalic.ttf b/src/error-pages/assets/fonts/Prompt-SemiBoldItalic.ttf new file mode 100644 index 00000000..3bec3f77 Binary files /dev/null and b/src/error-pages/assets/fonts/Prompt-SemiBoldItalic.ttf differ diff --git a/src/error-pages/assets/fonts/Prompt-Thin.ttf b/src/error-pages/assets/fonts/Prompt-Thin.ttf new file mode 100644 index 00000000..a3b80b44 Binary files /dev/null and b/src/error-pages/assets/fonts/Prompt-Thin.ttf differ diff --git a/src/error-pages/assets/fonts/Prompt-ThinItalic.ttf b/src/error-pages/assets/fonts/Prompt-ThinItalic.ttf new file mode 100644 index 00000000..f64319a5 Binary files /dev/null and b/src/error-pages/assets/fonts/Prompt-ThinItalic.ttf differ diff --git a/src/error-pages/assets/main.sass b/src/error-pages/assets/main.sass index c865eef7..20adb8cf 100644 --- a/src/error-pages/assets/main.sass +++ b/src/error-pages/assets/main.sass @@ -3,8 +3,6 @@ @charset "utf-8" -$baseurl: "/.errors/assets" - // Import variables @import "../sass/_variables.sass" @@ -32,4 +30,6 @@ $baseurl: "/.errors/assets" @import "../third-party/bulma/sass/layout/hero.sass" // Import fonts +$fonts-baseurl: "/.errors/assets/fonts" + @import "../sass/_fonts" diff --git a/src/sass/_fonts.sass b/src/sass/_fonts.sass index 47ca754c..83072cb5 100644 --- a/src/sass/_fonts.sass +++ b/src/sass/_fonts.sass @@ -1,11 +1,11 @@ -$baseurl: !default +$fonts-baseurl: "/static/fonts" !default /* latin-ext */ @font-face font-family: "Prompt" font-style: normal font-weight: 400 - src: local("Prompt Regular"), local("Prompt-Regular"), url(#{$baseurl}/static/fonts/Prompt-Regular.ttf) format("truetype") + src: local("Prompt Regular"), local("Prompt-Regular"), url(#{$fonts-baseurl}/Prompt-Regular.ttf) format("truetype") unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF /* latin */ @@ -13,7 +13,7 @@ $baseurl: !default font-family: "Prompt" font-style: normal font-weight: 400 - src: local("Prompt Regular"), local("Prompt-Regular"), url(#{$baseurl}/static/fonts/Prompt-Regular.ttf) format("truetype") + src: local("Prompt Regular"), local("Prompt-Regular"), url(#{$fonts-baseurl}/Prompt-Regular.ttf) format("truetype") unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD /* latin-ext */ @@ -21,7 +21,7 @@ $baseurl: !default font-family: 'Prompt' font-style: normal font-weight: 500 - src: local('Prompt Medium'), local('Prompt-Medium'), url(#{$baseurl}/static/fonts/Prompt-Medium.ttf) format("truetype") + src: local('Prompt Medium'), local('Prompt-Medium'), url(#{$fonts-baseurl}/Prompt-Medium.ttf) format("truetype") unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF /* latin */ @@ -29,7 +29,7 @@ $baseurl: !default font-family: 'Prompt' font-style: normal font-weight: 500 - src: local('Prompt Medium'), local('Prompt-Medium'), url(#{$baseurl}/static/fonts/Prompt-Medium.ttf) format("truetype") + src: local('Prompt Medium'), local('Prompt-Medium'), url(#{$fonts-baseurl}/Prompt-Medium.ttf) format("truetype") unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD /* latin-ext */ @@ -37,7 +37,7 @@ $baseurl: !default font-family: "Prompt" font-style: normal font-weight: 700 - src: local("Prompt Bold"), local("Prompt-Bold"), url(#{$baseurl}/static/fonts/Prompt-Bold.ttf) format("truetype") + src: local("Prompt Bold"), local("Prompt-Bold"), url(#{$fonts-baseurl}/Prompt-Bold.ttf) format("truetype") unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF /* latin */ @@ -45,5 +45,5 @@ $baseurl: !default font-family: "Prompt" font-style: normal font-weight: 700 - src: local("Prompt Bold"), local("Prompt-Bold"), url(#{$baseurl}/static/fonts/Prompt-Bold.ttf) format("truetype") + src: local("Prompt Bold"), local("Prompt-Bold"), url(#{$fonts-baseurl}/Prompt-Bold.ttf) format("truetype") unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD