From 303fe2bc4eeeeb62248fdfa909cc68ecc3724bf9 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Mon, 23 Nov 2020 19:07:35 -0500 Subject: [PATCH] vscode: Customize welcome page for code-server - Title/subtitle are now code-server and VS Code version - Added a list of code-server help links --- ci/dev/vscode.patch | 67 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/ci/dev/vscode.patch b/ci/dev/vscode.patch index abf86b4b..d5ce3da4 100644 --- a/ci/dev/vscode.patch +++ b/ci/dev/vscode.patch @@ -3803,6 +3803,73 @@ index 74f6922e98b4bb6a7fb100f5aac015afe9fc171b..3243a97c2d378013d96ffbe87e9df6dd .scm-view .monaco-list .monaco-list-row .resource-group > .actions, .scm-view .monaco-list .monaco-list-row .resource > .name > .monaco-icon-label > .actions { +diff --git a/src/vs/workbench/contrib/welcome/page/browser/vs_code_welcome_page.ts b/src/vs/workbench/contrib/welcome/page/browser/vs_code_welcome_page.ts +index 6af6a4b7f42654ec6cc60e0ba5efd376919f3e04..3a8176951628e0b2528aae8796ba684c3ab53d9a 100644 +--- a/src/vs/workbench/contrib/welcome/page/browser/vs_code_welcome_page.ts ++++ b/src/vs/workbench/contrib/welcome/page/browser/vs_code_welcome_page.ts +@@ -4,6 +4,7 @@ + *--------------------------------------------------------------------------------------------*/ + + import { escape } from 'vs/base/common/strings'; ++import product from 'vs/platform/product/common/product'; + import { localize } from 'vs/nls'; + + export default () => ` +@@ -11,7 +12,7 @@ export default () => ` +
+
+

${escape(localize('welcomePage.vscode', "Visual Studio Code"))}

+-

${escape(localize({ key: 'welcomePage.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved"))}

++

VS Code v${product.version}

+
+
+
+@@ -32,6 +33,19 @@ export default () => ` + +

${escape(localize('welcomePage.noRecentFolders', "No recent folders"))}

+
++
++

code-server ${escape(localize('welcomePage.help', "Help"))}

++ ++
+
+

${escape(localize('welcomePage.help', "Help"))}

+
    +diff --git a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.css b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.css +index 738ce140c1af76ee0017c59cc883578e966f5348..80833b7023ed5795bb3de303b54ec08d9dab9b94 100644 +--- a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.css ++++ b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.css +@@ -94,7 +94,7 @@ + } + + .monaco-workbench .part.editor > .content .welcomePage .splash .section { +- margin-bottom: 5em; ++ margin-bottom: 3em; + } + + .monaco-workbench .part.editor > .content .welcomePage .splash ul { +diff --git a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts +index 4a61a79fe447e2aa238af568791bff1e0cec4d29..791b63342f476f1baba9d31b040d3ef589e3f70a 100644 +--- a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts ++++ b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts +@@ -328,7 +328,7 @@ class WelcomePage extends Disposable { + + const prodName = container.querySelector('.welcomePage .title .caption') as HTMLElement; + if (prodName) { +- prodName.textContent = this.productService.nameLong; ++ prodName.textContent = `code-server v${this.productService.codeServerVersion}` + } + + recentlyOpened.then(({ workspaces }) => { diff --git a/src/vs/workbench/electron-sandbox/sandbox.simpleservices.ts b/src/vs/workbench/electron-sandbox/sandbox.simpleservices.ts index ed4f26407391bd62219a9f8245a5cd63a7cb7488..92f26d1b082f80475cf76409a4569e948e9e0bd9 100644 --- a/src/vs/workbench/electron-sandbox/sandbox.simpleservices.ts