From 0bbbc43f0c3b3517e55611432f96a69c07834974 Mon Sep 17 00:00:00 2001 From: Miguel Solorio Date: Tue, 18 Jun 2019 11:31:30 -0700 Subject: [PATCH] Update close buttons --- .../browser/parts/editor/editor.contribution.ts | 16 ++++++++-------- .../parts/editor/media/close-all-dark.svg | 4 ++++ .../parts/editor/media/close-all-light.svg | 4 ++++ .../browser/parts/editor/media/close-big-alt.svg | 1 - .../parts/editor/media/close-big-inverse-alt.svg | 1 - .../parts/editor/media/close-big-inverse.svg | 1 - .../browser/parts/editor/media/close-big.svg | 1 - .../browser/parts/editor/media/close-dark.svg | 4 ++++ .../browser/parts/editor/media/close-hc.svg | 4 ++++ .../browser/parts/editor/media/close-inverse.svg | 1 - .../browser/parts/editor/media/close-light.svg | 4 ++++ .../editor/media/close-statusview-inverse.svg | 1 - .../parts/editor/media/close-statusview.svg | 1 - .../browser/parts/editor/media/close.svg | 1 - .../editor/media/closeall-editors-inverse.svg | 1 - .../parts/editor/media/closeall-editors.svg | 1 - .../browser/parts/editor/media/editorstatus.css | 9 ++++++--- .../parts/editor/media/tabstitlecontrol.css | 9 ++++++--- .../browser/parts/editor/media/titlecontrol.css | 9 ++++++--- 19 files changed, 46 insertions(+), 27 deletions(-) create mode 100644 src/vs/workbench/browser/parts/editor/media/close-all-dark.svg create mode 100644 src/vs/workbench/browser/parts/editor/media/close-all-light.svg delete mode 100644 src/vs/workbench/browser/parts/editor/media/close-big-alt.svg delete mode 100644 src/vs/workbench/browser/parts/editor/media/close-big-inverse-alt.svg delete mode 100644 src/vs/workbench/browser/parts/editor/media/close-big-inverse.svg delete mode 100644 src/vs/workbench/browser/parts/editor/media/close-big.svg create mode 100644 src/vs/workbench/browser/parts/editor/media/close-dark.svg create mode 100644 src/vs/workbench/browser/parts/editor/media/close-hc.svg delete mode 100644 src/vs/workbench/browser/parts/editor/media/close-inverse.svg create mode 100644 src/vs/workbench/browser/parts/editor/media/close-light.svg delete mode 100644 src/vs/workbench/browser/parts/editor/media/close-statusview-inverse.svg delete mode 100644 src/vs/workbench/browser/parts/editor/media/close-statusview.svg delete mode 100644 src/vs/workbench/browser/parts/editor/media/close.svg delete mode 100644 src/vs/workbench/browser/parts/editor/media/closeall-editors-inverse.svg delete mode 100644 src/vs/workbench/browser/parts/editor/media/closeall-editors.svg diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts index 2b4a4f09442..6ce67206f73 100644 --- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts +++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts @@ -529,16 +529,16 @@ appendEditorToolItem( { id: editorCommands.CLOSE_EDITOR_COMMAND_ID, title: nls.localize('close', "Close"), - iconDark: 'close-big-inverse-alt.svg', - iconLight: 'close-big-alt.svg' + iconDark: 'close-dark.svg', + iconLight: 'close-light.svg' }, ContextKeyExpr.and(ContextKeyExpr.not('config.workbench.editor.showTabs'), ContextKeyExpr.not('groupActiveEditorDirty')), 1000000, // towards the far end { id: editorCommands.CLOSE_EDITORS_IN_GROUP_COMMAND_ID, title: nls.localize('closeAll', "Close All"), - iconDark: 'closeall-editors-inverse.svg', - iconLight: 'closeall-editors.svg' + iconDark: 'close-all-dark.svg', + iconLight: 'close-all-light.svg' } ); @@ -546,16 +546,16 @@ appendEditorToolItem( { id: editorCommands.CLOSE_EDITOR_COMMAND_ID, title: nls.localize('close', "Close"), - iconDark: 'close-dirty-inverse-alt.svg', - iconLight: 'close-dirty-alt.svg' + iconDark: 'close-dark.svg', + iconLight: 'close-light.svg' }, ContextKeyExpr.and(ContextKeyExpr.not('config.workbench.editor.showTabs'), ContextKeyExpr.has('groupActiveEditorDirty')), 1000000, // towards the far end { id: editorCommands.CLOSE_EDITORS_IN_GROUP_COMMAND_ID, title: nls.localize('closeAll', "Close All"), - iconDark: 'closeall-editors-inverse.svg', - iconLight: 'closeall-editors.svg' + iconDark: 'close-all-dark.svg', + iconLight: 'close-all-light.svg' } ); diff --git a/src/vs/workbench/browser/parts/editor/media/close-all-dark.svg b/src/vs/workbench/browser/parts/editor/media/close-all-dark.svg new file mode 100644 index 00000000000..690174de730 --- /dev/null +++ b/src/vs/workbench/browser/parts/editor/media/close-all-dark.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/vs/workbench/browser/parts/editor/media/close-all-light.svg b/src/vs/workbench/browser/parts/editor/media/close-all-light.svg new file mode 100644 index 00000000000..9d5038d29da --- /dev/null +++ b/src/vs/workbench/browser/parts/editor/media/close-all-light.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/vs/workbench/browser/parts/editor/media/close-big-alt.svg b/src/vs/workbench/browser/parts/editor/media/close-big-alt.svg deleted file mode 100644 index f4038b8bfa5..00000000000 --- a/src/vs/workbench/browser/parts/editor/media/close-big-alt.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor/media/close-big-inverse-alt.svg b/src/vs/workbench/browser/parts/editor/media/close-big-inverse-alt.svg deleted file mode 100644 index a174033d912..00000000000 --- a/src/vs/workbench/browser/parts/editor/media/close-big-inverse-alt.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor/media/close-big-inverse.svg b/src/vs/workbench/browser/parts/editor/media/close-big-inverse.svg deleted file mode 100644 index a174033d912..00000000000 --- a/src/vs/workbench/browser/parts/editor/media/close-big-inverse.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor/media/close-big.svg b/src/vs/workbench/browser/parts/editor/media/close-big.svg deleted file mode 100644 index f4038b8bfa5..00000000000 --- a/src/vs/workbench/browser/parts/editor/media/close-big.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor/media/close-dark.svg b/src/vs/workbench/browser/parts/editor/media/close-dark.svg new file mode 100644 index 00000000000..e0475f7b85a --- /dev/null +++ b/src/vs/workbench/browser/parts/editor/media/close-dark.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/vs/workbench/browser/parts/editor/media/close-hc.svg b/src/vs/workbench/browser/parts/editor/media/close-hc.svg new file mode 100644 index 00000000000..64618b61760 --- /dev/null +++ b/src/vs/workbench/browser/parts/editor/media/close-hc.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/vs/workbench/browser/parts/editor/media/close-inverse.svg b/src/vs/workbench/browser/parts/editor/media/close-inverse.svg deleted file mode 100644 index f124ec94aa8..00000000000 --- a/src/vs/workbench/browser/parts/editor/media/close-inverse.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor/media/close-light.svg b/src/vs/workbench/browser/parts/editor/media/close-light.svg new file mode 100644 index 00000000000..3bd44674699 --- /dev/null +++ b/src/vs/workbench/browser/parts/editor/media/close-light.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/vs/workbench/browser/parts/editor/media/close-statusview-inverse.svg b/src/vs/workbench/browser/parts/editor/media/close-statusview-inverse.svg deleted file mode 100644 index ce0e5896405..00000000000 --- a/src/vs/workbench/browser/parts/editor/media/close-statusview-inverse.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor/media/close-statusview.svg b/src/vs/workbench/browser/parts/editor/media/close-statusview.svg deleted file mode 100644 index fde34404d4e..00000000000 --- a/src/vs/workbench/browser/parts/editor/media/close-statusview.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor/media/close.svg b/src/vs/workbench/browser/parts/editor/media/close.svg deleted file mode 100644 index 4a5227f6bf6..00000000000 --- a/src/vs/workbench/browser/parts/editor/media/close.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor/media/closeall-editors-inverse.svg b/src/vs/workbench/browser/parts/editor/media/closeall-editors-inverse.svg deleted file mode 100644 index 74e8dd8a024..00000000000 --- a/src/vs/workbench/browser/parts/editor/media/closeall-editors-inverse.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor/media/closeall-editors.svg b/src/vs/workbench/browser/parts/editor/media/closeall-editors.svg deleted file mode 100644 index 7250ff6b54e..00000000000 --- a/src/vs/workbench/browser/parts/editor/media/closeall-editors.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor/media/editorstatus.css b/src/vs/workbench/browser/parts/editor/media/editorstatus.css index 738b1dec826..4e10ebe3c39 100644 --- a/src/vs/workbench/browser/parts/editor/media/editorstatus.css +++ b/src/vs/workbench/browser/parts/editor/media/editorstatus.css @@ -51,10 +51,13 @@ } .vs .monaco-workbench .screen-reader-detected-explanation .cancel { - background: url('close-statusview.svg') center center no-repeat; + 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; } -.vs-dark .monaco-workbench .screen-reader-detected-explanation .cancel, .hc-black .monaco-workbench .screen-reader-detected-explanation .cancel { - background: url('close-statusview-inverse.svg') center center no-repeat; + 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 1e413fdae98..e8e15cfb2e5 100644 --- a/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css +++ b/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css @@ -226,12 +226,15 @@ } .vs .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty .close-editor-action:hover { - background: url('close.svg') center center no-repeat; + 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; } -.vs-dark .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty .close-editor-action:hover, .hc-black .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty .close-editor-action:hover { - background: url('close-inverse.svg') center center no-repeat; + background: url('close-hc.svg') center center no-repeat; } /* No Tab Close Button */ diff --git a/src/vs/workbench/browser/parts/editor/media/titlecontrol.css b/src/vs/workbench/browser/parts/editor/media/titlecontrol.css index 42358c52102..a4f3aadccec 100644 --- a/src/vs/workbench/browser/parts/editor/media/titlecontrol.css +++ b/src/vs/workbench/browser/parts/editor/media/titlecontrol.css @@ -57,12 +57,15 @@ /* Actions */ .monaco-workbench .part.editor > .content .editor-group-container > .title .close-editor-action { - background: url('close.svg') center center no-repeat; + 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; } -.vs-dark .monaco-workbench .part.editor > .content .editor-group-container > .title .close-editor-action, .hc-black .monaco-workbench .part.editor > .content .editor-group-container > .title .close-editor-action { - background: url('close-inverse.svg') center center no-repeat; + background: url('close-hc.svg') center center no-repeat; } /* Drag and Drop Feedback */ -- GitLab