The Unified and Autonomous Development Platform
Prefer local Nerd Fonts in workspace terminal
Robin Shen2fbbac94941d
diff --git a/server-core/src/main/java/io/onedev/server/web/component/terminal/TerminalResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/terminal/TerminalResourceReference.javaindex 5d2ad40756..fe0902161f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/terminal/TerminalResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/component/terminal/TerminalResourceReference.java@@ -2,10 +2,12 @@ package io.onedev.server.web.component.terminal;import java.util.List;+import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import io.onedev.server.web.asset.xterm.XtermResourceReference;+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;import io.onedev.server.web.page.base.BaseDependentResourceReference;public class TerminalResourceReference extends BaseDependentResourceReference {@@ -20,6 +22,8 @@ public class TerminalResourceReference extends BaseDependentResourceReference {public List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = super.getDependencies();dependencies.add(JavaScriptHeaderItem.forReference(new XtermResourceReference()));+ dependencies.add(CssHeaderItem.forReference(+ new BaseDependentCssResourceReference(getScope(), "terminal.css")));return dependencies;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/terminal/terminal.css b/server-core/src/main/java/io/onedev/server/web/component/terminal/terminal.cssnew file mode 100644index 0000000000..ec0233465c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/terminal/terminal.css@@ -0,0 +1,15 @@+@font-face {+ font-family: "LocalNerdFont";+ src: local("JetBrainsMono NF Regular"),+ local("JetBrainsMonoNF-Regular"),+ local("JetBrainsMono Nerd Font"),+ local("JetBrainsMono NF"),+ local("FiraCode Nerd Font"),+ local("FiraCode NF"),+ local("Hack Nerd Font"),+ local("Hack NF"),+ local("MesloLGS Nerd Font"),+ local("MesloLGS NF"),+ local("CaskaydiaCove Nerd Font"),+ local("Symbols Nerd Font");+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/terminal/terminal.js b/server-core/src/main/java/io/onedev/server/web/component/terminal/terminal.jsindex a7f037c02c..6862a9a011 100644--- a/server-core/src/main/java/io/onedev/server/web/component/terminal/terminal.js+++ b/server-core/src/main/java/io/onedev/server/web/component/terminal/terminal.js@@ -3,7 +3,7 @@ onedev.server.terminal = {var $terminal = $("#" + containerId).children(".terminal");var xterm = new Terminal({fontSize: 14,- fontFamily: "Consolas, 'Liberation Mono', 'Menlo, Courier', monospace"+ fontFamily: "LocalNerdFont, Consolas, 'Liberation Mono', Menlo, Courier, monospace"});var fitAddon = new window.FitAddon.FitAddon();xterm.loadAddon(fitAddon);