The Unified and Autonomous Development Platform
feat: Add contrasting border to black and white icons for theme-agnostic visibility (OD-2833)
Robin Shenf10ebdf7615e
diff --git a/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoCssResourceReference.javadeleted file mode 100644index 9861ed4599..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoCssResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.component.brandlogo;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class BrandLogoCssResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public BrandLogoCssResourceReference() {- super(BrandLogoCssResourceReference.class, "brand-logo.css");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoPanel.html b/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoPanel.htmlindex 1eefc42570..634e4b0ab5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoPanel.html@@ -1,4 +1,3 @@<wicket:panel>- <img wicket:id="custom" class="brand-logo">- <svg wicket:id="default" class="brand-logo"/>+ <img wicket:id="logo" class="brand-logo"></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoPanel.java b/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoPanel.javaindex 8209103e75..f0895ed571 100644--- a/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoPanel.java@@ -1,17 +1,15 @@package io.onedev.server.web.component.brandlogo;-import io.onedev.commons.bootstrap.Bootstrap;-import io.onedev.server.web.component.svg.SpriteImage;-import io.onedev.server.web.page.base.BasePage;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;+import java.io.File;+import java.io.Serializable;+import org.apache.wicket.markup.html.image.ExternalImage;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;-import org.jspecify.annotations.Nullable;-import java.io.File;-import java.io.Serializable;++import io.onedev.commons.bootstrap.Bootstrap;+import io.onedev.server.web.page.base.BasePage;public class BrandLogoPanel extends Panel {@@ -26,7 +24,7 @@ public class BrandLogoPanel extends Panel {this(id, null);}- private File getCustomLogoFile() {+ private File getLogoFile() {if (isDarkMode())return new File(Bootstrap.getSiteDir(), "assets/logo-dark.png");else@@ -44,38 +42,18 @@ public class BrandLogoPanel extends Panel {protected void onInitialize() {super.onInitialize();- add(new ExternalImage("custom", new LoadableDetachableModel<>() {+ add(new ExternalImage("logo", new LoadableDetachableModel<>() {@Overrideprotected Serializable load() {- return "/" + getCustomLogoFile().getName() + "?v=" + getCustomLogoFile().lastModified();+ if (getLogoFile().exists())+ return "/" + getLogoFile().getName() + "?v=" + getLogoFile().lastModified();+ else+ return "/~img/logo.png";}- }) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getCustomLogoFile().exists());- }-- });- add(new SpriteImage("default", "logo") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!getCustomLogoFile().exists());- }-- });+ }));setRenderBodyOnly(true);}- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new BrandLogoCssResourceReference()));- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/component/brandlogo/brand-logo.css b/server-core/src/main/java/io/onedev/server/web/component/brandlogo/brand-logo.cssdeleted file mode 100644index 410829be0f..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/brandlogo/brand-logo.css+++ /dev/null@@ -1,3 +0,0 @@-svg.brand-logo {- fill: currentColor;-}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/img/logo-dark.png b/server-core/src/main/java/io/onedev/server/web/img/logo-dark.pngdeleted file mode 100644index 22dcc69d63..0000000000Binary files a/server-core/src/main/java/io/onedev/server/web/img/logo-dark.png and /dev/null differdiff --git a/server-core/src/main/java/io/onedev/server/web/img/logo.png b/server-core/src/main/java/io/onedev/server/web/img/logo.pngindex 8ccb5dcf20..fda799d7d0 100644Binary files a/server-core/src/main/java/io/onedev/server/web/img/logo.png and b/server-core/src/main/java/io/onedev/server/web/img/logo.png differdiff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.javaindex fbd3e0ac2a..450cc45947 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.java@@ -57,8 +57,7 @@ public class BrandingSettingPage extends AdministrationPage {private String getDefaultLogoData(boolean darkMode) {try {- var fileName = darkMode?"logo-dark.png":"logo.png";- URL url = Resources.getResource(ImageScope.class, fileName);+ URL url = Resources.getResource(ImageScope.class, "logo.png");return DATA_PREFIX + Base64.encodeBase64String(Resources.toByteArray(url));} catch (IOException e) {throw new RuntimeException(e);diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/SimplePage.html b/server-core/src/main/java/io/onedev/server/web/page/simple/SimplePage.htmlindex fd746f9435..5f14b39e3f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/SimplePage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/SimplePage.html@@ -1,7 +1,7 @@<wicket:extend><div class="main text-center"><div class="d-flex justify-content-center">- <svg wicket:id="logo" class="brand-logo"/>+ <div wicket:id="logo" class="brand-logo"/></div><div class="title"><h3 wicket:id="title"></h3>