Skip to content

The Unified and Autonomous Development Platform

Merge branch 'issue-2981-prefer-local-nerd-fonts-term'

Robin Shendc4bfb3c6c83
diff --cc server-core/src/main/java/io/onedev/server/web/component/terminal/terminal.css
index f75916e657,ec0233465c..da47fb839e
--- 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.css
@@@ -1,91 -1,15 +1,107 @@@
+.terminal-container {
+ min-height: 0;
+}
+
+.terminal-container > .terminal {
+ height: auto !important;
+ min-height: 0;
+}
+
+.terminal-mobile-keys {
+ display: none;
+ flex: 0 0 auto;
+ align-items: center;
+ gap: 0.375rem;
+ padding: 0.375rem max(0.375rem, env(safe-area-inset-right)) max(0.375rem, env(safe-area-inset-bottom)) max(0.375rem, env(safe-area-inset-left));
+ background: #171717;
+ border-top: 1px solid #363636;
+ overflow: hidden;
+}
+
+.terminal-mobile-key-scroll {
+ display: flex;
+ flex: 1 1 auto;
+ align-items: center;
+ gap: 0.375rem;
+ min-width: 0;
+ overflow-x: auto;
+ overflow-y: hidden;
+ -webkit-overflow-scrolling: touch;
+ overscroll-behavior-x: contain;
+ scrollbar-width: none;
+}
+
+.terminal-mobile-key-scroll::-webkit-scrollbar {
+ display: none;
+}
+
+.terminal-mobile-key {
+ flex: 0 0 auto;
+ min-width: 44px;
+ height: 40px;
+ padding: 0 0.625rem;
+ border: 1px solid #4a4a4a;
+ border-radius: 0.375rem;
+ background: #292929;
+ color: #f4f4f4;
+ font: 600 0.8125rem/1 monospace;
+ touch-action: manipulation;
+ -webkit-user-select: none;
+ user-select: none;
+}
+
+.terminal-mobile-key:active,
+.terminal-mobile-key.active {
+ background: var(--primary);
+ border-color: var(--primary);
+ color: white;
+}
+
+.terminal-mobile-key-arrow {
+ font-size: 1.125rem;
+}
+
+.terminal-mobile-keyboard {
+ flex: 0 0 44px;
+ border-color: #626262;
+ font-size: 1.125rem;
+}
+
+.terminal-scroll-help-mobile {
+ display: none;
+}
+
+@media (max-width: 767.98px), (hover: none) and (pointer: coarse) {
+ .terminal-scroll-help-desktop {
+ display: none;
+ }
+
+ .terminal-scroll-help-mobile {
+ display: inline;
+ }
+
+ .terminal-container.terminal-tmux-copy-mode > .terminal {
+ touch-action: none;
+ overscroll-behavior: none;
+ }
+
+ .terminal-container > .terminal-mobile-keys {
+ display: flex;
+ }
+}
++
+ @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 --cc server-core/src/main/java/io/onedev/server/web/component/terminal/terminal.js
index f8ad629d3c,6862a9a011..a74100d7af
--- 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
@@@ -1,17 -1,10 +1,17 @@@
onedev.server.terminal = {
- onDomReady: function(containerId) {
- var $terminal = $("#" + containerId).children(".terminal");
- var xterm = new Terminal({
+ onDomReady: function(containerId, disableScrollback, tmuxTerminal) {
+ var $container = $("#" + containerId);
+ var $terminal = $container.children(".terminal");
+ var $mobileKeys = $container.children(".terminal-mobile-keys");
+ if (tmuxTerminal)
+ $container.addClass("terminal-container");
+ var options = {
fontSize: 14,
- fontFamily: "Consolas, 'Liberation Mono', 'Menlo, Courier', monospace"
+ fontFamily: "LocalNerdFont, Consolas, 'Liberation Mono', Menlo, Courier, monospace"
- });
+ };
+ if (disableScrollback)
+ options.scrollback = 0;
+ var xterm = new Terminal(options);
var fitAddon = new window.FitAddon.FitAddon();
xterm.loadAddon(fitAddon);