From fd08c856723b3469ddf51773531f73588b39faf3 Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Tue, 30 Apr 2024 11:46:59 +0200 Subject: [PATCH 1/2] added noto sans webjar dependency fix --- webapp/pom.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/webapp/pom.xml b/webapp/pom.xml index 132bcfa5d1..bf52836e11 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -97,6 +97,23 @@ target/${project.artifactId}-${project.version}/webjars/jquery-ui/ + + org.webjars.npm + openfonts__noto-sans_all + jar + + META-INF/resources/webjars/openfonts__noto-sans_all/*/*.css, + META-INF/resources/webjars/openfonts__noto-sans_all/*/*/*.woff, + META-INF/resources/webjars/openfonts__noto-sans_all/*/*/*.woff2 + + + + ^META-INF/resources/webjars/openfonts__noto-sans_all/[^/]+/ + ./ + + + target/${project.artifactId}-${project.version}/webjars/fonts/noto-sans/ + true true @@ -141,6 +158,11 @@ jquery-ui 1.13.2 + + org.webjars.npm + openfonts__noto-sans_all + 1.44.0 + org.vivoweb vitro-api From 2f08554763da7eaf18aa884d9ef96199a840a41a Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Tue, 30 Apr 2024 12:11:38 +0200 Subject: [PATCH 2/2] Use local open sans for TPF page --- api/src/main/resources/tpf/base.ftl.html | 2 +- webapp/pom.xml | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/api/src/main/resources/tpf/base.ftl.html b/api/src/main/resources/tpf/base.ftl.html index ef90760c1b..c64dd7c3b4 100644 --- a/api/src/main/resources/tpf/base.ftl.html +++ b/api/src/main/resources/tpf/base.ftl.html @@ -6,7 +6,7 @@ Linked Data Fragments Server ${ (title!header)?ensure_starts_with("(")?ensure_ends_with(")") } - + diff --git a/webapp/pom.xml b/webapp/pom.xml index bf52836e11..1c4746eae2 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -114,6 +114,25 @@ target/${project.artifactId}-${project.version}/webjars/fonts/noto-sans/ + + org.webjars.npm + npm-font-open-sans + jar + + META-INF/resources/webjars/npm-font-open-sans/*/*.css, + META-INF/resources/webjars/npm-font-open-sans/*/*/*/*.woff, + META-INF/resources/webjars/npm-font-open-sans/*/*/*/*.ttf, + META-INF/resources/webjars/npm-font-open-sans/*/*/*/*.svg, + META-INF/resources/webjars/npm-font-open-sans/*/*/*/*.woff2 + + + + ^META-INF/resources/webjars/npm-font-open-sans/[^/]+/ + ./ + + + target/${project.artifactId}-${project.version}/webjars/fonts/open-sans/ + true true @@ -163,6 +182,11 @@ openfonts__noto-sans_all 1.44.0 + + org.webjars.npm + npm-font-open-sans + 1.1.0 + org.vivoweb vitro-api