From f8a226c8d5d606dfabc3111e2777db939a930cac Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Mon, 15 Jul 2019 14:57:55 +0200 Subject: [PATCH] Move media to browser --- .../media/clear-dark.svg | 0 .../media/clear-hc.svg | 0 .../media/clear-inverse.svg | 0 .../media/clear-light.svg | 0 .../media/configure-dark.svg | 0 .../media/configure-hc.svg | 0 .../media/configure-light.svg | 0 .../media/defaultIcon.png | Bin .../media/extensionActions.css | 0 .../media/extensionEditor.css | 0 .../media/extensions-activity-bar.svg | 0 .../media/extensions.css | 0 .../media/extensionsViewlet.css | 0 .../media/extensionsWidgets.css | 0 .../media/language-icon.svg | 0 .../media/loading.svg | 0 .../media/markdown.css | 0 .../media/profile-start-dark.svg | 0 .../media/profile-start-light.svg | 0 .../media/profile-stop-dark.svg | 0 .../media/profile-stop-light.svg | 0 .../media/save-dark.svg | 0 .../media/save-light.svg | 0 .../media/star-empty.svg | 0 .../media/star-full.svg | 0 .../media/star-half.svg | 0 .../media/star-small.svg | 0 .../media/start-dark.svg | 0 .../media/start-light.svg | 0 .../media/theme-icon.png | Bin .../electron-browser/extensionEditor.ts | 6 +++--- .../extensions.contribution.ts | 18 +++++++++--------- .../electron-browser/extensionsActions.ts | 2 +- .../electron-browser/extensionsViewlet.ts | 2 +- .../electron-browser/extensionsWidgets.ts | 2 +- 35 files changed, 15 insertions(+), 15 deletions(-) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/clear-dark.svg (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/clear-hc.svg (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/clear-inverse.svg (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/clear-light.svg (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/configure-dark.svg (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/configure-hc.svg (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/configure-light.svg (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/defaultIcon.png (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/extensionActions.css (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/extensionEditor.css (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/extensions-activity-bar.svg (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/extensions.css (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/extensionsViewlet.css (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/extensionsWidgets.css (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/language-icon.svg (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/loading.svg (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/markdown.css (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/profile-start-dark.svg (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/profile-start-light.svg (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/profile-stop-dark.svg (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/profile-stop-light.svg (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/save-dark.svg (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/save-light.svg (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/star-empty.svg (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/star-full.svg (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/star-half.svg (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/star-small.svg (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/start-dark.svg (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/start-light.svg (100%) rename src/vs/workbench/contrib/extensions/{electron-browser => browser}/media/theme-icon.png (100%) diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/clear-dark.svg b/src/vs/workbench/contrib/extensions/browser/media/clear-dark.svg similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/clear-dark.svg rename to src/vs/workbench/contrib/extensions/browser/media/clear-dark.svg diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/clear-hc.svg b/src/vs/workbench/contrib/extensions/browser/media/clear-hc.svg similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/clear-hc.svg rename to src/vs/workbench/contrib/extensions/browser/media/clear-hc.svg diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/clear-inverse.svg b/src/vs/workbench/contrib/extensions/browser/media/clear-inverse.svg similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/clear-inverse.svg rename to src/vs/workbench/contrib/extensions/browser/media/clear-inverse.svg diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/clear-light.svg b/src/vs/workbench/contrib/extensions/browser/media/clear-light.svg similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/clear-light.svg rename to src/vs/workbench/contrib/extensions/browser/media/clear-light.svg diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/configure-dark.svg b/src/vs/workbench/contrib/extensions/browser/media/configure-dark.svg similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/configure-dark.svg rename to src/vs/workbench/contrib/extensions/browser/media/configure-dark.svg diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/configure-hc.svg b/src/vs/workbench/contrib/extensions/browser/media/configure-hc.svg similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/configure-hc.svg rename to src/vs/workbench/contrib/extensions/browser/media/configure-hc.svg diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/configure-light.svg b/src/vs/workbench/contrib/extensions/browser/media/configure-light.svg similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/configure-light.svg rename to src/vs/workbench/contrib/extensions/browser/media/configure-light.svg diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/defaultIcon.png b/src/vs/workbench/contrib/extensions/browser/media/defaultIcon.png similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/defaultIcon.png rename to src/vs/workbench/contrib/extensions/browser/media/defaultIcon.png diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/extensionActions.css b/src/vs/workbench/contrib/extensions/browser/media/extensionActions.css similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/extensionActions.css rename to src/vs/workbench/contrib/extensions/browser/media/extensionActions.css diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/extensionEditor.css b/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/extensionEditor.css rename to src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/extensions-activity-bar.svg b/src/vs/workbench/contrib/extensions/browser/media/extensions-activity-bar.svg similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/extensions-activity-bar.svg rename to src/vs/workbench/contrib/extensions/browser/media/extensions-activity-bar.svg diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/extensions.css b/src/vs/workbench/contrib/extensions/browser/media/extensions.css similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/extensions.css rename to src/vs/workbench/contrib/extensions/browser/media/extensions.css diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/extensionsViewlet.css b/src/vs/workbench/contrib/extensions/browser/media/extensionsViewlet.css similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/extensionsViewlet.css rename to src/vs/workbench/contrib/extensions/browser/media/extensionsViewlet.css diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/extensionsWidgets.css b/src/vs/workbench/contrib/extensions/browser/media/extensionsWidgets.css similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/extensionsWidgets.css rename to src/vs/workbench/contrib/extensions/browser/media/extensionsWidgets.css diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/language-icon.svg b/src/vs/workbench/contrib/extensions/browser/media/language-icon.svg similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/language-icon.svg rename to src/vs/workbench/contrib/extensions/browser/media/language-icon.svg diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/loading.svg b/src/vs/workbench/contrib/extensions/browser/media/loading.svg similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/loading.svg rename to src/vs/workbench/contrib/extensions/browser/media/loading.svg diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/markdown.css b/src/vs/workbench/contrib/extensions/browser/media/markdown.css similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/markdown.css rename to src/vs/workbench/contrib/extensions/browser/media/markdown.css diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/profile-start-dark.svg b/src/vs/workbench/contrib/extensions/browser/media/profile-start-dark.svg similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/profile-start-dark.svg rename to src/vs/workbench/contrib/extensions/browser/media/profile-start-dark.svg diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/profile-start-light.svg b/src/vs/workbench/contrib/extensions/browser/media/profile-start-light.svg similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/profile-start-light.svg rename to src/vs/workbench/contrib/extensions/browser/media/profile-start-light.svg diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/profile-stop-dark.svg b/src/vs/workbench/contrib/extensions/browser/media/profile-stop-dark.svg similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/profile-stop-dark.svg rename to src/vs/workbench/contrib/extensions/browser/media/profile-stop-dark.svg diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/profile-stop-light.svg b/src/vs/workbench/contrib/extensions/browser/media/profile-stop-light.svg similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/profile-stop-light.svg rename to src/vs/workbench/contrib/extensions/browser/media/profile-stop-light.svg diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/save-dark.svg b/src/vs/workbench/contrib/extensions/browser/media/save-dark.svg similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/save-dark.svg rename to src/vs/workbench/contrib/extensions/browser/media/save-dark.svg diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/save-light.svg b/src/vs/workbench/contrib/extensions/browser/media/save-light.svg similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/save-light.svg rename to src/vs/workbench/contrib/extensions/browser/media/save-light.svg diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/star-empty.svg b/src/vs/workbench/contrib/extensions/browser/media/star-empty.svg similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/star-empty.svg rename to src/vs/workbench/contrib/extensions/browser/media/star-empty.svg diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/star-full.svg b/src/vs/workbench/contrib/extensions/browser/media/star-full.svg similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/star-full.svg rename to src/vs/workbench/contrib/extensions/browser/media/star-full.svg diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/star-half.svg b/src/vs/workbench/contrib/extensions/browser/media/star-half.svg similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/star-half.svg rename to src/vs/workbench/contrib/extensions/browser/media/star-half.svg diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/star-small.svg b/src/vs/workbench/contrib/extensions/browser/media/star-small.svg similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/star-small.svg rename to src/vs/workbench/contrib/extensions/browser/media/star-small.svg diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/start-dark.svg b/src/vs/workbench/contrib/extensions/browser/media/start-dark.svg similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/start-dark.svg rename to src/vs/workbench/contrib/extensions/browser/media/start-dark.svg diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/start-light.svg b/src/vs/workbench/contrib/extensions/browser/media/start-light.svg similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/start-light.svg rename to src/vs/workbench/contrib/extensions/browser/media/start-light.svg diff --git a/src/vs/workbench/contrib/extensions/electron-browser/media/theme-icon.png b/src/vs/workbench/contrib/extensions/browser/media/theme-icon.png similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-browser/media/theme-icon.png rename to src/vs/workbench/contrib/extensions/browser/media/theme-icon.png diff --git a/src/vs/workbench/contrib/extensions/electron-browser/extensionEditor.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensionEditor.ts index 65763678de1..920522bce49 100644 --- a/src/vs/workbench/contrib/extensions/electron-browser/extensionEditor.ts +++ b/src/vs/workbench/contrib/extensions/electron-browser/extensionEditor.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./media/extensionEditor'; +import 'vs/css!../browser/media/extensionEditor'; import { localize } from 'vs/nls'; import * as marked from 'vs/base/common/marked/marked'; import { createCancelablePromise } from 'vs/base/common/async'; @@ -54,7 +54,7 @@ import { URI } from 'vs/base/common/uri'; import { IWebviewService, Webview } from 'vs/workbench/contrib/webview/common/webview'; function renderBody(body: string): string { - const styleSheetPath = require.toUrl('./media/markdown.css').replace('file://', 'vscode-resource://'); + const styleSheetPath = require.toUrl('../browser/media/markdown.css').replace('file://', 'vscode-resource://'); return ` @@ -544,7 +544,7 @@ export class ExtensionEditor extends BaseEditor { { svgWhiteList: this.extensionsWorkbenchService.allowedBadgeProviders, localResourceRoots: [ - URI.parse(require.toUrl('./media')) + URI.parse(require.toUrl('../browser/media')) ] }); webviewElement.mountTo(this.content); diff --git a/src/vs/workbench/contrib/extensions/electron-browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensions.contribution.ts index 77643b4b45f..1ff404a2955 100644 --- a/src/vs/workbench/contrib/extensions/electron-browser/extensions.contribution.ts +++ b/src/vs/workbench/contrib/extensions/electron-browser/extensions.contribution.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./media/extensions'; +import 'vs/css!../browser/media/extensions'; import { localize } from 'vs/nls'; import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes'; import { Registry } from 'vs/platform/registry/common/platform'; @@ -337,8 +337,8 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, { id: DebugExtensionHostAction.ID, title: DebugExtensionHostAction.LABEL, iconLocation: { - dark: URI.parse(require.toUrl(`vs/workbench/contrib/extensions/electron-browser/media/start-dark.svg`)), - light: URI.parse(require.toUrl(`vs/workbench/contrib/extensions/electron-browser/media/start-light.svg`)), + dark: URI.parse(require.toUrl(`vs/workbench/contrib/extensions/browser/media/start-dark.svg`)), + light: URI.parse(require.toUrl(`vs/workbench/contrib/extensions/browser/media/start-light.svg`)), } }, group: 'navigation', @@ -350,8 +350,8 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, { id: StartExtensionHostProfileAction.ID, title: StartExtensionHostProfileAction.LABEL, iconLocation: { - dark: URI.parse(require.toUrl(`vs/workbench/contrib/extensions/electron-browser/media/profile-start-dark.svg`)), - light: URI.parse(require.toUrl(`vs/workbench/contrib/extensions/electron-browser/media/profile-start-light.svg`)), + dark: URI.parse(require.toUrl(`vs/workbench/contrib/extensions/browser/media/profile-start-dark.svg`)), + light: URI.parse(require.toUrl(`vs/workbench/contrib/extensions/browser/media/profile-start-light.svg`)), } }, group: 'navigation', @@ -363,8 +363,8 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, { id: StopExtensionHostProfileAction.ID, title: StopExtensionHostProfileAction.LABEL, iconLocation: { - dark: URI.parse(require.toUrl(`vs/workbench/contrib/extensions/electron-browser/media/profile-stop-dark.svg`)), - light: URI.parse(require.toUrl(`vs/workbench/contrib/extensions/electron-browser/media/profile-stop-light.svg`)), + dark: URI.parse(require.toUrl(`vs/workbench/contrib/extensions/browser/media/profile-stop-dark.svg`)), + light: URI.parse(require.toUrl(`vs/workbench/contrib/extensions/browser/media/profile-stop-light.svg`)), } }, group: 'navigation', @@ -376,8 +376,8 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, { id: SaveExtensionHostProfileAction.ID, title: SaveExtensionHostProfileAction.LABEL, iconLocation: { - dark: URI.parse(require.toUrl(`vs/workbench/contrib/extensions/electron-browser/media/save-dark.svg`)), - light: URI.parse(require.toUrl(`vs/workbench/contrib/extensions/electron-browser/media/save-light.svg`)), + dark: URI.parse(require.toUrl(`vs/workbench/contrib/extensions/browser/media/save-dark.svg`)), + light: URI.parse(require.toUrl(`vs/workbench/contrib/extensions/browser/media/save-light.svg`)), }, precondition: CONTEXT_EXTENSION_HOST_PROFILE_RECORDED }, diff --git a/src/vs/workbench/contrib/extensions/electron-browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensionsActions.ts index dce34147deb..d6005bb4a22 100644 --- a/src/vs/workbench/contrib/extensions/electron-browser/extensionsActions.ts +++ b/src/vs/workbench/contrib/extensions/electron-browser/extensionsActions.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./media/extensionActions'; +import 'vs/css!../browser/media/extensionActions'; import { localize } from 'vs/nls'; import { IAction, Action } from 'vs/base/common/actions'; import { Delayer } from 'vs/base/common/async'; diff --git a/src/vs/workbench/contrib/extensions/electron-browser/extensionsViewlet.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensionsViewlet.ts index 08345f64cf9..0609f67fbe0 100644 --- a/src/vs/workbench/contrib/extensions/electron-browser/extensionsViewlet.ts +++ b/src/vs/workbench/contrib/extensions/electron-browser/extensionsViewlet.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./media/extensionsViewlet'; +import 'vs/css!../browser/media/extensionsViewlet'; import { localize } from 'vs/nls'; import { timeout, Delayer } from 'vs/base/common/async'; import { isPromiseCanceledError } from 'vs/base/common/errors'; diff --git a/src/vs/workbench/contrib/extensions/electron-browser/extensionsWidgets.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensionsWidgets.ts index 71dff9e58e8..ce9e72d0a5f 100644 --- a/src/vs/workbench/contrib/extensions/electron-browser/extensionsWidgets.ts +++ b/src/vs/workbench/contrib/extensions/electron-browser/extensionsWidgets.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./media/extensionsWidgets'; +import 'vs/css!../browser/media/extensionsWidgets'; import { Disposable, toDisposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle'; import { IExtension, IExtensionsWorkbenchService, IExtensionContainer, ExtensionState } from '../common/extensions'; import { append, $, addClass } from 'vs/base/browser/dom';