Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Patch welcome page #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nol166 wants to merge 1 commit into master from patch-welcome-page
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions scripts/vscode.patch
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,6 +864,31 @@ index d8de423529..5953e920c3 100644
+ Object.defineProperty(this._options, 'useSameOriginForRoot', {
+ value: true,
+ });
diff --git a/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.ts b/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.ts
index d4cd525812..6904db5518 100644
--- a/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.ts
+++ b/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.ts
@@ -30,8 +29,0 @@ export default () => `
- <div class="section recent">
Copy link
Member

@code-asher code-asher Mar 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer commenting this out <!-- --> so the patch can be as minimal and additive as possible, should help with potential merge conflicts when we update VS Code.

Copy link
Member

@code-asher code-asher Mar 7, 2019
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, it might be a good idea for us to actually implement the "open recent" commands at some point.

- <h2 class="caption">${escape(localize('welcomePage.recent', "Recent"))}</h2>
- <ul class="list">
- <!-- Filled programmatically -->
- <li class="moreRecent"><a href="command:workbench.action.openRecent">${escape(localize('welcomePage.moreRecent', "More..."))}</a><span class="path detail if_shortcut" data-command="workbench.action.openRecent">(<span class="shortcut" data-command="workbench.action.openRecent"></span>)</span></li>
- </ul>
- <p class="none detail">${escape(localize('welcomePage.noRecentFolders', "No recent folders"))}</p>
- </div>
@@ -41,6 +33,5 @@ export default () => `
- <li class="keybindingsReferenceLink"><a href="command:workbench.action.keybindingsReference">${escape(localize('welcomePage.keybindingsCheatsheet', "Printable keyboard cheatsheet"))}</a></li>
Copy link
Member

@code-asher code-asher Mar 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just leaving this here as a note not to merge yet; we're gonna provide the URLs (via product.ts) instead of replacing the hrefs.

kylecarbs reacted with thumbs up emoji
- <li><a href="command:workbench.action.openIntroductoryVideosUrl">${escape(localize('welcomePage.introductoryVideos', "Introductory videos"))}</a></li>
- <li><a href="command:workbench.action.openTipsAndTricksUrl">${escape(localize('welcomePage.tipsAndTricks', "Tips and Tricks"))}</a></li>
- <li><a href="command:workbench.action.openDocumentationUrl">${escape(localize('welcomePage.productDocumentation', "Product documentation"))}</a></li>
- <li><a href="https://github.com/Microsoft/vscode">${escape(localize('welcomePage.gitHubRepository', "GitHub repository"))}</a></li>
- <li><a href="http://stackoverflow.com/questions/tagged/vscode?sort=votes&pageSize=50">${escape(localize('welcomePage.stackOverflow', "Stack Overflow"))}</a></li>
+ <li><a href="https://code.visualstudio.com/docs/getstarted/keybindings#_keyboard-shortcuts-reference">${escape(localize('welcomePage.keybindingsCheatsheet', "Keyboard cheatsheets"))}</a></li>
+ <li><a href="https://code.visualstudio.com/docs/getstarted/introvideos#VSCode">${escape(localize('welcomePage.introductoryVideos', "Introductory videos"))}</a></li>
+ <li><a href="https://code.visualstudio.com/docs/getstarted/tips-and-tricks#vscode">${escape(localize('welcomePage.tipsAndTricks', "Tips and Tricks"))}</a></li>
+ <li><a href="https://code.visualstudio.com/docs#vscode">${escape(localize('welcomePage.productDocumentation', "Product documentation"))}</a></li>
+ <li><a href="https://github.com/codercom/code-server">${escape(localize('welcomePage.gitHubRepository', "code-server GitHub repository"))}</a></li>
diff --git a/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts b/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts
index 147f05b246..fa89583203 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts
Expand Down

AltStyle によって変換されたページ (->オリジナル) /