Skip to content
Permalink
Browse files

debt - avoid approot for resources in renderer (microsoft#70237)

  • Loading branch information...
bpasero committed Mar 11, 2019
1 parent d551d61 commit ea6ecccb68d21e5f0dc671ec8eaebd478e7fc58b
@@ -310,8 +310,6 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op

const license = gulp.src(['LICENSES.chromium.html', 'LICENSE.txt', 'ThirdPartyNotices.txt', 'licenses/**'], { base: '.', allowEmpty: true });

const watermark = gulp.src(['resources/letterpress.svg', 'resources/letterpress-dark.svg', 'resources/letterpress-hc.svg'], { base: '.' });

// TODO the API should be copied to `out` during compile, not here
const api = gulp.src('src/vs/vscode.d.ts').pipe(rename('out/vs/vscode.d.ts'));

@@ -347,7 +345,6 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
packageJsonStream,
productJsonStream,
license,
watermark,
api,
sources,
deps
@@ -33,7 +33,6 @@ import { EventType as TouchEventType, GestureEvent } from 'vs/base/browser/touch
import { TitleControl } from 'vs/workbench/browser/parts/editor/titleControl';
import { IEditorGroupsAccessor, IEditorGroupView, IEditorPartOptionsChangeEvent, getActiveTextEditorOptions, IEditorOpeningEvent } from 'vs/workbench/browser/parts/editor/editor';
import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
import { join } from 'vs/base/common/path';
import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { ActionRunner, IAction, Action } from 'vs/base/common/actions';
@@ -44,7 +43,6 @@ import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
import { fillInContextMenuActions } from 'vs/platform/actions/browser/menuItemActionItem';
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
import { isErrorWithActions, IErrorWithActions } from 'vs/base/common/errorsWithActions';
import { URI } from 'vs/base/common/uri';
import { IActiveEditor } from 'vs/workbench/services/editor/common/editorService';

export class EditorGroupView extends Themable implements IEditorGroupView {
@@ -1466,10 +1464,10 @@ export interface EditorReplacement {
registerThemingParticipant((theme, collector, environment) => {

// Letterpress
const letterpress = `resources/letterpress${theme.type === 'dark' ? '-dark' : theme.type === 'hc' ? '-hc' : ''}.svg`;
const letterpress = `./media/letterpress${theme.type === 'dark' ? '-dark' : theme.type === 'hc' ? '-hc' : ''}.svg`;
collector.addRule(`
.monaco-workbench .part.editor > .content .editor-group-container.empty .editor-group-letterpress {
background-image: url('${URI.file(join(environment.appRoot, letterpress)).toString()}')
background-image: url('${require.toUrl(letterpress)}')
}
`);

File renamed without changes.

0 comments on commit ea6eccc

Please sign in to comment.
You can’t perform that action at this time.