From 27f71f85f3a738925cf88066ba859f2752a9dd6e Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Thu, 26 Jan 2017 20:52:54 -0800 Subject: [PATCH] Use VSCode icons (fixes #18860) --- package.json | 2 +- .../walkThrough/electron-browser/editor/editorWalkThrough.ts | 2 +- .../{editorWalkThrough.md => vs_code_editor_walkthrough.md} | 0 .../parts/walkThrough/electron-browser/walkThroughPart.css | 5 +++++ .../{welcomePage.html => vs_code_welcome_page.html} | 0 .../parts/welcomePage/electron-browser/welcomePage.css | 5 +++++ .../parts/welcomePage/electron-browser/welcomePage.ts | 2 +- 7 files changed, 13 insertions(+), 3 deletions(-) rename src/vs/workbench/parts/walkThrough/electron-browser/editor/{editorWalkThrough.md => vs_code_editor_walkthrough.md} (100%) rename src/vs/workbench/parts/welcomePage/electron-browser/{welcomePage.html => vs_code_welcome_page.html} (100%) diff --git a/package.json b/package.json index 377b8a34b65..b5303d72bbb 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "code-oss-dev", "version": "1.9.0", "electronVersion": "1.4.6", - "distro": "5bcedc41285b89095665e324e070597f3f016f66", + "distro": "0935b6e8282ef1f7f7c5675383b2b5e36ea2d853", "author": { "name": "Microsoft Corporation" }, diff --git a/src/vs/workbench/parts/walkThrough/electron-browser/editor/editorWalkThrough.ts b/src/vs/workbench/parts/walkThrough/electron-browser/editor/editorWalkThrough.ts index bc439076c50..76b0e4000e2 100644 --- a/src/vs/workbench/parts/walkThrough/electron-browser/editor/editorWalkThrough.ts +++ b/src/vs/workbench/parts/walkThrough/electron-browser/editor/editorWalkThrough.ts @@ -29,7 +29,7 @@ export class EditorWalkThroughAction extends Action { } public run(): TPromise { - const uri = URI.parse(require.toUrl('./editorWalkThrough.md')) + const uri = URI.parse(require.toUrl('./vs_code_editor_walkthrough.md')) .with({ scheme: Schemas.walkThrough }); const input = this.instantiationService.createInstance(WalkThroughInput, localize('editorWalkThrough.title', "Interactive Playground"), '', uri, /* telemetryFrom */ null, /* onReady */ null); return this.editorService.openEditor(input, { pinned: true }, Position.ONE) diff --git a/src/vs/workbench/parts/walkThrough/electron-browser/editor/editorWalkThrough.md b/src/vs/workbench/parts/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md similarity index 100% rename from src/vs/workbench/parts/walkThrough/electron-browser/editor/editorWalkThrough.md rename to src/vs/workbench/parts/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md diff --git a/src/vs/workbench/parts/walkThrough/electron-browser/walkThroughPart.css b/src/vs/workbench/parts/walkThrough/electron-browser/walkThroughPart.css index c3c4c436dfe..39c35d50e20 100644 --- a/src/vs/workbench/parts/walkThrough/electron-browser/walkThroughPart.css +++ b/src/vs/workbench/parts/walkThrough/electron-browser/walkThroughPart.css @@ -139,6 +139,11 @@ white-space: pre; } +.show-file-icons .vs_code_editor_walkthrough\.md-name-file-icon.md-ext-file-icon.markdown-lang-file-icon.file-icon::before { + content: ' '; + background-image: url('../../../../../../resources/code-icon.svg'); +} + .monaco-workbench > .part.editor > .content .walkThroughContent .mac-only, .monaco-workbench > .part.editor > .content .walkThroughContent .windows-only, .monaco-workbench > .part.editor > .content .walkThroughContent .linux-only { diff --git a/src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.html b/src/vs/workbench/parts/welcomePage/electron-browser/vs_code_welcome_page.html similarity index 100% rename from src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.html rename to src/vs/workbench/parts/welcomePage/electron-browser/vs_code_welcome_page.html diff --git a/src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.css b/src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.css index f72737160f6..7194e7fd405 100644 --- a/src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.css +++ b/src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.css @@ -250,6 +250,11 @@ display: none; } +.show-file-icons .vs_code_welcome_page\.html-name-file-icon.html-ext-file-icon.html-lang-file-icon.file-icon::before { + content: ' '; + background-image: url('../../../../../../resources/code-icon.svg'); +} + .monaco-workbench > .part.editor > .content .welcomePage .mac-only, .monaco-workbench > .part.editor > .content .welcomePage .windows-only, .monaco-workbench > .part.editor > .content .welcomePage .linux-only { diff --git a/src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.ts b/src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.ts index 973074a749b..a07f18ecbde 100644 --- a/src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.ts +++ b/src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.ts @@ -92,7 +92,7 @@ class WelcomePage { private create() { const recentlyOpened = this.windowService.getRecentlyOpen(); - const uri = URI.parse(require.toUrl('./welcomePage.html')) + const uri = URI.parse(require.toUrl('./vs_code_welcome_page.html')) .with({ scheme: Schemas.walkThrough }); const input = this.instantiationService.createInstance(WalkThroughInput, localize('welcome.title', "Welcome"), '', uri, 'welcomePage', container => this.onReady(container, recentlyOpened)); this.editorService.openEditor(input, { pinned: true }, Position.ONE) -- GitLab