mirror of
https://github.com/coder/code-server.git
synced 2024-11-23 20:52:38 +03:00
Merge pull request #2357 from cdr/branding-0570
vscode: Customize welcome page for code-server
This commit is contained in:
Anmol Sethi
GitHub
commit
bb26d2edd3
@ -264,9 +264,18 @@ index 28f8a69a2a91f9cb9f4dbd73ed3e689b2b3afe84..b5f5b10004d3e36092a30f685938a606
|
||||
}
|
||||
}
|
||||
diff --git a/product.json b/product.json
|
||||
index 7cab6d1b9f3b84bfc703856e93773a293fd198cf..31d3d5a943192eee791e1121415b436dc1ed3822 100644
|
||||
index 7cab6d1b9f3b84bfc703856e93773a293fd198cf..6924d94f65b390f52885b1036f7e96bce0e34680 100644
|
||||
--- a/product.json
|
||||
+++ b/product.json
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
- "nameShort": "Code - OSS",
|
||||
- "nameLong": "Code - OSS",
|
||||
+ "nameShort": "code-server",
|
||||
+ "nameLong": "code-server",
|
||||
"applicationName": "code-oss",
|
||||
"dataFolderName": ".vscode-oss",
|
||||
"win32MutexName": "vscodeoss",
|
||||
@@ -20,7 +20,7 @@
|
||||
"darwinBundleIdentifier": "com.visualstudio.code.oss",
|
||||
"linuxIconName": "com.visualstudio.code.oss",
|
||||
@ -276,6 +285,22 @@ index 7cab6d1b9f3b84bfc703856e93773a293fd198cf..31d3d5a943192eee791e1121415b436d
|
||||
"urlProtocol": "code-oss",
|
||||
"extensionAllowedProposedApi": [
|
||||
"ms-vscode.vscode-js-profile-flame",
|
||||
@@ -136,5 +136,14 @@
|
||||
"publisherDisplayName": "Microsoft"
|
||||
}
|
||||
}
|
||||
- ]
|
||||
+ ],
|
||||
+
|
||||
+ "//": "https://github.com/VSCodium/vscodium/pull/155/files",
|
||||
+ "documentationUrl": "https://go.microsoft.com/fwlink/?LinkID=533484#vscode",
|
||||
+ "keyboardShortcutsUrlMac": "https://go.microsoft.com/fwlink/?linkid=832143",
|
||||
+ "keyboardShortcutsUrlLinux": "https://go.microsoft.com/fwlink/?linkid=832144",
|
||||
+ "keyboardShortcutsUrlWin": "https://go.microsoft.com/fwlink/?linkid=832145",
|
||||
+ "introductoryVideosUrl": "https://go.microsoft.com/fwlink/?linkid=832146",
|
||||
+ "tipsAndTricksUrl": "https://go.microsoft.com/fwlink/?linkid=852118",
|
||||
+ "newsletterSignupUrl": "https://www.research.net/r/vsc-newsletter"
|
||||
}
|
||||
diff --git a/remote/.yarnrc b/remote/.yarnrc
|
||||
deleted file mode 100644
|
||||
index c1a32ce532afa501fb19bdbcf6bcb0ec151ecd99..0000000000000000000000000000000000000000
|
||||
@ -3687,6 +3712,20 @@ index 021af6e0f8983c492f9cdd048ba2dcae7640bc1d..814dd0ff2fa7737e07833d8092c8f489
|
||||
|
||||
module = module.with({ path: ensureSuffix(module.path, '.js') });
|
||||
const response = await fetch(module.toString(true));
|
||||
diff --git a/src/vs/workbench/browser/actions/navigationActions.ts b/src/vs/workbench/browser/actions/navigationActions.ts
|
||||
index 7344a3a29b32f7b370b99bf0cfdc79a322195ff8..dc21396e83e2f53914447d3460c2ee1103ecb28e 100644
|
||||
--- a/src/vs/workbench/browser/actions/navigationActions.ts
|
||||
+++ b/src/vs/workbench/browser/actions/navigationActions.ts
|
||||
@@ -310,4 +310,8 @@ actionsRegistry.registerWorkbenchAction(SyncActionDescriptor.from(FocusNextPart,
|
||||
actionsRegistry.registerWorkbenchAction(SyncActionDescriptor.from(FocusPreviousPart, { primary: KeyMod.Shift | KeyCode.F6 }), 'View: Focus Previous Part', CATEGORIES.View.value);
|
||||
|
||||
const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
|
||||
-workbenchRegistry.registerWorkbenchContribution(GoHomeContributor, LifecyclePhase.Ready);
|
||||
+// See https://github.com/cdr/code-server/issues/2328
|
||||
+// workbenchRegistry.registerWorkbenchContribution(GoHomeContributor, LifecyclePhase.Ready);
|
||||
+export const _1 = workbenchRegistry;
|
||||
+export const _2 = GoHomeContributor;
|
||||
+export const _3 = LifecyclePhase.Ready;
|
||||
diff --git a/src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css b/src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css
|
||||
index ced2d815834e40a1543e80516472799075980733..dfcae73e8a042307600c67f163aa00ba9e0762f4 100644
|
||||
--- a/src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css
|
||||
@ -3764,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 () => `
|
||||
<div class="welcomePage" role="document">
|
||||
<div class="title">
|
||||
<h1 class="caption">${escape(localize('welcomePage.vscode', "Visual Studio Code"))}</h1>
|
||||
- <p class="subtitle detail">${escape(localize({ key: 'welcomePage.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved"))}</p>
|
||||
+ <p class="subtitle detail">VS Code v${product.version}</p>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="splash">
|
||||
@@ -32,6 +33,19 @@ export default () => `
|
||||
</ul>
|
||||
<p class="none detail">${escape(localize('welcomePage.noRecentFolders', "No recent folders"))}</p>
|
||||
</div>
|
||||
+ <div class="section help">
|
||||
+ <h2 class="caption">code-server ${escape(localize('welcomePage.help', "Help"))}</h2>
|
||||
+ <ul>
|
||||
+ <li><a href="https://github.com/cdr/code-server">GitHub Repository</a></li>
|
||||
+ <li><a href="https://github.com/cdr/code-server/releases/tag/v${product.codeServerVersion}">Release Notes</a></li>
|
||||
+ <li><a href="https://github.com/cdr/code-server/issues">Issue Tracker</a></li>
|
||||
+ <li><a href="https://github.com/cdr/code-server/blob/master/doc/FAQ.md">FAQ</a></li>
|
||||
+ <li><a href="https://github.com/cdr/code-server/blob/master/doc/guide.md">Setup Guide</a></li>
|
||||
+ <li><a href="https://github.com/cdr/code-server/tree/master/doc">Docs</a></li>
|
||||
+ <li><a href="https://github.com/cdr/code-server/discussions">Discussions</a></li>
|
||||
+ <li><a href="https://cdr.co/join-community">Slack</a></li>
|
||||
+ </ul>
|
||||
+ </div>
|
||||
<div class="section help">
|
||||
<h2 class="caption">${escape(localize('welcomePage.help', "Help"))}</h2>
|
||||
<ul>
|
||||
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user