Merge pull request #16 from yupiik/theme

[minisite] Update theme
yupiik · Mar 10, 2024 · 3492ef8 · 3492ef8
2 parents 3cb0cf4 + e2672c9
commit 3492ef8
Show file tree

Hide file tree

Showing 11 changed files with 2,687 additions and 84 deletions.
diff --git a/minisite-core/src/main/java/io/yupiik/tools/minisite/MiniSite.java b/minisite-core/src/main/java/io/yupiik/tools/minisite/MiniSite.java
@@ -655,7 +655,8 @@ public FileVisitResult visitFile(final Path file, final BasicFileAttributes attr
         if (configuration.isUseDefaultAssets()) {
             Stream.of(
                             "yupiik-tools-maven-plugin/minisite/assets/css/theme.css",
-                            "yupiik-tools-maven-plugin/minisite/assets/js/minisite.js")
+                            "yupiik-tools-maven-plugin/minisite/assets/js/minisite.js",
+                            "yupiik-tools-maven-plugin/minisite/assets/images/logo.svg")
                     .forEach(resource -> {
                         final Path out = output.resolve(resource.substring("yupiik-tools-maven-plugin/minisite/assets/".length()));
                         try (final BufferedReader buffer = new BufferedReader(new InputStreamReader(Thread.currentThread().getContextClassLoader()
@@ -1183,8 +1184,8 @@ public Function<Page, String> createTemplate(final Object options,
                 .replace("{{projectVersion}}", configuration.getProjectVersion()) // enables to invalidate browser cache
                 .replace("{{logoText}}", getLogoText())
                 .replace("{{logoSideText}}", getLogoSideText())
+                .replace("{{logo}}", ofNullable(configuration.getLogo()).orElse("{{base}}/images/logo.svg"))
                 .replace("{{base}}", configuration.getSiteBase())
-                .replace("{{logo}}", ofNullable(configuration.getLogo()).orElse("//www.yupiik.io/images/favicon.png"))
                 .replace("{{linkedInCompany}}", ofNullable(configuration.getLinkedInCompany())
                         .orElse("yupiik"));
         final String suffix = readTemplates(layout, configuration.getTemplateSuffixes())

diff --git a/minisite-core/src/main/java/io/yupiik/tools/minisite/MiniSiteConfiguration.java b/minisite-core/src/main/java/io/yupiik/tools/minisite/MiniSiteConfiguration.java
@@ -145,7 +145,7 @@ public void fixConfig() {
         templateExtensionPoints.putIfAbsent("copyrightLine", "" +
                 "<small class=\"copyright\">{{copyright}}</small>" + (injectYupiikTemplateExtensionPoints ? "" +
                 // add terms of service and privacy policy
-                " | <a href=\"https://www.{{linkedInCompany}}.com/terms-of-service/\">Terms of service</a> | " +
+                " | <a href=\"https://www.{{linkedInCompany}}.com/terms-of-use/\">Terms of use</a> | " +
                 "<a href=\"https://www.{{linkedInCompany}}.com/privacy-policy/\">Privacy policy</a>" : ""));
         templateExtensionPoints.putIfAbsent("socialLinksFooter", templateExtensionPoints.get("socialLinks"));
     }