From ffa978eea12580fbbe54522b25cabdc9b4ca9c94 Mon Sep 17 00:00:00 2001 From: Muhammed Hussein karimi Date: Sun, 12 Nov 2023 11:22:31 +0330 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20Using=20monospace=20fonts?= =?UTF-8?q?=20in=20editors=20(#4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ✨ feat: Using monospace fonts in editors Signed-off-by: Muhammed Hussein Karimi * Update README --------- Signed-off-by: Muhammed Hussein Karimi Co-authored-by: Louis Lam --- backend/util-common.ts | 4 ++-- frontend/src/components/Terminal.vue | 4 ++-- frontend/src/main.ts | 1 + frontend/src/pages/Compose.vue | 2 ++ frontend/src/pages/DashboardHome.vue | 2 ++ package.json | 1 + pnpm-lock.yaml | 7 +++++++ 7 files changed, 17 insertions(+), 4 deletions(-) diff --git a/backend/util-common.ts b/backend/util-common.ts index 576d8d8..ad963d7 100644 --- a/backend/util-common.ts +++ b/backend/util-common.ts @@ -86,8 +86,8 @@ export const TERMINAL_COLS = 105; export const TERMINAL_ROWS = 10; export const PROGRESS_TERMINAL_ROWS = 8; -export const COMBINED_TERMINAL_COLS = 56; -export const COMBINED_TERMINAL_ROWS = 15; +export const COMBINED_TERMINAL_COLS = 58; +export const COMBINED_TERMINAL_ROWS = 20; export const ERROR_TYPE_VALIDATION = 1; diff --git a/frontend/src/components/Terminal.vue b/frontend/src/components/Terminal.vue index fe767a0..41551ba 100644 --- a/frontend/src/components/Terminal.vue +++ b/frontend/src/components/Terminal.vue @@ -77,8 +77,8 @@ export default { } this.terminal = new Terminal({ - fontSize: 16, - fontFamily: "monospace", + fontSize: 14, + fontFamily: "'JetBrains Mono', monospace", cursorBlink, cols: this.cols, rows: this.rows, diff --git a/frontend/src/main.ts b/frontend/src/main.ts index 662517c..a892a73 100644 --- a/frontend/src/main.ts +++ b/frontend/src/main.ts @@ -13,6 +13,7 @@ import Toast, { POSITION, useToast } from "vue-toastification"; import "xterm/lib/xterm.js"; // CSS +import "@fontsource/jetbrains-mono"; import "vue-toastification/dist/index.css"; import "xterm/css/xterm.css"; import "./styles/main.scss"; diff --git a/frontend/src/pages/Compose.vue b/frontend/src/pages/Compose.vue index 1a12e78..d47c6b7 100644 --- a/frontend/src/pages/Compose.vue +++ b/frontend/src/pages/Compose.vue @@ -592,6 +592,8 @@ export default { } .editor-box { + font-family: 'JetBrains Mono', monospace; + font-size: 14px; &.edit-mode { background-color: #2c2f38 !important; } diff --git a/frontend/src/pages/DashboardHome.vue b/frontend/src/pages/DashboardHome.vue index d32ce45..05071a7 100644 --- a/frontend/src/pages/DashboardHome.vue +++ b/frontend/src/pages/DashboardHome.vue @@ -227,5 +227,7 @@ table { .docker-run { background-color: $dark-bg !important; border: none; + font-family: 'JetBrains Mono', monospace; + font-size: 15px; } diff --git a/package.json b/package.json index e5738fe..4dce7ca 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "mark-as-nightly": "tsx ./extra/mark-as-nightly.ts" }, "dependencies": { + "@fontsource/jetbrains-mono": "^5.0.17", "@homebridge/node-pty-prebuilt-multiarch": "~0.11.10", "@louislam/sqlite3": "~15.1.6", "bcryptjs": "~2.4.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f7e7d75..32e1345 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,6 +5,9 @@ settings: excludeLinksFromLockfile: false dependencies: + '@fontsource/jetbrains-mono': + specifier: ^5.0.17 + version: 5.0.17 '@homebridge/node-pty-prebuilt-multiarch': specifier: ~0.11.10 version: 0.11.10 @@ -466,6 +469,10 @@ packages: - vue dev: true + /@fontsource/jetbrains-mono@5.0.17: + resolution: {integrity: sha512-Y/EtdbwKwNQTGpnMrexX8SVW6Jqlh0nX2bNHI9Z9m6FsyjbocZIFNJqwSY9bDUoi7irGtz8nuidAN7FF8wYuJA==} + dev: false + /@fortawesome/fontawesome-common-types@6.4.2: resolution: {integrity: sha512-1DgP7f+XQIJbLFCTX1V2QnxVmpLdKdzzo2k8EmvDOePfchaIGQ9eCHj2up3/jNEbZuBqel5OxiaOJf37TWauRA==} engines: {node: '>=6'}