From 03c444e89a221819ec1c71a401a740c1ab2c91f1 Mon Sep 17 00:00:00 2001 From: Miguel Solorio Date: Fri, 20 Sep 2019 15:46:16 -0700 Subject: [PATCH] Adopt icon font in explorer --- .vscode/settings.json | 3 +- .../base/browser/ui/splitview/panelview.css | 3 + .../base/browser/ui/toolbar/ellipsis-dark.svg | 5 - .../base/browser/ui/toolbar/ellipsis-hc.svg | 5 - .../browser/ui/toolbar/ellipsis-light.svg | 5 - src/vs/base/browser/ui/toolbar/toolbar.css | 12 --- src/vs/base/browser/ui/toolbar/toolbar.ts | 2 +- src/vs/base/browser/ui/tree/treeDefaults.ts | 2 +- .../browser/actions/layoutActions.ts | 2 +- .../browser/actions/media/actions.css | 21 ---- .../browser/actions/media/layout-dark.svg | 3 - .../browser/actions/media/layout-hc.svg | 3 - .../browser/actions/media/layout-light.svg | 3 - .../browser/actions/media/remove-dark.svg | 3 - .../browser/actions/media/remove-light.svg | 3 - .../browser/parts/editor/editorActions.ts | 6 +- .../parts/editor/media/titlecontrol.css | 8 +- .../browser/parts/views/customView.ts | 3 +- .../contrib/files/browser/fileActions.ts | 14 +-- .../files/browser/media/action-close-dark.svg | 3 - .../browser/media/action-close-focus.svg | 1 - .../browser/media/action-close-light.svg | 3 - .../files/browser/media/add-file-dark.svg | 3 - .../files/browser/media/add-file-hc.svg | 3 - .../files/browser/media/add-file-light.svg | 3 - .../files/browser/media/add-folder-dark.svg | 3 - .../files/browser/media/add-folder-hc.svg | 3 - .../files/browser/media/add-folder-light.svg | 3 - .../files/browser/media/close-all-dark.svg | 4 - .../files/browser/media/close-all-light.svg | 4 - .../files/browser/media/collapse-all-dark.svg | 4 - .../files/browser/media/collapse-all-hc.svg | 4 - .../browser/media/collapse-all-light.svg | 4 - .../files/browser/media/explorerviewlet.css | 7 +- .../files/browser/media/fileactions.css | 102 +----------------- .../files/browser/media/refresh-dark.svg | 4 - .../files/browser/media/refresh-hc.svg | 4 - .../files/browser/media/refresh-light.svg | 4 - .../files/browser/media/save-all-dark.svg | 3 - .../files/browser/media/save-all-hc.svg | 3 - .../files/browser/media/save-all-light.svg | 3 - .../contrib/markers/browser/markersPanel.ts | 2 +- 42 files changed, 35 insertions(+), 248 deletions(-) delete mode 100644 src/vs/base/browser/ui/toolbar/ellipsis-dark.svg delete mode 100644 src/vs/base/browser/ui/toolbar/ellipsis-hc.svg delete mode 100644 src/vs/base/browser/ui/toolbar/ellipsis-light.svg delete mode 100644 src/vs/workbench/browser/actions/media/layout-dark.svg delete mode 100644 src/vs/workbench/browser/actions/media/layout-hc.svg delete mode 100644 src/vs/workbench/browser/actions/media/layout-light.svg delete mode 100644 src/vs/workbench/browser/actions/media/remove-dark.svg delete mode 100644 src/vs/workbench/browser/actions/media/remove-light.svg delete mode 100644 src/vs/workbench/contrib/files/browser/media/action-close-dark.svg delete mode 100644 src/vs/workbench/contrib/files/browser/media/action-close-focus.svg delete mode 100644 src/vs/workbench/contrib/files/browser/media/action-close-light.svg delete mode 100644 src/vs/workbench/contrib/files/browser/media/add-file-dark.svg delete mode 100644 src/vs/workbench/contrib/files/browser/media/add-file-hc.svg delete mode 100644 src/vs/workbench/contrib/files/browser/media/add-file-light.svg delete mode 100644 src/vs/workbench/contrib/files/browser/media/add-folder-dark.svg delete mode 100644 src/vs/workbench/contrib/files/browser/media/add-folder-hc.svg delete mode 100644 src/vs/workbench/contrib/files/browser/media/add-folder-light.svg delete mode 100644 src/vs/workbench/contrib/files/browser/media/close-all-dark.svg delete mode 100644 src/vs/workbench/contrib/files/browser/media/close-all-light.svg delete mode 100644 src/vs/workbench/contrib/files/browser/media/collapse-all-dark.svg delete mode 100644 src/vs/workbench/contrib/files/browser/media/collapse-all-hc.svg delete mode 100644 src/vs/workbench/contrib/files/browser/media/collapse-all-light.svg delete mode 100644 src/vs/workbench/contrib/files/browser/media/refresh-dark.svg delete mode 100644 src/vs/workbench/contrib/files/browser/media/refresh-hc.svg delete mode 100644 src/vs/workbench/contrib/files/browser/media/refresh-light.svg delete mode 100644 src/vs/workbench/contrib/files/browser/media/save-all-dark.svg delete mode 100644 src/vs/workbench/contrib/files/browser/media/save-all-hc.svg delete mode 100644 src/vs/workbench/contrib/files/browser/media/save-all-light.svg diff --git a/.vscode/settings.json b/.vscode/settings.json index 1a760bdda6b..a707cfe369c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -60,5 +60,6 @@ "remote.extensionKind": { "msjsdiag.debugger-for-chrome": "workspace" }, - "files.insertFinalNewline": true + "files.insertFinalNewline": true, + "svg.preview.background": "black" } \ No newline at end of file diff --git a/src/vs/base/browser/ui/splitview/panelview.css b/src/vs/base/browser/ui/splitview/panelview.css index 194ef683029..ed2f2e87b32 100644 --- a/src/vs/base/browser/ui/splitview/panelview.css +++ b/src/vs/base/browser/ui/splitview/panelview.css @@ -76,6 +76,9 @@ background-position: center center; background-repeat: no-repeat; margin-right: 0; + display: flex; + align-items: center; + justify-content: center; } /* Bold font style does not go well with CJK fonts */ diff --git a/src/vs/base/browser/ui/toolbar/ellipsis-dark.svg b/src/vs/base/browser/ui/toolbar/ellipsis-dark.svg deleted file mode 100644 index 2c52e359f61..00000000000 --- a/src/vs/base/browser/ui/toolbar/ellipsis-dark.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/vs/base/browser/ui/toolbar/ellipsis-hc.svg b/src/vs/base/browser/ui/toolbar/ellipsis-hc.svg deleted file mode 100644 index 3d7068f6b4c..00000000000 --- a/src/vs/base/browser/ui/toolbar/ellipsis-hc.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/vs/base/browser/ui/toolbar/ellipsis-light.svg b/src/vs/base/browser/ui/toolbar/ellipsis-light.svg deleted file mode 100644 index 883d2722ce3..00000000000 --- a/src/vs/base/browser/ui/toolbar/ellipsis-light.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/vs/base/browser/ui/toolbar/toolbar.css b/src/vs/base/browser/ui/toolbar/toolbar.css index 47669712253..9a8c84a7e8f 100644 --- a/src/vs/base/browser/ui/toolbar/toolbar.css +++ b/src/vs/base/browser/ui/toolbar/toolbar.css @@ -7,15 +7,3 @@ display: inline-block; padding: 0; } - -.vs .monaco-toolbar .action-label.toolbar-toggle-more { - background-image: url('ellipsis-light.svg'); -} - -.vs-dark .monaco-toolbar .action-label.toolbar-toggle-more { - background-image: url('ellipsis-dark.svg'); -} - -.hc-black .monaco-toolbar .action-label.toolbar-toggle-more { - background-image: url('ellipsis-hc.svg'); -} \ No newline at end of file diff --git a/src/vs/base/browser/ui/toolbar/toolbar.ts b/src/vs/base/browser/ui/toolbar/toolbar.ts index b6329a0ce4d..7a45bdc5938 100644 --- a/src/vs/base/browser/ui/toolbar/toolbar.ts +++ b/src/vs/base/browser/ui/toolbar/toolbar.ts @@ -65,7 +65,7 @@ export class ToolBar extends Disposable { this.options.actionViewItemProvider, this.actionRunner, this.options.getKeyBinding, - 'toolbar-toggle-more', + 'codicon-more', this.options.anchorAlignmentProvider ); this.toggleMenuActionViewItem.value.setActionContext(this.actionBar.context); diff --git a/src/vs/base/browser/ui/tree/treeDefaults.ts b/src/vs/base/browser/ui/tree/treeDefaults.ts index 03b8665cd64..e74f249c17d 100644 --- a/src/vs/base/browser/ui/tree/treeDefaults.ts +++ b/src/vs/base/browser/ui/tree/treeDefaults.ts @@ -22,4 +22,4 @@ export class CollapseAllAction extends Action { return Promise.resolve(); } -} \ No newline at end of file +} diff --git a/src/vs/workbench/browser/actions/layoutActions.ts b/src/vs/workbench/browser/actions/layoutActions.ts index 699047a2805..190f5dcd853 100644 --- a/src/vs/workbench/browser/actions/layoutActions.ts +++ b/src/vs/workbench/browser/actions/layoutActions.ts @@ -118,7 +118,7 @@ export class ToggleEditorLayoutAction extends Action { ) { super(id, label); - this.class = 'flip-editor-layout'; + this.class = 'codicon-editor-layout'; this.updateEnablement(); this.registerListeners(); diff --git a/src/vs/workbench/browser/actions/media/actions.css b/src/vs/workbench/browser/actions/media/actions.css index 65e70133370..a4a092d8349 100644 --- a/src/vs/workbench/browser/actions/media/actions.css +++ b/src/vs/workbench/browser/actions/media/actions.css @@ -2,24 +2,3 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - -.vs .monaco-workbench .flip-editor-layout { - background-image: url('layout-light.svg'); -} - -.vs-dark .monaco-workbench .flip-editor-layout { - background-image: url('layout-dark.svg'); -} - -.hc-black .monaco-workbench .flip-editor-layout { - background-image: url('layout-hc.svg'); -} - -.vs .action-remove-from-recently-opened { - background: url("remove-light.svg") center center no-repeat; -} - -.vs-dark .action-remove-from-recently-opened, -.hc-black .action-remove-from-recently-opened { - background: url("remove-dark.svg") center center no-repeat; -} diff --git a/src/vs/workbench/browser/actions/media/layout-dark.svg b/src/vs/workbench/browser/actions/media/layout-dark.svg deleted file mode 100644 index f7e50f481be..00000000000 --- a/src/vs/workbench/browser/actions/media/layout-dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/browser/actions/media/layout-hc.svg b/src/vs/workbench/browser/actions/media/layout-hc.svg deleted file mode 100644 index 40c1b46b197..00000000000 --- a/src/vs/workbench/browser/actions/media/layout-hc.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/browser/actions/media/layout-light.svg b/src/vs/workbench/browser/actions/media/layout-light.svg deleted file mode 100644 index 1f5e31274ec..00000000000 --- a/src/vs/workbench/browser/actions/media/layout-light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/browser/actions/media/remove-dark.svg b/src/vs/workbench/browser/actions/media/remove-dark.svg deleted file mode 100644 index f8af265cc44..00000000000 --- a/src/vs/workbench/browser/actions/media/remove-dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/browser/actions/media/remove-light.svg b/src/vs/workbench/browser/actions/media/remove-light.svg deleted file mode 100644 index 7acc4103388..00000000000 --- a/src/vs/workbench/browser/actions/media/remove-light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/browser/parts/editor/editorActions.ts b/src/vs/workbench/browser/parts/editor/editorActions.ts index 7b4cab33ed8..a57849a4b8c 100644 --- a/src/vs/workbench/browser/parts/editor/editorActions.ts +++ b/src/vs/workbench/browser/parts/editor/editorActions.ts @@ -467,7 +467,7 @@ export class CloseEditorAction extends Action { label: string, @ICommandService private readonly commandService: ICommandService ) { - super(id, label, 'close-editor-action'); + super(id, label, 'codicon-close'); } run(context?: IEditorCommandsContext): Promise { @@ -485,7 +485,7 @@ export class CloseOneEditorAction extends Action { label: string, @IEditorGroupsService private readonly editorGroupService: IEditorGroupsService ) { - super(id, label, 'close-editor-action'); + super(id, label, 'codicon-close'); } run(context?: IEditorCommandsContext): Promise { @@ -669,7 +669,7 @@ export class CloseAllEditorsAction extends BaseCloseAllAction { @ITextFileService textFileService: ITextFileService, @IEditorGroupsService editorGroupService: IEditorGroupsService ) { - super(id, label, 'action-close-all-files', textFileService, editorGroupService); + super(id, label, 'codicon-close-all', textFileService, editorGroupService); } protected doCloseAll(): Promise { diff --git a/src/vs/workbench/browser/parts/editor/media/titlecontrol.css b/src/vs/workbench/browser/parts/editor/media/titlecontrol.css index c0c52f3c84c..aa765e1436e 100644 --- a/src/vs/workbench/browser/parts/editor/media/titlecontrol.css +++ b/src/vs/workbench/browser/parts/editor/media/titlecontrol.css @@ -56,15 +56,15 @@ /* Actions */ -.monaco-workbench .part.editor > .content .editor-group-container > .title .close-editor-action { +.monaco-workbench .part.editor > .content .editor-group-container > .title .codicon-close { background: url('close-light.svg') center center no-repeat; } -.vs-dark .monaco-workbench .part.editor > .content .editor-group-container > .title .close-editor-action { +.vs-dark .monaco-workbench .part.editor > .content .editor-group-container > .title .codicon-close { background: url('close-dark.svg') center center no-repeat; } -.hc-black .monaco-workbench .part.editor > .content .editor-group-container > .title .close-editor-action { +.hc-black .monaco-workbench .part.editor > .content .editor-group-container > .title .codicon-close { background: url('close-hc.svg') center center no-repeat; } @@ -76,4 +76,4 @@ border-radius: 10px; font-size: 12px; position: absolute; -} \ No newline at end of file +} diff --git a/src/vs/workbench/browser/parts/views/customView.ts b/src/vs/workbench/browser/parts/views/customView.ts index a0e82df3231..03c709a0e06 100644 --- a/src/vs/workbench/browser/parts/views/customView.ts +++ b/src/vs/workbench/browser/parts/views/customView.ts @@ -308,7 +308,7 @@ export class CustomTreeView extends Disposable implements ITreeView { getPrimaryActions(): IAction[] { if (this.showCollapseAllAction) { - const collapseAllAction = new Action('vs.tree.collapse', localize('collapseAll', "Collapse All"), 'monaco-tree-action collapse-all', true, () => this.tree ? new CollapseAllAction(this.tree, true).run() : Promise.resolve()); + const collapseAllAction = new Action('vs.tree.collapse', localize('collapseAll', "Collapse All"), 'monaco-tree-action codicon-collapse-all', true, () => this.tree ? new CollapseAllAction(this.tree, true).run() : Promise.resolve()); return [...this.menus.getTitleActions(), collapseAllAction]; } else { return this.menus.getTitleActions(); @@ -921,4 +921,3 @@ class TreeMenus extends Disposable implements IDisposable { return result; } } - diff --git a/src/vs/workbench/contrib/files/browser/fileActions.ts b/src/vs/workbench/contrib/files/browser/fileActions.ts index dac029fe35a..377b59c195a 100644 --- a/src/vs/workbench/contrib/files/browser/fileActions.ts +++ b/src/vs/workbench/contrib/files/browser/fileActions.ts @@ -89,7 +89,7 @@ export class NewFileAction extends Action { @ICommandService private commandService: ICommandService ) { super('explorer.newFile', NEW_FILE_LABEL); - this.class = 'explorer-action new-file'; + this.class = 'explorer-action codicon-new-file'; this._register(explorerService.onDidChangeEditable(e => { const elementIsBeingEdited = explorerService.isEditable(e); this.enabled = !elementIsBeingEdited; @@ -111,7 +111,7 @@ export class NewFolderAction extends Action { @ICommandService private commandService: ICommandService ) { super('explorer.newFolder', NEW_FOLDER_LABEL); - this.class = 'explorer-action new-folder'; + this.class = 'explorer-action codicon-new-folder'; this._register(explorerService.onDidChangeEditable(e => { const elementIsBeingEdited = explorerService.isEditable(e); this.enabled = !elementIsBeingEdited; @@ -576,7 +576,7 @@ export class SaveAllAction extends BaseSaveAllAction { public static readonly LABEL = SAVE_ALL_LABEL; public get class(): string { - return 'explorer-action save-all'; + return 'explorer-action codicon-save-all'; } protected doRun(context: any): Promise { @@ -594,7 +594,7 @@ export class SaveAllInGroupAction extends BaseSaveAllAction { public static readonly LABEL = nls.localize('saveAllInGroup', "Save All in Group"); public get class(): string { - return 'explorer-action save-all'; + return 'explorer-action codicon-save-all'; } protected doRun(context: any): Promise { @@ -612,7 +612,7 @@ export class CloseGroupAction extends Action { public static readonly LABEL = nls.localize('closeGroup', "Close Group"); constructor(id: string, label: string, @ICommandService private readonly commandService: ICommandService) { - super(id, label, 'action-close-all-files'); + super(id, label, 'codicon-close-all'); } public run(context?: any): Promise { @@ -675,7 +675,7 @@ export class CollapseExplorerView extends Action { @IViewletService private readonly viewletService: IViewletService, @IExplorerService readonly explorerService: IExplorerService ) { - super(id, label, 'explorer-action collapse-explorer'); + super(id, label, 'explorer-action codicon-collapse-all'); this._register(explorerService.onDidChangeEditable(e => { const elementIsBeingEdited = explorerService.isEditable(e); this.enabled = !elementIsBeingEdited; @@ -703,7 +703,7 @@ export class RefreshExplorerView extends Action { @IViewletService private readonly viewletService: IViewletService, @IExplorerService private readonly explorerService: IExplorerService ) { - super(id, label, 'explorer-action refresh-explorer'); + super(id, label, 'explorer-action codicon-refresh'); this._register(explorerService.onDidChangeEditable(e => { const elementIsBeingEdited = explorerService.isEditable(e); this.enabled = !elementIsBeingEdited; diff --git a/src/vs/workbench/contrib/files/browser/media/action-close-dark.svg b/src/vs/workbench/contrib/files/browser/media/action-close-dark.svg deleted file mode 100644 index f8af265cc44..00000000000 --- a/src/vs/workbench/contrib/files/browser/media/action-close-dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/files/browser/media/action-close-focus.svg b/src/vs/workbench/contrib/files/browser/media/action-close-focus.svg deleted file mode 100644 index 865c5aaea5a..00000000000 --- a/src/vs/workbench/contrib/files/browser/media/action-close-focus.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/contrib/files/browser/media/action-close-light.svg b/src/vs/workbench/contrib/files/browser/media/action-close-light.svg deleted file mode 100644 index 7acc4103388..00000000000 --- a/src/vs/workbench/contrib/files/browser/media/action-close-light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/files/browser/media/add-file-dark.svg b/src/vs/workbench/contrib/files/browser/media/add-file-dark.svg deleted file mode 100644 index f162f2046e6..00000000000 --- a/src/vs/workbench/contrib/files/browser/media/add-file-dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/files/browser/media/add-file-hc.svg b/src/vs/workbench/contrib/files/browser/media/add-file-hc.svg deleted file mode 100644 index 79d286c4279..00000000000 --- a/src/vs/workbench/contrib/files/browser/media/add-file-hc.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/files/browser/media/add-file-light.svg b/src/vs/workbench/contrib/files/browser/media/add-file-light.svg deleted file mode 100644 index 048c2d98241..00000000000 --- a/src/vs/workbench/contrib/files/browser/media/add-file-light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/files/browser/media/add-folder-dark.svg b/src/vs/workbench/contrib/files/browser/media/add-folder-dark.svg deleted file mode 100644 index 2a8d206bcfc..00000000000 --- a/src/vs/workbench/contrib/files/browser/media/add-folder-dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/files/browser/media/add-folder-hc.svg b/src/vs/workbench/contrib/files/browser/media/add-folder-hc.svg deleted file mode 100644 index d247ff54002..00000000000 --- a/src/vs/workbench/contrib/files/browser/media/add-folder-hc.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/files/browser/media/add-folder-light.svg b/src/vs/workbench/contrib/files/browser/media/add-folder-light.svg deleted file mode 100644 index d5e85ce9d0f..00000000000 --- a/src/vs/workbench/contrib/files/browser/media/add-folder-light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/files/browser/media/close-all-dark.svg b/src/vs/workbench/contrib/files/browser/media/close-all-dark.svg deleted file mode 100644 index 12a89f8e397..00000000000 --- a/src/vs/workbench/contrib/files/browser/media/close-all-dark.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/vs/workbench/contrib/files/browser/media/close-all-light.svg b/src/vs/workbench/contrib/files/browser/media/close-all-light.svg deleted file mode 100644 index 53421f0121c..00000000000 --- a/src/vs/workbench/contrib/files/browser/media/close-all-light.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/vs/workbench/contrib/files/browser/media/collapse-all-dark.svg b/src/vs/workbench/contrib/files/browser/media/collapse-all-dark.svg deleted file mode 100644 index 4862c55dbeb..00000000000 --- a/src/vs/workbench/contrib/files/browser/media/collapse-all-dark.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/vs/workbench/contrib/files/browser/media/collapse-all-hc.svg b/src/vs/workbench/contrib/files/browser/media/collapse-all-hc.svg deleted file mode 100644 index 05f920b29b6..00000000000 --- a/src/vs/workbench/contrib/files/browser/media/collapse-all-hc.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/vs/workbench/contrib/files/browser/media/collapse-all-light.svg b/src/vs/workbench/contrib/files/browser/media/collapse-all-light.svg deleted file mode 100644 index 6359b42e623..00000000000 --- a/src/vs/workbench/contrib/files/browser/media/collapse-all-light.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css b/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css index 81b51b791f6..5a6a61eb7c8 100644 --- a/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css +++ b/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css @@ -62,6 +62,8 @@ .explorer-viewlet .explorer-open-editors .monaco-list .monaco-list-row > .monaco-action-bar { visibility: hidden; + display: flex; + align-items: center; } .explorer-viewlet .panel-header .count { @@ -84,9 +86,12 @@ display: block; } -.explorer-viewlet .explorer-open-editors .monaco-list .monaco-list-row > .monaco-action-bar .close-editor-action { +.explorer-viewlet .explorer-open-editors .monaco-list .monaco-list-row > .monaco-action-bar .codicon-close { width: 8px; height: 22px; + display: flex; + align-items: center; + justify-content: center; } .explorer-viewlet .explorer-open-editors .monaco-list .monaco-list-row > .monaco-action-bar .action-close-all-files, diff --git a/src/vs/workbench/contrib/files/browser/media/fileactions.css b/src/vs/workbench/contrib/files/browser/media/fileactions.css index 0744d21091c..56da3c0b4f3 100644 --- a/src/vs/workbench/contrib/files/browser/media/fileactions.css +++ b/src/vs/workbench/contrib/files/browser/media/fileactions.css @@ -3,84 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/* Close all */ -.monaco-workbench .explorer-viewlet .action-close-all-files { - background: url("close-all-light.svg") center center no-repeat; -} - -.vs-dark .monaco-workbench .explorer-viewlet .action-close-all-files { - background: url("close-all-dark.svg") center center no-repeat; -} - -.hc-black .monaco-workbench .explorer-viewlet .action-close-all-files { - background: url("close-all-light.svg") center center no-repeat; -} - -/* Save all */ -.monaco-workbench .explorer-action.save-all { - background: url("save-all-light.svg") center center no-repeat; -} - -.vs-dark .monaco-workbench .explorer-action.save-all { - background: url("save-all-dark.svg") center center no-repeat; -} - -.hc-black .monaco-workbench .explorer-action.save-all { - background: url("save-all-hc.svg") center center no-repeat; -} - -/* Add file */ -.monaco-workbench .explorer-action.new-file { - background: url("add-file-light.svg") center center no-repeat; -} - -.vs-dark .monaco-workbench .explorer-action.new-file { - background: url("add-file-dark.svg") center center no-repeat; -} - -.hc-black .monaco-workbench .explorer-action.new-file { - background: url("add-file-hc.svg") center center no-repeat; -} - -/* Add Folder */ -.monaco-workbench .explorer-action.new-folder { - background: url("add-folder-light.svg") center center no-repeat; -} - -.vs-dark .monaco-workbench .explorer-action.new-folder { - background: url("add-folder-dark.svg") center center no-repeat; -} - -.hc-black .monaco-workbench .explorer-action.new-folder { - background: url("add-folder-hc.svg") center center no-repeat; -} - -/* Refresh */ -.monaco-workbench .explorer-action.refresh-explorer { - background: url("refresh-light.svg") center center no-repeat; -} - -.vs-dark .monaco-workbench .explorer-action.refresh-explorer { - background: url("refresh-dark.svg") center center no-repeat; -} - -.hc-black .monaco-workbench .explorer-action.refresh-explorer { - background: url("refresh-hc.svg") center center no-repeat; -} - -/* Collapse all */ -.monaco-workbench .explorer-action.collapse-explorer { - background: url("collapse-all-light.svg") center center no-repeat; -} - -.vs-dark .monaco-workbench .explorer-action.collapse-explorer { - background: url("collapse-all-dark.svg") center center no-repeat; -} - -.hc-black .monaco-workbench .explorer-action.collapse-explorer { - background: url("collapse-all-hc.svg") center center no-repeat; -} - /* Split editor vertical */ .monaco-workbench .quick-open-sidebyside-vertical { background-image: url("split-editor-vertical-light.svg"); @@ -116,28 +38,14 @@ background: url("preview-dark.svg") center center no-repeat; } -.explorer-viewlet .explorer-open-editors .close-editor-action { - background: url("action-close-light.svg") center center no-repeat; -} - -.explorer-viewlet .explorer-open-editors .focused .monaco-list-row.selected:not(.highlighted) .close-editor-action { - background: url("action-close-focus.svg") center center no-repeat; +.vs-dark .explorer-viewlet .explorer-open-editors .monaco-list .monaco-list-row.dirty:not(:hover) > .monaco-action-bar .codicon-close { + opacity: 0; } - -.explorer-viewlet .explorer-open-editors .monaco-list .monaco-list-row.dirty:not(:hover) > .monaco-action-bar .close-editor-action { - background: url("action-close-dirty.svg") center center no-repeat; -} - -.vs-dark .explorer-viewlet .explorer-open-editors .monaco-list .monaco-list-row.dirty:not(:hover) > .monaco-action-bar .close-editor-action, -.hc-black .monaco-workbench .explorer-viewlet .explorer-open-editors .monaco-list .monaco-list-row.dirty:not(:hover) > .monaco-action-bar .close-editor-action { +.vs-dark .explorer-viewlet .explorer-open-editors .monaco-list .monaco-list-row.dirty:not(:hover) > .monaco-action-bar .codicon-close, +.hc-black .monaco-workbench .explorer-viewlet .explorer-open-editors .monaco-list .monaco-list-row.dirty:not(:hover) > .monaco-action-bar .codicon-close { background: url("action-close-dirty-dark.svg") center center no-repeat; } -.explorer-viewlet .explorer-open-editors .monaco-list.focused .monaco-list-row.selected.dirty:not(:hover) > .monaco-action-bar .close-editor-action { +.explorer-viewlet .explorer-open-editors .monaco-list.focused .monaco-list-row.selected.dirty:not(:hover) > .monaco-action-bar .codicon-close { background: url("action-close-dirty-focus.svg") center center no-repeat; } - -.vs-dark .monaco-workbench .explorer-viewlet .explorer-open-editors .close-editor-action, -.hc-black .monaco-workbench .explorer-viewlet .explorer-open-editors .close-editor-action { - background: url("action-close-dark.svg") center center no-repeat; -} diff --git a/src/vs/workbench/contrib/files/browser/media/refresh-dark.svg b/src/vs/workbench/contrib/files/browser/media/refresh-dark.svg deleted file mode 100644 index 57473d6d9ad..00000000000 --- a/src/vs/workbench/contrib/files/browser/media/refresh-dark.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/vs/workbench/contrib/files/browser/media/refresh-hc.svg b/src/vs/workbench/contrib/files/browser/media/refresh-hc.svg deleted file mode 100644 index d2eb7f74671..00000000000 --- a/src/vs/workbench/contrib/files/browser/media/refresh-hc.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/vs/workbench/contrib/files/browser/media/refresh-light.svg b/src/vs/workbench/contrib/files/browser/media/refresh-light.svg deleted file mode 100644 index e90c502c3df..00000000000 --- a/src/vs/workbench/contrib/files/browser/media/refresh-light.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/vs/workbench/contrib/files/browser/media/save-all-dark.svg b/src/vs/workbench/contrib/files/browser/media/save-all-dark.svg deleted file mode 100644 index 8acad37a99c..00000000000 --- a/src/vs/workbench/contrib/files/browser/media/save-all-dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/files/browser/media/save-all-hc.svg b/src/vs/workbench/contrib/files/browser/media/save-all-hc.svg deleted file mode 100644 index 5d519f76051..00000000000 --- a/src/vs/workbench/contrib/files/browser/media/save-all-hc.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/files/browser/media/save-all-light.svg b/src/vs/workbench/contrib/files/browser/media/save-all-light.svg deleted file mode 100644 index 529e489a816..00000000000 --- a/src/vs/workbench/contrib/files/browser/media/save-all-light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/markers/browser/markersPanel.ts b/src/vs/workbench/contrib/markers/browser/markersPanel.ts index 01ef11a2cd4..bbc4392c7f7 100644 --- a/src/vs/workbench/contrib/markers/browser/markersPanel.ts +++ b/src/vs/workbench/contrib/markers/browser/markersPanel.ts @@ -117,7 +117,7 @@ export class MarkersPanel extends Panel implements IMarkerFilterController { this.rangeHighlightDecorations = this._register(this.instantiationService.createInstance(RangeHighlightDecorations)); // actions - this.collapseAllAction = this._register(new Action('vs.tree.collapse', localize('collapseAll', "Collapse All"), 'monaco-tree-action codicon-collapse-all', true, async () => this.collapseAll())); + this.collapseAllAction = this._register(new Action('vs.tree.collapse', localize('collapseAll', "Collapse All"), 'monaco-tree-action collapse-all', true, async () => this.collapseAll())); this.filterAction = this._register(this.instantiationService.createInstance(MarkersFilterAction, { filterText: this.panelState['filter'] || '', filterHistory: this.panelState['filterHistory'] || [], useFilesExclude: !!this.panelState['useFilesExclude'] })); } -- GitLab