diff --git a/build/gulpfile.common.js b/build/gulpfile.common.js index f0b21202ce8bbead2027efa6bcaa071f2168be5e..63b2b0b1773237aefd9b4f5f3cc0f53a3035fd91 100644 --- a/build/gulpfile.common.js +++ b/build/gulpfile.common.js @@ -42,9 +42,11 @@ exports.loaderConfig = function (emptyPaths) { 'vs': 'out-build/vs', 'vscode': 'empty:' }, - nodeModules: emptyPaths||[] + nodeModules: emptyPaths||[], }; + result['vs/css'] = { inlineResources: true }; + return result; }; diff --git a/src/vs/base/browser/ui/toolbar/toolbar.css b/src/vs/base/browser/ui/toolbar/toolbar.css index 425eb455375635a9799b85a9c450832e1bb63557..55f9069d03588c2a958139ac5ea5aa4c5e0f4ccc 100644 --- a/src/vs/base/browser/ui/toolbar/toolbar.css +++ b/src/vs/base/browser/ui/toolbar/toolbar.css @@ -29,20 +29,7 @@ background-image: url('ellipsis.svg'); } +.hc-black .monaco-toolbar .action-label.toolbar-toggle-more, .vs-dark .monaco-toolbar .action-label.toolbar-toggle-more { background-image: url('ellipsis-inverse.svg'); -} - -/* High Contrast Theming */ -.hc-black .monaco-toolbar .action-label.toolbar-toggle-more { - background: none; -} - -.hc-black .monaco-toolbar .action-label.toolbar-toggle-more:before { - content: url('ellipsis-inverse.svg'); - position: absolute; - top: 12px; - left: 8px; - height: 16px; - width: 16px; } \ No newline at end of file diff --git a/src/vs/base/parts/tree/browser/tree.css b/src/vs/base/parts/tree/browser/tree.css index 1f932ed2483c8100e20822a8d988248a4232697c..3f029712b7f53947246edffb7b133fb3c446ef1b 100644 --- a/src/vs/base/parts/tree/browser/tree.css +++ b/src/vs/base/parts/tree/browser/tree.css @@ -157,40 +157,40 @@ } /* Default style */ -.monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.focused:not(.highlighted) { background-color: #DCEBFC; } -.monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected:not(.highlighted) { background-color: #4FA7FF; color: white; } -.monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.focused.selected:not(.highlighted) { background-color: #3399FF; color: white; } -.monaco-tree .monaco-tree-rows > .monaco-tree-row.selected:not(.highlighted) { background-color: #CCCEDB; } +.monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.focused:not(.highlighted) { background-color: #DCEBFC; } +.monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected:not(.highlighted) { background-color: #4FA7FF; color: white; } +.monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.focused.selected:not(.highlighted) { background-color: #3399FF; color: white; } +.monaco-tree .monaco-tree-rows > .monaco-tree-row.selected:not(.highlighted) { background-color: #CCCEDB; } .monaco-tree .monaco-tree-rows > .monaco-tree-row:hover:not(.highlighted):not(.selected):not(.focused) { background-color: #F0F0F0; } .monaco-tree .monaco-tree-wrapper.drop-target, -.monaco-tree .monaco-tree-rows > .monaco-tree-row.drop-target { background-color: #DDECFF !important; color: inherit !important; } +.monaco-tree .monaco-tree-rows > .monaco-tree-row.drop-target { background-color: #DDECFF !important; color: inherit !important; } -.monaco-tree .monaco-tree-rows > .monaco-tree-row.has-children > .content:before { border-color: transparent; border-left-color: #A6A6A6; } -.monaco-tree .monaco-tree-rows > .monaco-tree-row.has-children > .content:after { border-color: transparent; border-left-color: #F6F6F6; } -.monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected.has-children > .content:before { border-left-color: white; } -.monaco-tree .monaco-tree-rows > .monaco-tree-row.selected.has-children > .content:before { border-left-color: #646465; } -.monaco-tree .monaco-tree-rows > .monaco-tree-row.has-children:hover:not(.selected):not(.focused) > .content:after { border-left-color: #f0f0f0; } -.monaco-tree .monaco-tree-rows > .monaco-tree-row.selected.has-children > .content:after { border-left-color: #CCCEDB; } -.monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected.has-children > .content:after { border-left-color: #3399FF; } +.monaco-tree .monaco-tree-rows > .monaco-tree-row.has-children > .content:before { border-color: transparent; border-left-color: #A6A6A6; } +.monaco-tree .monaco-tree-rows > .monaco-tree-row.has-children > .content:after { border-color: transparent; border-left-color: #F6F6F6; } +.monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected.has-children > .content:before { border-left-color: white; } +.monaco-tree .monaco-tree-rows > .monaco-tree-row.selected.has-children > .content:before { border-left-color: #646465; } +.monaco-tree .monaco-tree-rows > .monaco-tree-row.has-children:hover:not(.selected):not(.focused) > .content:after { border-left-color: #f0f0f0; } +.monaco-tree .monaco-tree-rows > .monaco-tree-row.selected.has-children > .content:after { border-left-color: #CCCEDB; } +.monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected.has-children > .content:after { border-left-color: #3399FF; } .monaco-tree .monaco-tree-rows > .monaco-tree-row.expanded > .content:before { border-color: transparent; border-right-color: #646465; } -.monaco-tree .monaco-tree-rows > .monaco-tree-row.expanded > .content:after { border-color: transparent; } +.monaco-tree .monaco-tree-rows > .monaco-tree-row.expanded > .content:after { border-color: transparent; } .monaco-tree .monaco-tree-rows > .monaco-tree-row.selected.expanded > .content:before { border-left-color: transparent; } .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected.expanded > .content:before { border-right-color: white; border-left-color: transparent; } /* VS Dark */ -.vs-dark .monaco-tree.focused .monaco-tree-row.focused:not(.highlighted) { background-color: #073655; } -.vs-dark .monaco-tree.focused .monaco-tree-row.selected:not(.highlighted) { background-color: #0E639C; color: white; } +.vs-dark .monaco-tree.focused .monaco-tree-row.focused:not(.highlighted) { background-color: #073655; } +.vs-dark .monaco-tree.focused .monaco-tree-row.selected:not(.highlighted) { background-color: #0E639C; color: white; } .vs-dark .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.focused.selected:not(.highlighted) { background-color: #094771; color: white; } -.vs-dark .monaco-tree .monaco-tree-row.selected:not(.highlighted) { background-color: #3F3F46; } +.vs-dark .monaco-tree .monaco-tree-row.selected:not(.highlighted) { background-color: #3F3F46; } .vs-dark .monaco-tree .monaco-tree-row:hover:not(.highlighted):not(.selected):not(.focused) { background-color: #2A2D2E; } .vs-dark .monaco-tree-wrapper.drop-target, -.vs-dark .monaco-tree .monaco-tree-row.drop-target { background-color: #383B3D !important; color: inherit !important; } +.vs-dark .monaco-tree .monaco-tree-row.drop-target { background-color: #383B3D !important; color: inherit !important; } /* VS Dark twistie */ -.vs-dark .monaco-tree .monaco-tree-rows > .monaco-tree-row.has-children > .content:before { border-left-color: #D4D4D4; } -.vs-dark .monaco-tree .monaco-tree-rows > .monaco-tree-row.has-children > .content:after { border-left-color: #252526; } -.vs-dark .monaco-tree .monaco-tree-rows > .monaco-tree-row.expanded > .content:before { border-left-color: transparent; border-right-color: #D4D4D4; } +.vs-dark .monaco-tree .monaco-tree-rows > .monaco-tree-row.has-children > .content:before { border-left-color: #D4D4D4; } +.vs-dark .monaco-tree .monaco-tree-rows > .monaco-tree-row.has-children > .content:after { border-left-color: #252526; } +.vs-dark .monaco-tree .monaco-tree-rows > .monaco-tree-row.expanded > .content:before { border-left-color: transparent; border-right-color: #D4D4D4; } .vs-dark .monaco-tree .monaco-tree-rows > .monaco-tree-row.has-children:hover:not(.selected):not(.focused) > .content:after { border-left-color: #2A2D2E; } .vs-dark .monaco-tree .monaco-tree-rows > .monaco-tree-row.has-children.loading > .content:before { @@ -198,13 +198,13 @@ } /* High Contrast Theming */ -.hc-black .monaco-tree .monaco-tree-rows > .monaco-tree-row { background: none !important; } +.hc-black .monaco-tree .monaco-tree-rows > .monaco-tree-row { background: none !important; border: 1px solid transparent; } .hc-black .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.focused:not(.highlighted) { border: 1px dotted #f38518; } -.hc-black .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected:not(.highlighted) { border: 1px solid #f38518; } +.hc-black .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected:not(.highlighted) { border: 1px solid #f38518; } .hc-black .monaco-tree .monaco-tree-rows > .monaco-tree-row.selected:not(.highlighted) { border: 1px solid #f38518; } -.hc-black .monaco-tree .monaco-tree-rows > .monaco-tree-row:hover:not(.highlighted):not(.selected):not(.focused) { border: 1px dashed #f38518; margin-top:-1px; margin-bottom:1px; margin-left:-1px; } +.hc-black .monaco-tree .monaco-tree-rows > .monaco-tree-row:hover:not(.highlighted):not(.selected):not(.focused) { border: 1px dashed #f38518; } .hc-black .monaco-tree .monaco-tree-wrapper.drop-target, -.hc-black .monaco-tree .monaco-tree-rows > .monaco-tree-row.drop-target { background: none !important; border: 1px dashed #f38518; } +.hc-black .monaco-tree .monaco-tree-rows > .monaco-tree-row.drop-target { background: none !important; border: 1px dashed #f38518; } .hc-black .monaco-tree .monaco-tree-rows > .monaco-tree-row.has-children > .content:before { border: none; diff --git a/src/vs/workbench/browser/parts/activitybar/media/activityaction.css b/src/vs/workbench/browser/parts/activitybar/media/activityaction.css index cf2c22953ad1e5e0e713810929e6bc19dbaad394..498adcfb10b8d114c30451cbfa11ea58aff4573d 100644 --- a/src/vs/workbench/browser/parts/activitybar/media/activityaction.css +++ b/src/vs/workbench/browser/parts/activitybar/media/activityaction.css @@ -135,6 +135,7 @@ } .hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar .action-label:before { + content: ""; opacity: 0.6; position: absolute; top: 4px; diff --git a/src/vs/workbench/browser/parts/editor/media/editorpart.css b/src/vs/workbench/browser/parts/editor/media/editorpart.css index 7e0f7a7161af7ecd96d07f4a80b7b0fb9c712f2d..aa16e74456086fe036dcd0a112dbbc4207ee05fd 100644 --- a/src/vs/workbench/browser/parts/editor/media/editorpart.css +++ b/src/vs/workbench/browser/parts/editor/media/editorpart.css @@ -50,4 +50,4 @@ .hc-black .monaco-workbench .part.editor.empty { background-image: url('./letterpress-dark@2x.png'); } -} +} \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor/media/tabstitle.css b/src/vs/workbench/browser/parts/editor/media/tabstitle.css index 6a784cc06258d1ed02b637ae3ac10fdd2114e987..eb188c0706de161db0b04e0400fe9ac1dc7e95dd 100644 --- a/src/vs/workbench/browser/parts/editor/media/tabstitle.css +++ b/src/vs/workbench/browser/parts/editor/media/tabstitle.css @@ -91,20 +91,6 @@ background-color: #2D2D2D; } -.vs .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab .tab-label, -.hc-black .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab .tab-label { - opacity: 0.7 !important; -} - -.vs-dark .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab .tab-label { - opacity: 0.5 !important; -} - -.vs-dark .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab.active .tab-label, -.monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab.dropfeedback .tab-label { - opacity: 1 !important; -} - .vs .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab { border-left-color: #DDDDDD; } @@ -154,6 +140,23 @@ margin-bottom: auto; } +.vs .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab .tab-label { + opacity: 0.7 !important; +} + +.vs-dark .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab .tab-label { + opacity: 0.5 !important; +} + +.vs-dark .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab.active .tab-label, +.monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab.dropfeedback .tab-label { + opacity: 1 !important; +} + +.hc-black .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab .tab-label { + opacity: 1 !important; +} + /* Tab Close */ .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab > .tab-close { @@ -162,16 +165,16 @@ width: 28px; } -.monaco-workbench > .part.editor > .content > .one-editor-container > .title.active .tabs-container > .tab.active > .tab-close .action-label, /* always show it for active tab */ -.monaco-workbench > .part.editor > .content > .one-editor-container > .title.active .tabs-container > .tab > .tab-close .action-label:focus, /* always show it on focus */ -.monaco-workbench > .part.editor > .content > .one-editor-container > .title.active .tabs-container > .tab:hover > .tab-close .action-label, /* always show it on hover */ +.monaco-workbench > .part.editor > .content > .one-editor-container > .title.active .tabs-container > .tab.active > .tab-close .action-label, /* always show it for active tab */ +.monaco-workbench > .part.editor > .content > .one-editor-container > .title.active .tabs-container > .tab > .tab-close .action-label:focus, /* always show it on focus */ +.monaco-workbench > .part.editor > .content > .one-editor-container > .title.active .tabs-container > .tab:hover > .tab-close .action-label, /* always show it on hover */ .monaco-workbench > .part.editor > .content > .one-editor-container > .title.active .tabs-container > .tab.active:hover > .tab-close .action-label, /* always show it on hover */ .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab.dirty > .tab-close .action-label { /* always show it for dirty tabs */ opacity: 1; } .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab.active > .tab-close .action-label, /* show dimmed for inactive group */ -.monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab.active:hover > .tab-close .action-label { /* show dimmed for inactive group */ +.monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab.active:hover > .tab-close .action-label { /* show dimmed for inactive group */ opacity: 0.5; } @@ -190,11 +193,16 @@ margin-right: 0.5em; } +.hc-black .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab > .tab-close .action-label { + opacity: 1 !important; +} + .vs .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab.dirty .close-editor-action { background: url('close-dirty.svg') center center no-repeat; } -.vs-dark .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab.dirty .close-editor-action { +.vs-dark .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab.dirty .close-editor-action, +.hc-black .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab.dirty .close-editor-action { background: url('close-dirty-inverse.svg') center center no-repeat; } @@ -202,22 +210,9 @@ background: url('close.svg') center center no-repeat; } -.vs-dark .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab.dirty .close-editor-action:hover { - background: url('close-inverse.svg') center center no-repeat; -} - -.hc-black .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab.dirty .close-editor-action, -.hc-black .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab.dirty .close-editor-action:hover { - background: none; -} - -.hc-black .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab.dirty .close-editor-action { - content: url('close-dirty-inverse.svg'); -} - -.hc-black .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab .close-editor-action, +.vs-dark .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab.dirty .close-editor-action:hover, .hc-black .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab.dirty .close-editor-action:hover { - content: url('close-inverse.svg'); + background: url('close-inverse.svg') center center no-repeat; } /* Group Actions */ diff --git a/src/vs/workbench/browser/parts/editor/media/textdiffeditor.css b/src/vs/workbench/browser/parts/editor/media/textdiffeditor.css index 93b7016896c758c638e7e0166221be6823b3b602..58ac50f9b94f34f0e1ec3834a068a3bc93a8163d 100644 --- a/src/vs/workbench/browser/parts/editor/media/textdiffeditor.css +++ b/src/vs/workbench/browser/parts/editor/media/textdiffeditor.css @@ -11,27 +11,12 @@ background: url('previous-diff.svg') center center no-repeat; } -.vs-dark .monaco-workbench .textdiff-editor-action.next { +.vs-dark .monaco-workbench .textdiff-editor-action.next, +.hc-black .monaco-workbench .textdiff-editor-action.next { background: url('next-diff-inverse.svg') center center no-repeat; } -.vs-dark .monaco-workbench .textdiff-editor-action.previous { +.vs-dark .monaco-workbench .textdiff-editor-action.previous, +.hc-black .monaco-workbench .textdiff-editor-action.previous { background: url('previous-diff-inverse.svg') center center no-repeat; -} - -/* High Contrast Theming */ -.hc-black .monaco-workbench .textdiff-editor-action:before { - position: absolute; - top: 12px; - left: 8px; - height: 16px; - width: 16px; -} - -.hc-black .monaco-workbench .textdiff-editor-action.next:before { - content: url('next-diff-inverse.svg'); -} - -.hc-black .monaco-workbench .textdiff-editor-action.previous:before { - content: url('previous-diff-inverse.svg'); } \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor/media/titlecontrol.css b/src/vs/workbench/browser/parts/editor/media/titlecontrol.css index 47d1dcd310eb7458d50cdb80f3dc342fda4ef974..94a4f1275037f7075c3227eeb95b1149a07c3e7e 100644 --- a/src/vs/workbench/browser/parts/editor/media/titlecontrol.css +++ b/src/vs/workbench/browser/parts/editor/media/titlecontrol.css @@ -94,7 +94,8 @@ background: url('close.svg') center center no-repeat; } -.vs-dark .monaco-workbench .close-editor-action { +.vs-dark .monaco-workbench .close-editor-action, +.hc-black .monaco-workbench .close-editor-action { background: url('close-inverse.svg') center center no-repeat; } @@ -102,7 +103,8 @@ background: url('split-editor.svg') center center no-repeat; } -.vs-dark .monaco-workbench .split-editor-action { +.vs-dark .monaco-workbench .split-editor-action, +.hc-black .monaco-workbench .split-editor-action { background: url('split-editor-inverse.svg') center center no-repeat; } @@ -110,41 +112,7 @@ background: url('stackview.svg') center center no-repeat; } -.vs-dark .monaco-workbench .show-group-editors-action { +.vs-dark .monaco-workbench .show-group-editors-action, +.hc-black .monaco-workbench .show-group-editors-action { background: url('stackview-inverse.svg') center center no-repeat; -} - -/* High Contrast Icons */ - -.hc-black .monaco-workbench .close-editor-action, -.hc-black .monaco-workbench .show-group-editors-action, -.hc-black .monaco-workbench .split-editor-action { - background: none; -} - -.hc-black .monaco-workbench .show-group-editors-action:before { - content: url('stackview-inverse.svg'); - position: absolute; - top: 12px; - left: 8px; - height: 16px; - width: 16px; -} - -.hc-black .monaco-workbench .close-editor-action:before { - content: url('close-inverse.svg'); - position: absolute; - top: 12px; - left: 8px; - height: 16px; - width: 16px; -} - -.hc-black .monaco-workbench .split-editor-action:before { - content: url('split-editor-inverse.svg'); - position: absolute; - top: 12px; - left: 8px; - height: 16px; - width: 16px; } \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/panel/media/panelpart.css b/src/vs/workbench/browser/parts/panel/media/panelpart.css index 99d9a1a7a394687c5e18091de113a144a80fed6d..29a8f145fc664a7a2bfebe801ffc6d5580670c49 100644 --- a/src/vs/workbench/browser/parts/panel/media/panelpart.css +++ b/src/vs/workbench/browser/parts/panel/media/panelpart.css @@ -23,25 +23,12 @@ background: url('hide.svg') center center no-repeat; } -.vs-dark .monaco-workbench .hide-panel-action { +.vs-dark .monaco-workbench .hide-panel-action, +.hc-black .monaco-workbench .hide-panel-action { background: url('hide-inverse.svg') center center no-repeat; } /* High Contrast Theming */ .hc-black .monaco-workbench > .part.panel > .title { border-top-color: #6FC3DF; -} - -.hc-black .monaco-workbench .hide-panel-action { - background: none; -} - -.hc-black .monaco-workbench .hide-panel-action:before { - content: url('hide-inverse.svg'); - position: absolute; - top: 12px; - left: 8px; - height: 16px; - width: 16px; -} - +} \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css b/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css index 967bc1115d77571c493745eebec56de54f6bfb32..8c9f24fba7ba04b6772b4e40da81197abf6905b4 100644 --- a/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css +++ b/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css @@ -74,4 +74,4 @@ .hc-black .monaco-workbench > .part.statusbar { border-top: 1px solid #6FC3DF; background-color: #000; -} +} \ No newline at end of file diff --git a/src/vs/workbench/electron-browser/media/shell.css b/src/vs/workbench/electron-browser/media/shell.css index ecf5815a86619435cfeedeb214eec97c6a6fd9d6..61c2d0dcc6164da4a0c5cf895343f34cbe1eef47 100644 --- a/src/vs/workbench/electron-browser/media/shell.css +++ b/src/vs/workbench/electron-browser/media/shell.css @@ -249,9 +249,8 @@ a:active { background-color: #E1E1E1; } -/** - * Dark Theme - */ +/* ---------- Dark Theme ---------- */ + .monaco-shell.vs-dark { color: #BBB; background-color: #1E1E1E; @@ -278,9 +277,8 @@ a:active { background-color: #333; } -/** - * High Contrast Theme - */ +/* ---------- High Contrast Theme ---------- */ + .monaco-shell.hc-black { color: #fff; background-color: #000; } .monaco-shell.hc-black .context-view .tooltip { diff --git a/src/vs/workbench/electron-browser/media/workbench.css b/src/vs/workbench/electron-browser/media/workbench.css index addf9d6594df408caa31bf0eb0f2e6f38ea9db3a..d9601b2c0edb2ab1f78b6996977dbcb858e00cad 100644 --- a/src/vs/workbench/electron-browser/media/workbench.css +++ b/src/vs/workbench/electron-browser/media/workbench.css @@ -122,7 +122,7 @@ .hc-black .monaco-workbench { color: #FFF; background-color: #000; } -.hc-black .monaco-workbench .sidebar .separator { background-color: #000; border: 1px solid #6FC3DF; } +.hc-black .monaco-workbench .sidebar .separator { background-color: #000; border: 1px solid #6FC3DF; } .hc-black .monaco-workbench input, .hc-black .monaco-workbench textarea { diff --git a/src/vs/workbench/parts/debug/browser/media/debug.contribution.css b/src/vs/workbench/parts/debug/browser/media/debug.contribution.css index b4d3f658b9ecc5be90c330b515103124579e2c6e..33eda9e73c1593fc1cba87fab658ebe534afac8f 100644 --- a/src/vs/workbench/parts/debug/browser/media/debug.contribution.css +++ b/src/vs/workbench/parts/debug/browser/media/debug.contribution.css @@ -5,8 +5,7 @@ /* Activity Bar */ .monaco-workbench > .activitybar .monaco-action-bar .action-label.debug { - /* Inline icon to prevent slow loading on startup (original: debug.svg) */ - background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgdmlld0JveD0iMCAwIDMyIDMyIj48c3R5bGUgdHlwZT0idGV4dC9jc3MiPi5pY29uLWNhbnZhcy10cmFuc3BhcmVudHtvcGFjaXR5OjA7ZmlsbDojRjZGNkY2O30gLmljb24td2hpdGV7ZmlsbDojRkZGRkZGO308L3N0eWxlPjxwYXRoIGNsYXNzPSJpY29uLWNhbnZhcy10cmFuc3BhcmVudCIgZD0iTTMyIDMySDBWMGgzMnYzMnoiIGlkPSJjYW52YXMiLz48ZyBpZD0iaWNvbkJnIj48cGF0aCBjbGFzcz0iaWNvbi13aGl0ZSIgZD0iTTE3IDE5LjQ4OHY0LjI0OGMwIC40NjIuMDkgMS4yNjQtLjM3MyAxLjI2NEgxNXYtMWgxdi0zLjE5bC0uMTczLS4xOGMtMS40NTMgMS4yMDUtMy41MjggMS4yNDgtNC42Ny4xMDhDMTAgMTkuNTc4IDEwLjExOCAxOCAxMS4zNzYgMTZIOHYxSDd2LTEuNjI3QzcgMTQuOTEgNy44MDIgMTUgOC4yNjQgMTVoNC4xMDVMMTcgMTkuNDg4ek0xNCA5aC0xVjhoMS45NTVjLjQ2IDAgMS4wNDUuMjIgMS4wNDUuNjgydjMuMzQ1bC43MzYuODc1Yy4xOC0uOTczLjg5LTEuNzEgMS45MTQtMS43MS4xNDMgMCAuMzUuMDE0LjM1LjA0VjloMXYyLjYxOGMwIC4xMTcuMjY1LjM4Mi4zODIuMzgySDIzdjFoLTIuMjMzYy4wMjcgMCAuMDQyLjE1NC4wNDIuMjk4IDAgMS4wMjUtLjc0IDEuNzUzLTEuNzEyIDEuOTMybC44NzUuNzdIMjMuMzE4Yy40NjIgMCAuNjgyLjU4My42ODIgMS4wNDVWMTloLTF2LTFoLTIuNTJMMTQgMTEuNjk4Vjl6TTE2IDRDOS4zNzMgNCA0IDkuMzczIDQgMTZzNS4zNzMgMTIgMTIgMTIgMTItNS4zNzMgMTItMTJTMjIuNjI3IDQgMTYgNHptMTAgMTJjMCAyLjM5Ny0uODUgNC42LTIuMjYyIDYuMzI0TDkuNjc2IDguMjYyQzExLjQgNi44NSAxMy42MDIgNiAxNiA2YzUuNTE0IDAgMTAgNC40ODYgMTAgMTB6TTYgMTZjMC0yLjM5OC44NS00LjYgMi4yNjItNi4zMjRMMjIuMzI0IDIzLjc0QzIwLjYgMjUuMTUgMTguMzk3IDI2IDE2IDI2Yy01LjUxNCAwLTEwLTQuNDg2LTEwLTEweiIvPjwvZz48L3N2Zz4='); + background-image: url('debug.svg'); } .monaco-editor .debug-top-stack-frame-line { @@ -287,44 +286,52 @@ background: url('stackframe-and-breakpoint-dark.svg') center center no-repeat; } -.vs-dark .monaco-workbench .debug-action.step-over { +.vs-dark .monaco-workbench .debug-action.step-over, +.vs-dark .monaco-workbench .debug-action.step-back, +.hc-black .monaco-workbench .debug-action.step-over, +.hc-black .monaco-workbench .debug-action.step-back { background: url('step-over-inverse.svg') center center no-repeat; } -.vs-dark .monaco-workbench .debug-action.step-into { +.vs-dark .monaco-workbench .debug-action.step-into, +.hc-black .monaco-workbench .debug-action.step-into { background: url('step-into-inverse.svg') center center no-repeat; } -.vs-dark .monaco-workbench .debug-action.step-out { +.vs-dark .monaco-workbench .debug-action.step-out, +.hc-black .monaco-workbench .debug-action.step-out { background: url('step-out-inverse.svg') center center no-repeat; } -.vs-dark .monaco-workbench .debug-action.step-back { - background: url('step-over-inverse.svg') center center no-repeat; +.vs-dark .monaco-workbench .debug-action.step-back, +.hc-black .monaco-workbench .debug-action.step-back { transform: scaleX(-1); } -.vs-dark .monaco-workbench .debug-action.continue { - background: url('continue-inverse.svg') center center no-repeat; -} - -.vs-dark .monaco-workbench .debug-action.start { +.vs-dark .monaco-workbench .debug-action.continue, +.vs-dark .monaco-workbench .debug-action.start, +.hc-black .monaco-workbench .debug-action.continue, +.hc-black .monaco-workbench .debug-action.start { background: url('continue-inverse.svg') center center no-repeat; } -.vs-dark .monaco-workbench .debug-action.restart { +.vs-dark .monaco-workbench .debug-action.restart, +.hc-black .monaco-workbench .debug-action.restart { background: url('restart-inverse.svg') center center no-repeat; } -.vs-dark .monaco-workbench .debug-action.pause { +.vs-dark .monaco-workbench .debug-action.pause, +.hc-black .monaco-workbench .debug-action.pause { background: url('pause-inverse.svg') center center no-repeat; } -.vs-dark .monaco-workbench .debug-action.stop { +.vs-dark .monaco-workbench .debug-action.stop, +.hc-black .monaco-workbench .debug-action.stop { background: url('stop-inverse.svg') center center no-repeat; } -.vs-dark .monaco-workbench .debug-action.clear-repl { +.vs-dark .monaco-workbench .debug-action.clear-repl, +.hc-black .monaco-workbench .debug-action.clear-repl { background: url('clear-repl-inverse.svg') center center no-repeat; } @@ -339,56 +346,7 @@ color: inherit; } -.hc-black .monaco-workbench > .activitybar .monaco-action-bar .action-label.debug:before { - content: url('debug.svg'); -} - -.hc-black .monaco-workbench .debug-action { - background: none; -} - .hc-black .monaco-workbench .debug-actions-widget { background-color: #333; box-shadow: 0 2px 8px #000; -} - -.hc-black .monaco-workbench .debug-action.step-over { - background: url('step-over-inverse.svg') center center no-repeat; -} - -.hc-black .monaco-workbench .debug-action.step-into { - background: url('step-into-inverse.svg') center center no-repeat; -} - -.hc-black .monaco-workbench .debug-action.step-out { - background: url('step-out-inverse.svg') center center no-repeat; -} - -.hc-black .monaco-workbench .debug-action.step-back { - background: url('step-over-inverse.svg') center center no-repeat; - transform: scaleX(-1); -} - -.hc-black .monaco-workbench .debug-action.continue { - background: url('continue-inverse.svg') center center no-repeat; -} - -.hc-black .monaco-workbench .debug-action.start { - background: url('continue-inverse.svg') center center no-repeat; -} - -.hc-black .monaco-workbench .debug-action.restart { - background: url('restart-inverse.svg') center center no-repeat; -} - -.hc-black .monaco-workbench .debug-action.pause { - background: url('pause-inverse.svg') center center no-repeat; -} - -.hc-black .monaco-workbench .debug-action.stop { - background: url('stop-inverse.svg') center center no-repeat; -} - -.hc-black .monaco-workbench .debug-action.clear-repl { - background: url('clear-repl-inverse.svg') center center no-repeat; } \ No newline at end of file diff --git a/src/vs/workbench/parts/debug/browser/media/debugViewlet.css b/src/vs/workbench/parts/debug/browser/media/debugViewlet.css index 49f1f990a9b567b73433493e794dc97642162c6f..fd3f7a5e0b0b98d5d3babf8d6158f3d49884c67c 100644 --- a/src/vs/workbench/parts/debug/browser/media/debugViewlet.css +++ b/src/vs/workbench/parts/debug/browser/media/debugViewlet.css @@ -264,7 +264,8 @@ } .vs-dark .debug-viewlet .debug-action.add-watch-expression, -.vs-dark .debug-viewlet .debug-action.add-function-breakpoint { +.vs-dark .debug-viewlet .debug-action.add-function-breakpoint, +.hc-black .debug-viewlet .debug-action.add-watch-expression { background: url('add-inverse.svg') center center no-repeat; } @@ -307,23 +308,23 @@ background: url('breakpoints-activate.svg') center center no-repeat; } -.debug-viewlet .focused .monaco-tree-row.selected:not(.highlighted) > .content.actions .debug-action.remove { +.debug-viewlet .focused .monaco-tree-row.selected:not(.highlighted) > .content.actions .debug-action.remove, +.vs-dark .debug-viewlet .focused .monaco-tree-row.selected:not(.highlighted) > .content.actions .debug-action.remove { background: url("remove-focus.svg") center center no-repeat; } -.vs-dark .debug-viewlet .debug-action.remove { +.vs-dark .debug-viewlet .debug-action.remove, +.hc-black .debug-viewlet .debug-action.remove { background: url('remove-inverse.svg') center center no-repeat; } -.vs-dark .debug-viewlet .debug-action.remove-all { +.vs-dark .debug-viewlet .debug-action.remove-all, +.hc-black .debug-viewlet .debug-action.remove-all { background: url('remove-all-inverse.svg') center center no-repeat; } -.vs-dark .debug-viewlet .focused .monaco-tree-row.selected:not(.highlighted) > .content.actions .debug-action.remove { - background: url("remove-focus.svg") center center no-repeat; -} - -.vs-dark .debug-viewlet .debug-action.breakpoints-activate { +.vs-dark .debug-viewlet .debug-action.breakpoints-activate, +.hc-black .debug-viewlet .debug-action.breakpoints-activate { background: url('breakpoints-activate-inverse.svg') center center no-repeat; } @@ -343,20 +344,4 @@ background-color: #3C3C3C; border-color: #3C3C3C; color: rgb(204, 204, 204); -} - -.hc-black .debug-viewlet .debug-action.remove { - content: url('remove-inverse.svg'); -} - -.hc-black .debug-viewlet .debug-action.add-watch-expression { - background: url('add-inverse.svg') center center no-repeat; -} - -.hc-black .debug-viewlet .debug-action.breakpoints-activate { - background: url('breakpoints-activate-inverse.svg') center center no-repeat; -} - -.hc-black .debug-viewlet .debug-action.remove-all { - background: url('remove-all-inverse.svg') center center no-repeat; -} +} \ No newline at end of file diff --git a/src/vs/workbench/parts/extensions/electron-browser/media/extensionActions.css b/src/vs/workbench/parts/extensions/electron-browser/media/extensionActions.css index fc0b00d496f1efb96b9bc4164813c1fb65d8f51f..5e20b8f62331799cc4377939b6b6c840c97e66f7 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/media/extensionActions.css +++ b/src/vs/workbench/parts/extensions/electron-browser/media/extensionActions.css @@ -62,7 +62,8 @@ background: url('clear.svg') center center no-repeat; } -.vs-dark .monaco-action-bar .action-item .action-label.clear-extensions { +.vs-dark .monaco-action-bar .action-item .action-label.clear-extensions, +.hc-black .monaco-action-bar .action-item .action-label.clear-extensions { background: url('clear-inverse.svg') center center no-repeat; } @@ -77,8 +78,4 @@ .monaco-action-bar .action-item.disabled .action-label.extension-action.update, .monaco-action-bar .action-item.disabled .action-label.extension-action.enable { display: none; -} - -.hc-black .monaco-action-bar .action-item .action-label.clear-extensions { - background: url('clear-inverse.svg') center center no-repeat; } \ No newline at end of file diff --git a/src/vs/workbench/parts/feedback/browser/media/feedback.css b/src/vs/workbench/parts/feedback/browser/media/feedback.css index 79956dde5e9866d3716947b9f22920e38711d63d..4d2664f9ad710a8d40556a842d3a208c4e81db59 100644 --- a/src/vs/workbench/parts/feedback/browser/media/feedback.css +++ b/src/vs/workbench/parts/feedback/browser/media/feedback.css @@ -252,7 +252,8 @@ color: #D4D4D4; } -.monaco-shell.vs-dark .feedback-form .cancel { +.monaco-shell.vs-dark .feedback-form .cancel, +.monaco-shell.hc-black .feedback-form .cancel { background: url('close-dark.svg') center center no-repeat; } @@ -322,7 +323,6 @@ float: right; } .monaco-shell.hc-black .feedback-form .cancel { - background: none; opacity: 0.6; } @@ -330,15 +330,6 @@ opacity: 1; } -.monaco-shell.hc-black .feedback-form .cancel:before { - content: url('close-dark.svg'); - position: relative; - top: 4px; - left: 6px; - height: 32px; - width: 32px; -} - .monaco-shell.hc-black .feedback-form .form-buttons .send, .monaco-shell.hc-black .feedback-form .form-buttons .send.in-progress, .monaco-shell.hc-black .feedback-form .form-buttons .send.success { @@ -352,7 +343,6 @@ } .monaco-shell.hc-black .feedback-form .sentiment { - background: none; border: 1px solid transparent; } @@ -360,23 +350,6 @@ border: 1px solid #f38518; } -.monaco-shell.hc-black .feedback-form .sentiment:before { - height: 21px; - width: 21px; - display: inline-block; - position: relative; - top: 3px; - left: 3px; -} - -.monaco-shell.hc-black .feedback-form .sentiment.smile:before { - content: url('happy.svg'); -} - -.monaco-shell.hc-black .feedback-form .sentiment.frown:before { - content: url('sad.svg'); -} - .monaco-shell .feedback-form .infotip { background: none; } diff --git a/src/vs/workbench/parts/files/browser/media/explorerviewlet.css b/src/vs/workbench/parts/files/browser/media/explorerviewlet.css index 8aae35cae5f0b6d75ead4c8e79039aa4fb7c25e9..71b00d09fc5689d2cf04f0d3777d667b4f99d246 100644 --- a/src/vs/workbench/parts/files/browser/media/explorerviewlet.css +++ b/src/vs/workbench/parts/files/browser/media/explorerviewlet.css @@ -69,10 +69,6 @@ padding: 0 20px 0 20px; } -.explorer-viewlet .action-close-all-files { - background: url("closeall.svg") center center no-repeat; -} - .explorer-viewlet .explorer-item .monaco-inputbox { width: 100%; line-height: normal; @@ -117,11 +113,6 @@ font-weight: 300; /* makes the italic font appear the same as normal */ } -/* Theming */ -.vs-dark .monaco-workbench .explorer-viewlet .action-close-all-files { - background: url("closeall_inverse.svg") center center no-repeat; -} - /* High Contrast Theming */ .hc-black .monaco-workbench .explorer-viewlet .explorer-item, .hc-black .monaco-workbench .explorer-viewlet .open-editor, diff --git a/src/vs/workbench/parts/files/browser/media/fileactions.css b/src/vs/workbench/parts/files/browser/media/fileactions.css index 379e47de13c6c3fc92c8bb37c41d5f6075b9b0f8..f1acdf531566afa9f1c8dabf4541394c7ac2bdfa 100644 --- a/src/vs/workbench/parts/files/browser/media/fileactions.css +++ b/src/vs/workbench/parts/files/browser/media/fileactions.css @@ -3,6 +3,15 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +.monaco-workbench .explorer-viewlet .action-close-all-files { + background: url("closeall.svg") center center no-repeat; +} + +.vs-dark .monaco-workbench .explorer-viewlet .action-close-all-files, +.hc-black .monaco-workbench .explorer-viewlet .action-close-all-files { + background: url("closeall_inverse.svg") center center no-repeat; +} + .monaco-workbench .explorer-action.new-file { background: url('AddFile.svg') center center no-repeat; } @@ -11,11 +20,13 @@ background: url('saveall.svg') center center no-repeat; } -.vs-dark .monaco-workbench .explorer-action.save-all { +.vs-dark .monaco-workbench .explorer-action.save-all, +.hc-blck .monaco-workbench .explorer-action.save-all { background: url('saveall_inverse.svg') center center no-repeat; } -.vs-dark .monaco-workbench .explorer-action.new-file { +.vs-dark .monaco-workbench .explorer-action.new-file, +.hc-black .monaco-workbench .explorer-action.new-file { background: url('AddFile_inverse.svg') center center no-repeat; } @@ -23,7 +34,8 @@ background: url('AddFolder.svg') center center no-repeat; } -.vs-dark .monaco-workbench .explorer-action.new-folder { +.vs-dark .monaco-workbench .explorer-action.new-folder, +.hc-black .monaco-workbench .explorer-action.new-folder { background: url('AddFolder_inverse.svg') center center no-repeat; } @@ -31,7 +43,8 @@ background: url('Refresh.svg') center center no-repeat; } -.vs-dark .monaco-workbench .explorer-action.refresh-explorer { +.vs-dark .monaco-workbench .explorer-action.refresh-explorer, +.hc-black .monaco-workbench .explorer-action.refresh-explorer { background: url('Refresh_inverse.svg') center center no-repeat; } @@ -39,7 +52,8 @@ background: url('CollapseAll.svg') center center no-repeat; } -.vs-dark .monaco-workbench .explorer-action.collapse-explorer { +.vs-dark .monaco-workbench .explorer-action.collapse-explorer, +.hc-black .monaco-workbench .explorer-action.collapse-explorer { background: url('CollapseAll_inverse.svg') center center no-repeat; } @@ -47,7 +61,8 @@ background-image: url('SplitEditor.svg'); } -.vs-dark .monaco-workbench .quick-open-sidebyside { +.vs-dark .monaco-workbench .quick-open-sidebyside, +.hc-black .monaco-workbench .quick-open-sidebyside { background-image: url('SplitEditor_inverse.svg'); } @@ -71,7 +86,8 @@ background: url('Preview.svg') center center no-repeat; } -.vs-dark .monaco-workbench .file-editor-action.action-open-preview { +.vs-dark .monaco-workbench .file-editor-action.action-open-preview , +.hc-black .monaco-workbench .file-editor-action.action-open-preview { background: url('Preview_inverse.svg') center center no-repeat; } @@ -91,7 +107,8 @@ background: url("action-close-dirty.svg") center center no-repeat; } -.vs-dark .explorer-viewlet .explorer-open-editors .monaco-tree .monaco-tree-row:not(:hover) > .content.dirty > .monaco-action-bar .close-editor-action { +.vs-dark .explorer-viewlet .explorer-open-editors .monaco-tree .monaco-tree-row:not(:hover) > .content.dirty > .monaco-action-bar .close-editor-action, +.hc-black .monaco-workbench .explorer-viewlet .explorer-open-editors .monaco-tree .monaco-tree-row:not(:hover) > .content.dirty > .monaco-action-bar .close-editor-action { background: url("action-close-dirty-dark.svg") center center no-repeat; } @@ -99,53 +116,7 @@ background: url("action-close-dirty-focus.svg") center center no-repeat; } -.vs-dark .monaco-workbench .explorer-viewlet .explorer-open-editors .close-editor-action { - background: url("action-close-dark.svg") center center no-repeat; -} - -/* High Contrast Theming */ -.hc-black .monaco-workbench .explorer-action, -.hc-black .monaco-workbench .quick-open-sidebyside, -.hc-black .monaco-workbench .file-editor-action.action-open-preview { - background: none; -} - -.hc-black .monaco-workbench .explorer-viewlet .action-close-all-files { - background: url("closeall_inverse.svg") center center no-repeat; -} - -.hc-black .monaco-workbench .explorer-action.save-all { - background: url('saveall_inverse.svg') center center no-repeat; -} - -.hc-black .monaco-workbench .explorer-action.new-file { - background: url('AddFile_inverse.svg') center center no-repeat; -} - -.hc-black .monaco-workbench .explorer-action.new-folder { - background: url('AddFolder_inverse.svg') center center no-repeat; -} - -.hc-black .monaco-workbench .explorer-action.refresh-explorer { - background: url('Refresh_inverse.svg') center center no-repeat; -} - -.hc-black .monaco-workbench .explorer-action.collapse-explorer { - background: url('CollapseAll_inverse.svg') center center no-repeat; -} - -.hc-black .monaco-workbench .quick-open-sidebyside:before { - content: url('SplitEditor_inverse.svg'); -} - -.hc-black .monaco-workbench .file-editor-action.action-open-preview:before { - content: url('Preview_inverse.svg'); -} - +.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; -} - -.hc-black .monaco-workbench .explorer-viewlet .explorer-open-editors .monaco-tree .monaco-tree-row:not(:hover) > .content.dirty > .monaco-action-bar .close-editor-action { - background: url("action-close-dirty-dark.svg") center center no-repeat; } \ No newline at end of file diff --git a/src/vs/workbench/parts/files/browser/media/files.contribution.css b/src/vs/workbench/parts/files/browser/media/files.contribution.css index 51967e0116d25de9bf774de1adc855f8aebe02d5..357eb226611b85f345303c0aa95f414d79a14f48 100644 --- a/src/vs/workbench/parts/files/browser/media/files.contribution.css +++ b/src/vs/workbench/parts/files/browser/media/files.contribution.css @@ -5,11 +5,5 @@ /* Activity Bar */ .monaco-workbench > .activitybar .monaco-action-bar .action-label.explore { - /* Inline icon to prevent slow loading on startup (original: files-dark.svg) */ - background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiI+PHBhdGggZD0iTTE3LjcwNSA4aC04LjcwNXMtMiAuMDc4LTIgMnYxNXMwIDIgMiAybDExLS4wMDRjMiAuMDA0IDItMS45OTYgMi0xLjk5NnYtMTEuNDkxbC00LjI5NS01LjUwOXptLTEuNzA1IDJ2NWg0djEwaC0xMXYtMTVoN3ptNS41MDktNmgtOC40OTNzLTIuMDE2LjAxNi0yLjAzMSAyaDguMDE1di40NTRsMy45MzEgNC41NDZoMS4wNjl2MTJjMiAwIDItMS45OTUgMi0xLjk5NXYtMTEuMzU3bC00LjQ5MS01LjY0OHoiIGZpbGw9IiNmZmYiLz48L3N2Zz4='); -} - -/* High Contrast Theming */ -.hc-black .monaco-workbench > .activitybar .monaco-action-bar .action-label.explore:before { - content: url('files-dark.svg'); + background-image: url('files-dark.svg'); } \ No newline at end of file diff --git a/src/vs/workbench/parts/git/browser/media/git.contribution.css b/src/vs/workbench/parts/git/browser/media/git.contribution.css index 6f8d3b642777ac173f7bfd039907a1d8b86214b9..674c83b87d236de68071f284c7c3925432d3c4a8 100644 --- a/src/vs/workbench/parts/git/browser/media/git.contribution.css +++ b/src/vs/workbench/parts/git/browser/media/git.contribution.css @@ -13,18 +13,21 @@ background: url('OpenEditor.svg') center center no-repeat; } -.vs-dark .monaco-workbench .git-action.open-in-diff { +.vs-dark .monaco-workbench .git-action.open-in-diff, +.hc-black .monaco-workbench .git-action.open-in-diff { background: url('Compare_inverse.svg') center center no-repeat; } -.vs-dark .monaco-workbench .git-action.open-in-editor { +.vs-dark .monaco-workbench .git-action.open-in-editor, +.hc-black .monaco-workbench .git-action.open-in-editor { background: url('OpenEditor_inverse.svg') center center no-repeat; } /* Activity Bar */ -.monaco-workbench > .activitybar .monaco-action-bar .action-label.git { - /* Inline icon to prevent slow loading on startup (original: git-dark.svg) */ - background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiI+PHBhdGggZD0iTTI3LjQ1OSAxNC45MDJsLTEwLjQzOS0xMC40MzljLS4yOTYtLjI5NC0uNjcyLS40NTItMS4wODktLjQ1Mi0uNDE3IDAtLjc5My4xNTctMS4wODkuNDUybC0yLjI0OCAyLjI0NyAyLjU0OSAyLjU0OWMuMjQ5LS4xMTIuNTIyLS4xNzcuODEzLS4xNzcgMS4xMDYgMCAyLjAwMi44OTYgMi4wMDIgMi4wMDIgMCAuMjkxLS4wNjQuNTY1LS4xNzYuODE0bDIuMzExIDIuMzM2Yy4yNS0uMTExLjYzMy0uMjM0LjkyMy0uMjM0IDEuMTA2IDAgMiAuOTExIDIgMi4wMTZzLS44OTQgMS45NjktMiAxLjk2OWMtMS4xMDUtLjAwMS0yLjAxNi0uNzUxLTIuMDE2LTEuOTg1IDAtLjI4LjAxNi0uNDYyLjExOS0uNzA0bC0yLjM3My0yLjM3NC0uMDIzLjAwN3Y2LjI3NGMuNzQ3LjI5NSAxLjI3NyAxLjAyNiAxLjI3NyAxLjg3NSAwIDEuMTA1LS44NzggMi4wMTYtMS45ODQgMi4wMTYtMS4xMDQgMC0yLjAzMS0uOTI2LTIuMDMxLTIuMDMxIDAtLjg0Ni41MzUtMS41NjQgMS4yOC0xLjg1N2wuMDAxLTYuMjVjLS43NjItLjI4Mi0xLjMwOS0xLjAwOS0xLjMwOS0xLjg3MSAwLS4yOC4wNTktLjU0Ni4xNjItLjc4OGwtMi41NTUtMi41NTctNy4xMTUgNy4xMTRjLS41OTkuNjAxLS42MDEgMS41NzYuMDAxIDIuMTc4bDEwLjQ0IDEwLjUxOGMuMjk2LjI5NS42NzEuNDUgMS4wODkuNDUuNDE1IDAgLjc5Ni0uMTU5IDEuMDg5LS40NWwxMC4zOTEtMTAuNDcxYy42MDEtLjU5OS41OTktMS41NzYgMC0yLjE3N3oiIGZpbGw9IiNmZmYiLz48L3N2Zz4='); +.monaco-workbench > .activitybar .monaco-action-bar .action-label.git, +.monaco-shell .git-statusbar-group > .git-statusbar-branch-item, +.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.git { + background-image: url('git-dark.svg'); } /* Git viewlet label */ @@ -104,10 +107,6 @@ background-image: url('git.svg'); } -.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.git { - background-image: url('git-dark.svg'); -} - /* Actions */ .monaco-shell .git-action.live-sync.icon { @@ -115,56 +114,16 @@ } .monaco-shell .git-action.live-sync.icon.loading { - animation: spin-forever 1.6s linear infinite; + animation: spin-forever 1.6s linear infinite; } -@keyframes spin-forever { from { transform: rotate(0deg); } to { transform: rotate(360deg); } } +@keyframes spin-forever { from { transform: rotate(0deg); } to { transform: rotate(360deg); } } /* High Contrast Theming */ -.hc-black .monaco-workbench > .activitybar .monaco-action-bar .action-label.git:before { - content: url('git-dark.svg'); -} - .hc-black .monaco-workbench > .activitybar .monaco-action-bar .badge.git-viewlet-label-progress .badge-content { - background: none; width: 1px; } -.hc-black .monaco-workbench > .activitybar .monaco-action-bar .badge.git-viewlet-label-progress .badge-content:before { - content: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNCIgaGVpZ2h0PSIxNCIgdmlld0JveD0iMiAyIDE0IDE0IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDIgMiAxNCAxNCI+PHBhdGggZmlsbD0iI2ZmZiIgZD0iTTkgMTZjLTMuODYgMC03LTMuMTQtNy03czMuMTQtNyA3LTdjMy44NTkgMCA3IDMuMTQxIDcgN3MtMy4xNDEgNy03IDd6bTAtMTIuNmMtMy4wODggMC01LjYgMi41MTMtNS42IDUuNnMyLjUxMiA1LjYgNS42IDUuNiA1LjYtMi41MTIgNS42LTUuNi0yLjUxMi01LjYtNS42LTUuNnptMy44NiA3LjFsLTMuMTYtMS44OTZ2LTMuODA0aC0xLjR2NC41OTZsMy44NCAyLjMwNS43Mi0xLjIwMXoiLz48L3N2Zz4="); - position: relative; - top: 2px; - left: -4px; - display: block; - height: 16px; - width: 16px; -} - -.hc-black .monaco-workbench .git-action { - background: none; -} - -.hc-black .monaco-workbench .action-item.disabled .git-action:before { -} - -.hc-black .monaco-workbench .git-action.open-in-diff:before { - content: url('Compare_inverse.svg'); - position: absolute; - top: 12px; - left: 8px; - height: 16px; - width: 16px; -} - -.hc-black .monaco-workbench .git-action.open-in-editor:before { - content: url('OpenEditor_inverse.svg'); - position: absolute; - top: 12px; - left: 8px; - height: 16px; - width: 16px; -} - /* Status bar */ .monaco-shell .git-statusbar-group > a { @@ -204,7 +163,6 @@ } .monaco-shell .git-statusbar-group > .git-statusbar-branch-item { - background-image: url('../media/git-dark.svg'); background-repeat: no-repeat; background-position: 4px 50%; background-size: 17px; diff --git a/src/vs/workbench/parts/git/browser/media/gitViewlet.css b/src/vs/workbench/parts/git/browser/media/gitViewlet.css index 847ffa17faf53ff18c6a25e646d383cd6bb6ec44..10037adab11a167867a3c6d403d21361a9901d64 100644 --- a/src/vs/workbench/parts/git/browser/media/gitViewlet.css +++ b/src/vs/workbench/parts/git/browser/media/gitViewlet.css @@ -6,7 +6,7 @@ /* Git viewlet */ .git-viewlet { - height: 100%; + height: 100%; } /* Actionbar actions */ @@ -55,15 +55,17 @@ /* Dark theme actions */ -.vs-dark .git-action.refresh { +.vs-dark .git-action.refresh, +.hc-black .git-action.refresh { background: url('refresh-inverse.svg') center center no-repeat; } -.vs-dark .git-action.commit { - background: url('check-inverse.svg') center center no-repeat; -} - -.vs-dark .git-action.stage-and-commit { +.vs-dark .git-action.commit, +.hc-black .git-action.commit, +.vs-dark .git-action.stage-and-commit, +.hc-black .git-action.stage-and-commit, +.vs-dark .git-action.smart-commit, +.hc-black .git-action.smart-commit { background: url('check-inverse.svg') center center no-repeat; } @@ -75,64 +77,17 @@ background: url('push-inverse.svg') center center no-repeat; } -.vs-dark .git-action.stage { +.vs-dark .git-action.stage, +.hc-black .git-action.stage { background: url('add-inverse.svg') center center no-repeat; } -.vs-dark .git-action.undo { +.vs-dark .git-action.undo, +.hc-black .git-action.undo { background: url('undo-inverse.svg') center center no-repeat; } -.vs-dark .git-action.unstage { +.vs-dark .git-action.unstage, +.hc-black .git-action.unstage { background: url('subtract-inverse.svg') center center no-repeat; -} - -/* High Contrast Theming */ -.hc-black .git-action { - background: none; -} - -.hc-black .title-actions .git-action:before { - position: absolute; - top: 12px; - left: 8px; - height: 16px; - width: 16px; -} - -.hc-black .git-action.refresh:before { - content: url('refresh-inverse.svg'); -} - -.hc-black .git-action.smart-commit:before { - content: url('check-inverse.svg'); -} - -.hc-black .git-viewlet .focused .monaco-tree-row.selected:not(.highlighted) > .content.actions .git-action { - background: none; -} - -.hc-black .git-viewlet .monaco-tree .monaco-tree-rows > .monaco-tree-row.has-children > .content:after, -.hc-black .git-viewlet .monaco-tree .monaco-tree-rows > .monaco-tree-row.expanded > .content:before { - content: ''; -} - -.hc-black .monaco-tree .git-action:before { - display: inline-block; - position: relative; - top: -2px; - height: 16px; - width: 16px; -} - -.hc-black .git-viewlet .git-action.stage:before { - content: url('add-inverse.svg'); -} - -.hc-black .git-viewlet .git-action.undo:before { - content: url('undo-inverse.svg'); -} - -.hc-black .git-viewlet .git-action.unstage:before { - content: url('subtract-inverse.svg'); } \ No newline at end of file diff --git a/src/vs/workbench/parts/output/browser/media/output.contribution.css b/src/vs/workbench/parts/output/browser/media/output.contribution.css index f177d54ec91c17f80d93b398704c830c7200e2ca..093845880a305ad6818f3240c548903c8dd5c1cf 100644 --- a/src/vs/workbench/parts/output/browser/media/output.contribution.css +++ b/src/vs/workbench/parts/output/browser/media/output.contribution.css @@ -7,21 +7,7 @@ background: url('clear_output.svg') center center no-repeat; } -.vs-dark .monaco-workbench .output-action.clear-output { - background: url('clear_output_inverse.svg') center center no-repeat; -} - -/* High Contrast Theming */ - +.vs-dark .monaco-workbench .output-action.clear-output, .hc-black .monaco-workbench .output-action.clear-output { - background: none; -} - -.hc-black .monaco-workbench .output-action.clear-output:before { - content: url('clear_output_inverse.svg'); - position: absolute; - top: 12px; - left: 8px; - height: 16px; - width: 16px; -} + background: url('clear_output_inverse.svg') center center no-repeat; +} \ No newline at end of file diff --git a/src/vs/workbench/parts/quickopen/browser/media/gotoSymbolHandler.css b/src/vs/workbench/parts/quickopen/browser/media/gotoSymbolHandler.css index c0b3a88d39f0ba63606f14ddc7a95880a39ac70a..b24077d30845d56c08b5ece88bb4295a8e96626f 100644 --- a/src/vs/workbench/parts/quickopen/browser/media/gotoSymbolHandler.css +++ b/src/vs/workbench/parts/quickopen/browser/media/gotoSymbolHandler.css @@ -30,139 +30,61 @@ .vs .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.method, .vs .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.function, .vs .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.constructor { background-position: 0 -4px; } -.vs .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.variable { background-position: -22px -4px; } +.vs .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.variable { background-position: -22px -4px; } .vs .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.class { background-position: -43px -3px; } .vs .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.interface { background-position: -63px -4px; } .vs .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.object, .vs .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.namespace, .vs .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.package, .vs .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.module { background-position: -82px -4px; } -.vs .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.property { background-position: -102px -3px; } +.vs .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.property { background-position: -102px -3px; } .vs .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.enum { background-position: -122px -3px; } .vs .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.key, .vs .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.string { background-position: -202px -3px; } .vs .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.rule { background-position: -242px -4px; } .vs .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.file { background-position: -262px -4px; } -.vs .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.array { background-position: -302px -4px; } +.vs .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.array { background-position: -302px -4px; } .vs .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.number { background-position: -322px -4px; } .vs .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.null, .vs .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.boolean { background-position: -343px -4px; } .vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.method, .vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.function, -.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.constructor { background-position: 0 -24px; } -.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.variable { background-position: -22px -24px; } -.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.class { background-position: -43px -23px; } -.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.interface { background-position: -63px -24px; } +.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.constructor, +.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.method, +.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.function, +.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.constructor { background-position: 0 -24px; } +.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.variable, +.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.variable { background-position: -22px -24px; } +.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.class, +.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.class { background-position: -43px -23px; } +.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.interface, +.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.interface { background-position: -63px -24px; } .vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.object, .vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.namespace, .vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.package, -.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.module { background-position: -82px -24px; } -.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.property { background-position: -102px -23px; } -.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.key, -.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.string { background-position: -202px -23px; } -.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.enum { background-position: -122px -23px; } -.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.rule { background-position: -242px -24px; } -.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.file { background-position: -262px -24px; } -.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.array { background-position: -302px -24px; } -.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.number { background-position: -322px -24px; } -.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.null, -.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.boolean { background-position: -342px -24px; } - -/* High Contrast Theming */ - -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.method, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.function, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.constructor, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.variable, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.class, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.interface, +.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.module, .hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.object, .hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.namespace, .hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.package, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.module, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.property, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.enum, +.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.module { background-position: -82px -24px; } +.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.property, +.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.property { background-position: -102px -23px; } +.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.key, +.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.string, .hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.key, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.string, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.rule, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.file, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.array, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.number, +.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.string { background-position: -202px -23px; } +.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.enum, +.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.enum { background-position: -122px -23px; } +.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.rule, +.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.rule { background-position: -242px -24px; } +.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.file, +.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.file { background-position: -262px -24px; } +.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.array, +.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.array { background-position: -302px -24px; } +.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.number, +.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.number { background-position: -322px -24px; } +.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.null, +.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.boolean, .hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.null, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.boolean { - background: none; - display: inline; -} - -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.method:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.function:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.constructor:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.variable:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.class:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.interface:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.object:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.namespace:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.package:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.module:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.property:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.enum:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.key:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.string:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.rule:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.file:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.array:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.number:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.null:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.boolean:before { - height: 16px; - width: 16px; - display: inline-block; -} - -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.method:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.function:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.constructor:before { - content: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZmlsbD0iI0IxODBENyIgZD0iTTUuNSAzbC00LjUgMi44NTd2NC4yODVsNC41IDIuODU4IDQuNS0yLjg1N3YtNC4yODZsLTQuNS0yLjg1N3ptLS41IDguNDk4bC0zLTEuOTA1di0yLjgxNmwzIDEuOTA1djIuODE2em0tMi4zNTgtNS40OThsMi44NTgtMS44MTUgMi44NTggMS44MTUtMi44NTggMS44MTUtMi44NTgtMS44MTV6bTYuMzU4IDMuNTkzbC0zIDEuOTA1di0yLjgxNWwzLTEuOTA1djIuODE1eiIvPjwvc3ZnPg=="); - margin-left: 2px; -} - -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.field:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.variable:before { - content: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZmlsbD0iIzc1QkVGRiIgZD0iTTEgNnY0bDQgMiA2LTN2LTRsLTQtMi02IDN6bTQgMWwtMi0xIDQtMiAyIDEtNCAyeiIvPjwvc3ZnPg=="); - margin-left: 2px; -} - -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.class:before { - content: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBvbHlnb24gZmlsbD0iI0U4QUI1MyIgcG9pbnRzPSIxMS45OTgsMTEuMDAyIDksMTEgOSw3IDExLDcgMTAsOCAxMiwxMCAxNSw3IDEzLDUgMTIsNiA3LDYgOSw0IDYsMSAxLDYgNCw5IDYsNyA4LDcgOCwxMiAxMSwxMiAxMCwxMyAxMiwxNSAxNSwxMiAxMywxMCIvPjwvc3ZnPg=="); -} - -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.interface:before { - content: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZmlsbD0iIzc1QkVGRiIgZD0iTTExLjUgNGMtMS43NTkgMC0zLjIwNCAxLjMwOC0zLjQ0OSAzaC0zLjEyMmMtLjIyMy0uODYxLS45OTgtMS41LTEuOTI5LTEuNS0xLjEwNCAwLTIgLjg5NS0yIDIgMCAxLjEwNC44OTYgMiAyIDIgLjkzMSAwIDEuNzA2LS42MzkgMS45MjktMS41aDMuMTIyYy4yNDUgMS42OTEgMS42OSAzIDMuNDQ5IDMgMS45MyAwIDMuNS0xLjU3IDMuNS0zLjUgMC0xLjkzMS0xLjU3LTMuNS0zLjUtMy41em0wIDVjLS44MjcgMC0xLjUtLjY3NC0xLjUtMS41IDAtLjgyOC42NzMtMS41IDEuNS0xLjVzMS41LjY3MiAxLjUgMS41YzAgLjgyNi0uNjczIDEuNS0xLjUgMS41eiIvPjwvc3ZnPg=="); -} - -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.object:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.namespace:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.package:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.module:before { - content: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZmlsbD0iI0M1QzVDNSIgZD0iTTkgMTF2LTFjMC0uODM0LjQ5Ni0xLjczOCAxLTItLjUwNC0uMjctMS0xLjE2OC0xLTJ2LTFjMC0uODQtLjU4NC0xLTEtMXYtMWMyLjA4MyAwIDIgMS4xNjYgMiAydjFjMCAuOTY5LjcwMy45OCAxIDF2MmMtLjMyMi4wMi0xIC4wNTMtMSAxdjFjMCAuODM0LjA4MyAyLTIgMnYtMWMuODMzIDAgMS0xIDEtMXptLTYgMHYtMWMwLS44MzQtLjQ5Ni0xLjczOC0xLTIgLjUwNC0uMjcgMS0xLjE2OCAxLTJ2LTFjMC0uODQuNTg0LTEgMS0xdi0xYy0yLjA4MyAwLTIgMS4xNjYtMiAydjFjMCAuOTY5LS43MDMuOTgtMSAxdjJjLjMyMi4wMiAxIC4wNTMgMSAxdjFjMCAuODM0LS4wODMgMiAyIDJ2LTFjLS44MzMgMC0xLTEtMS0xeiIvPjwvc3ZnPg=="); - margin-left: 2px; -} - -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.property:before { - content: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZmlsbD0iI0M1QzVDNSIgZD0iTTEyLjA5IDQuMzU5bC0yLjY0MSAyLjY0MS0yLTIgMi42NDEtMi42NDFjLS41MDItLjIyNi0xLjA1NS0uMzU5LTEuNjQxLS4zNTktMi4yMDkgMC00IDEuNzkxLTQgNCAwIC41ODYuMTMzIDEuMTM5LjM1OSAxLjY0bC0zLjM1OSAzLjM2cy0xIDEgMCAyaDJsMy4zNTktMy4zNmMuNTAzLjIyNiAxLjA1NS4zNiAxLjY0MS4zNiAyLjIwOSAwIDQtMS43OTEgNC00IDAtLjU4Ni0uMTMzLTEuMTM5LS4zNTktMS42NDF6Ii8+PC9zdmc+"); - margin-left: 1px; -} - -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.value:before, -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.enum:before { - content: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PGcgZmlsbD0iIzc1QkVGRiI+PHBhdGggZD0iTTEyIDNoLTRsLTEgMXYyaDV2MWgtMnYxaDJsMS0xdi0zbC0xLTF6bTAgMmgtNHYtMWg0djF6TTMgMTJoNnYtNWgtNnY1em0xLTNoNHYxaC00di0xeiIvPjwvZz48L3N2Zz4="); -} - -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.rule:before { - content: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMiIgaGVpZ2h0PSIxMiI+PHBhdGggZmlsbD0iI0M1QzVDNSIgZD0iTTEwIDVoLTh2LTJoOHYyem0wIDFoLTZ2MWg2di0xem0wIDJoLTZ2MWg2di0xeiIvPjwvc3ZnPg=="); -} - -.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.file:before { - content: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZmlsbD0iI0M1QzVDNSIgZD0iTTkuNjc2IDJoLTYuNjc2djEyaDEwdi05bC0zLjMyNC0zem0yLjMyNCAxMWgtOHYtMTBoNXYzaDN2N3oiLz48L3N2Zz4="); -} \ No newline at end of file +.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.boolean { background-position: -342px -24px; } \ No newline at end of file diff --git a/src/vs/workbench/parts/quickopen/browser/media/markerHandler.css b/src/vs/workbench/parts/quickopen/browser/media/markerHandler.css deleted file mode 100644 index 3ec474d2f6a69086eb1017d97409ed121f5d9298..0000000000000000000000000000000000000000 --- a/src/vs/workbench/parts/quickopen/browser/media/markerHandler.css +++ /dev/null @@ -1,48 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -.quick-open-widget.marker-handler .inline { - display: inline-block; - vertical-align: top; -} - -.quick-open-widget.marker-handler .row { - height: 22px; -} - -.quick-open-widget.marker-handler .severity { - display: inline-block; - width: 16px; - height: 22px; - margin-right: 4px; -} - -.quick-open-widget.marker-handler .severity.warning { - background: url('status-warning.svg') center center no-repeat; -} - -.quick-open-widget.marker-handler .severity.error { - background: url('status-error.svg') center center no-repeat; -} - -.quick-open-widget.marker-handler .severity.info:before { - background: url('status-info.svg') center center no-repeat; -} - -.vs-dark .quick-open-widget.marker-handler .severity.warning { - background: url('status-warning-inverse.svg') center center no-repeat; -} - -.vs-dark .quick-open-widget.marker-handler .severity.error { - background: url('status-error-inverse.svg') center center no-repeat; -} - -.vs-dark .quick-open-widget.marker-handler .severity.info:before { - background: url('status-info-inverse.svg') center center no-repeat; -} - -.quick-open-widget.marker-handler .description { - margin-left: 20px; -} \ No newline at end of file diff --git a/src/vs/workbench/parts/quickopen/browser/media/status-error-inverse.svg b/src/vs/workbench/parts/quickopen/browser/media/status-error-inverse.svg deleted file mode 100644 index 3c852a7ffde95dab5e0031517b5692aca17aac14..0000000000000000000000000000000000000000 --- a/src/vs/workbench/parts/quickopen/browser/media/status-error-inverse.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/parts/quickopen/browser/media/status-error.svg b/src/vs/workbench/parts/quickopen/browser/media/status-error.svg deleted file mode 100644 index a1ddb39fed6a755eb9291cf128002c1a2269e703..0000000000000000000000000000000000000000 --- a/src/vs/workbench/parts/quickopen/browser/media/status-error.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/parts/quickopen/browser/media/status-info-inverse.svg b/src/vs/workbench/parts/quickopen/browser/media/status-info-inverse.svg deleted file mode 100644 index d38c363e0e4cd4e72f0ef664e6f2e725360342d7..0000000000000000000000000000000000000000 --- a/src/vs/workbench/parts/quickopen/browser/media/status-info-inverse.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/parts/quickopen/browser/media/status-info.svg b/src/vs/workbench/parts/quickopen/browser/media/status-info.svg deleted file mode 100644 index f1245e7bcfe98ec3e9b63ad314275653e2d4ac8c..0000000000000000000000000000000000000000 --- a/src/vs/workbench/parts/quickopen/browser/media/status-info.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/parts/quickopen/browser/media/status-warning-inverse.svg b/src/vs/workbench/parts/quickopen/browser/media/status-warning-inverse.svg deleted file mode 100644 index df44e61b3265c38e04f054eb6aebfa17901ad839..0000000000000000000000000000000000000000 --- a/src/vs/workbench/parts/quickopen/browser/media/status-warning-inverse.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/parts/quickopen/browser/media/status-warning.svg b/src/vs/workbench/parts/quickopen/browser/media/status-warning.svg deleted file mode 100644 index f4e2a84b0af409036b5c141957e6f8fe3830279c..0000000000000000000000000000000000000000 --- a/src/vs/workbench/parts/quickopen/browser/media/status-warning.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/parts/search/browser/media/search.contribution.css b/src/vs/workbench/parts/search/browser/media/search.contribution.css index bcdd6b207c09f002360e018759d70abded0c2457..e0b787ff3ba60d8194af3a6473274c03f916a5fb 100644 --- a/src/vs/workbench/parts/search/browser/media/search.contribution.css +++ b/src/vs/workbench/parts/search/browser/media/search.contribution.css @@ -5,11 +5,5 @@ /* Activity Bar */ .monaco-workbench > .activitybar .monaco-action-bar .action-label.search { - /* Inline icon to prevent slow loading on startup (original: search-dark.svg) */ - background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiI+PHBhdGggZD0iTTE5LjIzIDQuMDk1Yy00Ljg0MiAwLTguNzY5IDMuOTI4LTguNzY5IDguNzcxIDAgMS43ODEuNTM5IDMuNDMgMS40NDkgNC44MTUgMCAwLTUuNDgyIDUuNDU1LTcuMTAyIDcuMTAyLTEuNjIxIDEuNjQ2IDEuMDAxIDQuMDcxIDIuNjAyIDIuNDA5IDEuNjAyLTEuNjU5IDcuMDA2LTcuMDA1IDcuMDA2LTcuMDA1IDEuMzg0LjkxMSAzLjAzNSAxLjQ1IDQuODE0IDEuNDUgNC44NDUgMCA4Ljc3Mi0zLjkzIDguNzcyLTguNzcxLjAwMS00Ljg0NC0zLjkyNy04Ljc3MS04Ljc3Mi04Ljc3MXptMCAxNS4wMzVjLTMuNDU5IDAtNi4yNjUtMi44MDQtNi4yNjUtNi4yNjQgMC0zLjQ2IDIuODA1LTYuMjY1IDYuMjY1LTYuMjY1IDMuNDYyIDAgNi4yNjYgMi44MDQgNi4yNjYgNi4yNjUgMCAzLjQ2LTIuODA0IDYuMjY0LTYuMjY2IDYuMjY0eiIgZmlsbD0iI2ZmZiIvPjwvc3ZnPg=='); -} - -/* High Contrast Theming */ -.hc-black .monaco-workbench > .activitybar .monaco-action-bar .action-label.search:before { - content: url('search-dark.svg'); + background-image: url('search-dark.svg'); } \ No newline at end of file diff --git a/src/vs/workbench/parts/search/browser/media/searchviewlet.css b/src/vs/workbench/parts/search/browser/media/searchviewlet.css index 32fa71925ab858d73ad322cd1bcfa72ea1099616..0a8a4dfbaef85be048ff3d45fa7ee7542aff042f 100644 --- a/src/vs/workbench/parts/search/browser/media/searchviewlet.css +++ b/src/vs/workbench/parts/search/browser/media/searchviewlet.css @@ -70,10 +70,7 @@ height: 13px; } -.hc-black .monaco-workbench .search-viewlet .query-details .more { - background: url('ellipsis-inverse.svg') top center no-repeat; -} - +.hc-black .monaco-workbench .search-viewlet .query-details .more, .vs-dark .monaco-workbench .search-viewlet .query-details .more { background: url('ellipsis-inverse.svg') top center no-repeat; } @@ -245,7 +242,8 @@ background: url('Refresh.svg') center center no-repeat; } -.vs-dark .monaco-workbench .search-action.refresh { +.vs-dark .monaco-workbench .search-action.refresh, +.hc-black .monaco-workbench .search-action.refresh { background: url('Refresh_inverse.svg') center center no-repeat; } @@ -253,7 +251,8 @@ background: url('CollapseAll.svg') center center no-repeat; } -.vs-dark .monaco-workbench .search-action.collapse { +.vs-dark .monaco-workbench .search-action.collapse, +.hc-black .monaco-workbench .search-action.collapse { background: url('CollapseAll_inverse.svg') center center no-repeat; } @@ -261,14 +260,11 @@ background: url('clear-search-results.svg') center center no-repeat; } -.vs-dark .monaco-workbench .search-action.clear-search-results { +.vs-dark .monaco-workbench .search-action.clear-search-results, +.hc-black .monaco-workbench .search-action.clear-search-results { background: url('clear-search-results-dark.svg') center center no-repeat; } -.vs-dark .monaco-workbench .search-viewlet .action-remove { - background: url("action-remove-dark.svg") center center no-repeat; -} - .vs-dark .monaco-workbench .search-viewlet .focused .monaco-tree-row.selected:not(.highlighted) > .content.actions .action-remove { background: url("action-remove-focus.svg") center center no-repeat; } @@ -277,12 +273,9 @@ background: url('pattern.svg') center center no-repeat; } -.vs-dark .monaco-workbench .search-viewlet .query-details .file-types .controls > .custom-checkbox.pattern { - background: url('pattern-dark.svg') center center no-repeat; -} - +.vs-dark .monaco-workbench .search-viewlet .query-details .file-types .controls > .custom-checkbox.pattern, .hc-black .monaco-workbench .search-viewlet .query-details .file-types .controls > .custom-checkbox.pattern:before { - content: url('pattern-dark.svg'); + background: url('pattern-dark.svg') center center no-repeat; } .search-viewlet .findInFileMatch, @@ -363,7 +356,8 @@ background: url("action-query-clear-dark.svg") center center no-repeat; } -.vs-dark .search-viewlet .action-remove { +.vs-dark .search-viewlet .action-remove, +.hc-black .search-viewlet .action-remove { background: url("action-remove-dark.svg") center center no-repeat; } @@ -391,44 +385,6 @@ background-color: #000; } -.hc-black .monaco-workbench .search-action { - background: none; -} - -.hc-black .monaco-workbench .search-action:before { - position: absolute; - top: 12px; - left: 8px; - height: 16px; - width: 16px; -} - -.hc-black .monaco-workbench .search-action.refresh:before { - content: url('Refresh_inverse.svg'); -} - -.hc-black .monaco-workbench .search-action.collapse:before { - content: url('CollapseAll_inverse.svg'); -} - -.hc-black .monaco-workbench .search-action.clear-search-results:before { - content: url('clear-search-results-dark.svg'); -} - -.hc-black .monaco-workbench .search-viewlet .query-clear { - background: none; -} - -.hc-black .monaco-workbench .search-viewlet .query-clear:before, -.hc-black .monaco-workbench .search-viewlet .action-remove:before { - content: url('action-remove-dark.svg'); - position: absolute; - top: 2px; - left: 5px; - height: 16px; - width: 16px; -} - .hc-black .monaco-workbench .input-box { border: 1px solid #6FC3DF; } @@ -437,11 +393,6 @@ border: none; } -.hc-black .monaco-workbench .search-viewlet .action-remove, -.hc-black .monaco-workbench .search-viewlet .focused .monaco-tree-row.selected:not(.highlighted) > .content.actions > .primary-action-bar .action-remove { - background: none !important; -} - .hc-black .monaco-workbench .search-viewlet .filematch, .hc-black .monaco-workbench .search-viewlet .linematch { line-height: 20px; diff --git a/src/vs/workbench/parts/terminal/electron-browser/media/terminal.css b/src/vs/workbench/parts/terminal/electron-browser/media/terminal.css index d31dc46deb586f25acc7211dca3a0d0e3abcaaa2..d4696394a5f2c3d180bb2e331593859cde423902 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/media/terminal.css +++ b/src/vs/workbench/parts/terminal/electron-browser/media/terminal.css @@ -36,17 +36,6 @@ /* Light theme */ .monaco-workbench .terminal-action.kill { background: url('kill.svg') center center no-repeat; } .monaco-workbench .terminal-action.new { background: url('new.svg') center center no-repeat; } -/* Dark theme */ -.vs-dark .monaco-workbench .terminal-action.kill { background: url('kill-inverse.svg') center center no-repeat; } -.vs-dark .monaco-workbench .terminal-action.new { background: url('new-inverse.svg') center center no-repeat; } -/* High contrast black theme */ -.hc-black .monaco-workbench .terminal-action { background: none; } -.hc-black .monaco-workbench .terminal-action:before { - position: absolute; - top: 12px; - left: 8px; - height: 16px; - width: 16px; -} -.hc-black .monaco-workbench .terminal-action.kill:before { content: url('kill-inverse.svg'); } -.hc-black .monaco-workbench .terminal-action.new:before { content: url('new-inverse.svg'); } +/* Dark theme / HC theme */ +.vs-dark .monaco-workbench .terminal-action.kill, .hc-black .monaco-workbench .terminal-action.kill { background: url('kill-inverse.svg') center center no-repeat; } +.vs-dark .monaco-workbench .terminal-action.new, .hc-black .monaco-workbench .terminal-action.new { background: url('new-inverse.svg') center center no-repeat; } \ No newline at end of file