diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1a760bdda6b8f687fcfbbaca34643b11649370fa..551d18bb0ce826b1dcb567124fe792c3a1203b0d 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -61,4 +61,4 @@
"msjsdiag.debugger-for-chrome": "workspace"
},
"files.insertFinalNewline": true
-}
\ 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 194ef68302908b1c068280f1f765292039bac051..ed2f2e87b32c4540eabb9c7a6b9c7d1384ba64dc 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 2c52e359f610d8586ed0259bb9747e2500b0b34f..0000000000000000000000000000000000000000
--- 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 3d7068f6b4cd136888f9629f2f839511502a11ff..0000000000000000000000000000000000000000
--- 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 883d2722ce3060ba2accf82634052ab349572ab9..0000000000000000000000000000000000000000
--- 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 476697122530763886b644a6ee9f5d3d3d7b7cf5..9a8c84a7e8f986ff8d645c416289bdd122693e8d 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 b6329a0ce4d388e3c98ce98717f8960630c48b29..7a45bdc59381a7825663be68906123a99f4b34bc 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 03b8665cd64ea634234c8dff73f7e08edff4201e..e74f249c17db1e09abbbe01cd4fb905d622392a2 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 699047a28052012a3425bbb9c15108411b8cc9fb..190f5dcd853550b08c391aa55ec8fcedd59d935d 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 65e701333700a744e9674b03bc574fd1690e8706..a4a092d83492f73541c48127da38563b8fce621d 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 f7e50f481be51c13d3f32949c51c666cd137a677..0000000000000000000000000000000000000000
--- 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 40c1b46b197f38119b171358e754857a8d484678..0000000000000000000000000000000000000000
--- 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 1f5e31274ececdce9cef08021a6d1f8f2c2106ab..0000000000000000000000000000000000000000
--- 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 f8af265cc449f1dca5bc59df5bd3372ab01182a4..0000000000000000000000000000000000000000
--- 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 7acc41033885354e880262ac91e6ffe2086e236e..0000000000000000000000000000000000000000
--- 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 7b4cab33ed86067b56c33d53b54d91fe5733d621..a57849a4b8c12d1ab867225f45c2ce67684a41df 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/close-dark.svg b/src/vs/workbench/browser/parts/editor/media/close-dark.svg
deleted file mode 100644
index 44ece771f4569662bdf1f77cb477f8308ff4881c..0000000000000000000000000000000000000000
--- a/src/vs/workbench/browser/parts/editor/media/close-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/browser/parts/editor/media/close-dirty-alt.svg b/src/vs/workbench/browser/parts/editor/media/close-dirty-alt.svg
deleted file mode 100644
index 409e5fa539c898f97fd1c66f6f541d3c57f0125e..0000000000000000000000000000000000000000
--- a/src/vs/workbench/browser/parts/editor/media/close-dirty-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/media/close-dirty-dark.svg b/src/vs/workbench/browser/parts/editor/media/close-dirty-dark.svg
deleted file mode 100644
index 51946be5bb7abaf1ea73834fa0d5e784d2a402c9..0000000000000000000000000000000000000000
--- a/src/vs/workbench/browser/parts/editor/media/close-dirty-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/browser/parts/editor/media/close-dirty-light.svg b/src/vs/workbench/browser/parts/editor/media/close-dirty-light.svg
deleted file mode 100644
index fb91225b9682affcf90b5f42484e12bf8c686fa9..0000000000000000000000000000000000000000
--- a/src/vs/workbench/browser/parts/editor/media/close-dirty-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/browser/parts/editor/media/close-dirty.svg b/src/vs/workbench/browser/parts/editor/media/close-dirty.svg
deleted file mode 100644
index 409e5fa539c898f97fd1c66f6f541d3c57f0125e..0000000000000000000000000000000000000000
--- a/src/vs/workbench/browser/parts/editor/media/close-dirty.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/media/close-hc.svg b/src/vs/workbench/browser/parts/editor/media/close-hc.svg
deleted file mode 100644
index fa205f4ee128c77a1f20d761b15df29bb0955ca0..0000000000000000000000000000000000000000
--- a/src/vs/workbench/browser/parts/editor/media/close-hc.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/browser/parts/editor/media/close-light.svg b/src/vs/workbench/browser/parts/editor/media/close-light.svg
deleted file mode 100644
index 742fcae4ae7d68945b9d01e620386486bc131b4e..0000000000000000000000000000000000000000
--- a/src/vs/workbench/browser/parts/editor/media/close-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/browser/parts/editor/media/editorgroupview.css b/src/vs/workbench/browser/parts/editor/media/editorgroupview.css
index 2a35e386e9addbc8fdd1b7c656748e64988172cd..582eac233e20be98bf60762249eb3d2a9d688425 100644
--- a/src/vs/workbench/browser/parts/editor/media/editorgroupview.css
+++ b/src/vs/workbench/browser/parts/editor/media/editorgroupview.css
@@ -89,15 +89,6 @@
background-repeat: no-repeat;
}
-.vs .monaco-workbench .part.editor > .content .editor-group-container > .editor-group-container-toolbar .close-editor-group {
- background-image: url('close-light.svg');
-}
-
-.vs-dark .monaco-workbench .part.editor > .content .editor-group-container > .editor-group-container-toolbar .close-editor-group,
-.hc-black .monaco-workbench .part.editor > .content .editor-group-container > .editor-group-container-toolbar .close-editor-group {
- background-image: url('close-dark.svg');
-}
-
/* Editor */
.monaco-workbench .part.editor > .content .editor-group-container.empty > .editor-container {
diff --git a/src/vs/workbench/browser/parts/editor/media/editorstatus.css b/src/vs/workbench/browser/parts/editor/media/editorstatus.css
index 4e10ebe3c39d1d509639ca740dab64652c26d047..ba3fa7d748022771eaf680e932b0baf7d8b8dbb2 100644
--- a/src/vs/workbench/browser/parts/editor/media/editorstatus.css
+++ b/src/vs/workbench/browser/parts/editor/media/editorstatus.css
@@ -49,15 +49,3 @@
margin-right: 5px;
max-width: fit-content;
}
-
-.vs .monaco-workbench .screen-reader-detected-explanation .cancel {
- background: url('close-light.svg') center center no-repeat;
-}
-
-.vs-dark .monaco-workbench .screen-reader-detected-explanation .cancel {
- background: url('close-dark.svg') center center no-repeat;
-}
-
-.hc-black .monaco-workbench .screen-reader-detected-explanation .cancel {
- background: url('close-hc.svg') center center no-repeat;
-}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css b/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css
index 086b72fa8b96164a4d836d7f1ec429923b843afc..0c056ced27d24fd57afceecda6fe46b52044871f 100644
--- a/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css
@@ -198,6 +198,12 @@
opacity: 1;
}
+/* change close icon to dirty state icon */
+.monaco-workbench .part.editor > .content .editor-group-container.active > .title .tabs-container > .tab.dirty > .tab-close .action-label:not(:hover)::before,
+.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty > .tab-close .action-label:not(:hover)::before {
+ content: "\ea71"; /* use `circle-filled` icon unicode */
+}
+
.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.active > .tab-close .action-label, /* show dimmed for inactive group */
.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.active:hover > .tab-close .action-label, /* show dimmed for inactive group */
.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty > .tab-close .action-label, /* show dimmed for inactive group */
@@ -216,27 +222,6 @@
margin-right: 0.5em;
}
-.vs .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty .close-editor-action {
- background: url('close-dirty-light.svg') center center no-repeat;
-}
-
-.vs-dark .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty .close-editor-action,
-.hc-black .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty .close-editor-action {
- background: url('close-dirty-dark.svg') center center no-repeat;
-}
-
-.vs .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty .close-editor-action:hover {
- background: url('close-light.svg') center center no-repeat;
-}
-
-.vs-dark .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty .close-editor-action:hover {
- background: url('close-dark.svg') center center no-repeat;
-}
-
-.hc-black .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty .close-editor-action:hover {
- background: url('close-hc.svg') center center no-repeat;
-}
-
/* No Tab Close Button */
.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.close-button-off {
@@ -254,15 +239,6 @@
padding-right: 28px; /* make room for dirty indication when we are running without close button */
}
-.vs .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.close-button-off.dirty:not(.dirty-border-top) {
- background-image: url('close-dirty-light.svg');
-}
-
-.vs-dark .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.close-button-off.dirty:not(.dirty-border-top),
-.hc-black .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.close-button-off.dirty {
- background-image: url('close-dirty-dark.svg');
-}
-
/* Editor Actions */
.monaco-workbench .part.editor > .content .editor-group-container > .title .editor-actions {
diff --git a/src/vs/workbench/browser/parts/editor/media/titlecontrol.css b/src/vs/workbench/browser/parts/editor/media/titlecontrol.css
index c0c52f3c84c9cb8673dacb44610d46f496b6c1f7..86292c1ee098953a506299b8a648891a3955500c 100644
--- a/src/vs/workbench/browser/parts/editor/media/titlecontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/titlecontrol.css
@@ -54,20 +54,6 @@
cursor: grab;
}
-/* Actions */
-
-.monaco-workbench .part.editor > .content .editor-group-container > .title .close-editor-action {
- background: url('close-light.svg') center center no-repeat;
-}
-
-.vs-dark .monaco-workbench .part.editor > .content .editor-group-container > .title .close-editor-action {
- background: url('close-dark.svg') center center no-repeat;
-}
-
-.hc-black .monaco-workbench .part.editor > .content .editor-group-container > .title .close-editor-action {
- background: url('close-hc.svg') center center no-repeat;
-}
-
/* Drag and Drop Feedback */
.monaco-editor-group-drag-image {
@@ -76,4 +62,4 @@
border-radius: 10px;
font-size: 12px;
position: absolute;
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/contrib/files/browser/fileActions.ts b/src/vs/workbench/contrib/files/browser/fileActions.ts
index dac029fe35afca354bf4e44f3e714b18eca833a9..377b59c195acdfc5ced6e529a6f4307075eac334 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 f8af265cc449f1dca5bc59df5bd3372ab01182a4..0000000000000000000000000000000000000000
--- 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-dirty-dark.svg b/src/vs/workbench/contrib/files/browser/media/action-close-dirty-dark.svg
deleted file mode 100644
index 02dafab76fc6e4dde364ab476ec2b774a688463e..0000000000000000000000000000000000000000
--- a/src/vs/workbench/contrib/files/browser/media/action-close-dirty-dark.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/files/browser/media/action-close-dirty-focus.svg b/src/vs/workbench/contrib/files/browser/media/action-close-dirty-focus.svg
deleted file mode 100644
index 33a3b4aeeda9a299a16bdb8bde01b2ed7cfa74ea..0000000000000000000000000000000000000000
--- a/src/vs/workbench/contrib/files/browser/media/action-close-dirty-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-dirty.svg b/src/vs/workbench/contrib/files/browser/media/action-close-dirty.svg
deleted file mode 100644
index 409e5fa539c898f97fd1c66f6f541d3c57f0125e..0000000000000000000000000000000000000000
--- a/src/vs/workbench/contrib/files/browser/media/action-close-dirty.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
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 865c5aaea5af0e7066ebdd4c595740fd7baeb2c7..0000000000000000000000000000000000000000
--- 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 7acc41033885354e880262ac91e6ffe2086e236e..0000000000000000000000000000000000000000
--- 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 f162f2046e690202db679a1f7a9180dc56f67416..0000000000000000000000000000000000000000
--- 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 79d286c4279fa81409d0e5d7794e98f08ce1845e..0000000000000000000000000000000000000000
--- 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 048c2d982416ba263d620bd99c6b74e67abd4a59..0000000000000000000000000000000000000000
--- 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 2a8d206bcfcfa133584c6083a591da177ff3cd5b..0000000000000000000000000000000000000000
--- 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 d247ff54002b75945e06a921c1050f53c2263084..0000000000000000000000000000000000000000
--- 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 d5e85ce9d0f6ca4bcbbe6430c8c7967914d25bda..0000000000000000000000000000000000000000
--- 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 12a89f8e397761c8f22004fdb456041b1de27c30..0000000000000000000000000000000000000000
--- 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 53421f0121c47e3e9d12a1bc759fc126768eb145..0000000000000000000000000000000000000000
--- 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 4862c55dbeba7be7bbf826c47dbaa149199d1a45..0000000000000000000000000000000000000000
--- 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 05f920b29b6852bb7a06c2a0ebe12985ea015594..0000000000000000000000000000000000000000
--- 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 6359b42e623fb0c9df553f1769c6ed686f7a646a..0000000000000000000000000000000000000000
--- 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 81b51b791f633367cdffe6b14ab32dc31dbe7679..5a6a61eb7c870b0e0e38a736e248072cca15d003 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 0744d21091c3bc2d6534f96e0d2872974015a776..890cd46cef9fc8c229a99b82a9489b12a01cc02e 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,6 @@
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;
-}
-
-.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 {
- 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 {
- 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;
+.explorer-viewlet .explorer-open-editors .monaco-list .monaco-list-row.dirty:not(:hover) > .monaco-action-bar .codicon-close::before {
+ content: "\ea71";
}
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 57473d6d9ad006ef40d3a2f9c48f05c864a7ce7d..0000000000000000000000000000000000000000
--- 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 d2eb7f74671d7c1ab3fd684b8781eb2c96173d30..0000000000000000000000000000000000000000
--- 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 e90c502c3dfda2605aafd8c540b8aef99400d2d5..0000000000000000000000000000000000000000
--- 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 8acad37a99c1c79d095d97c8330682af14b75af1..0000000000000000000000000000000000000000
--- 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 5d519f76051aa54efe933b5b98ede9d2af5d81c9..0000000000000000000000000000000000000000
--- 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 529e489a816ef5f16f68479cb6e4e88750cc9390..0000000000000000000000000000000000000000
--- 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 01ef11a2cd460f714f1106abd8cf622ba56f1ec2..bbc4392c7f74a75aa41d5e97352da85e863cc7ae 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'] }));
}