From 749a1bfeeecab9d7c5bc873a9691c7c127709576 Mon Sep 17 00:00:00 2001 From: Cherry Wang Date: Sun, 3 Jun 2018 02:32:59 -0700 Subject: [PATCH] Markdown and common toolbar icons consistency pass (#50484) * arkdown and common toolbar icons consistency pass * Fixed icon size related css * fix merge issue * flip --- .../git/resources/icons/dark/open-change.svg | 2 +- .../git/resources/icons/light/open-change.svg | 2 +- .../media/Preview.svg | 2 +- .../media/PreviewOnRightPane_16x.svg | 20 +------------------ .../media/PreviewOnRightPane_16x_dark.svg | 20 +------------------ .../media/Preview_inverse.svg | 2 +- .../browser/ui/toolbar/ellipsis-inverse.svg | 2 +- src/vs/base/browser/ui/toolbar/ellipsis.svg | 2 +- src/vs/workbench/browser/media/part.css | 2 +- .../media/split-editor-horizontal-inverse.svg | 2 +- .../editor/media/split-editor-horizontal.svg | 2 +- .../media/split-editor-vertical-inverse.svg | 2 +- .../editor/media/split-editor-vertical.svg | 2 +- .../parts/panel/media/ellipsis-inverse.svg | 2 +- .../browser/parts/panel/media/ellipsis.svg | 2 +- .../browser/parts/panel/media/panelpart.css | 7 +++++-- .../search/browser/media/ellipsis-inverse.svg | 2 +- .../parts/search/browser/media/ellipsis.svg | 2 +- 18 files changed, 22 insertions(+), 55 deletions(-) diff --git a/extensions/git/resources/icons/dark/open-change.svg b/extensions/git/resources/icons/dark/open-change.svg index c951728abac..e43ba7616c5 100644 --- a/extensions/git/resources/icons/dark/open-change.svg +++ b/extensions/git/resources/icons/dark/open-change.svg @@ -1 +1 @@ - \ No newline at end of file +Compare_16x \ No newline at end of file diff --git a/extensions/git/resources/icons/light/open-change.svg b/extensions/git/resources/icons/light/open-change.svg index 3a205509bca..e53964f3b81 100644 --- a/extensions/git/resources/icons/light/open-change.svg +++ b/extensions/git/resources/icons/light/open-change.svg @@ -1 +1 @@ - \ No newline at end of file +Compare_16x \ No newline at end of file diff --git a/extensions/markdown-language-features/media/Preview.svg b/extensions/markdown-language-features/media/Preview.svg index c60599eda43..860ba093948 100644 --- a/extensions/markdown-language-features/media/Preview.svg +++ b/extensions/markdown-language-features/media/Preview.svg @@ -1 +1 @@ - \ No newline at end of file +SwitchToPreview_16x \ No newline at end of file diff --git a/extensions/markdown-language-features/media/PreviewOnRightPane_16x.svg b/extensions/markdown-language-features/media/PreviewOnRightPane_16x.svg index eefaadfcc7c..55778172a3b 100644 --- a/extensions/markdown-language-features/media/PreviewOnRightPane_16x.svg +++ b/extensions/markdown-language-features/media/PreviewOnRightPane_16x.svg @@ -1,19 +1 @@ - - - - - - - - - - - - - - +PreviewInRightPanel_16x \ No newline at end of file diff --git a/extensions/markdown-language-features/media/PreviewOnRightPane_16x_dark.svg b/extensions/markdown-language-features/media/PreviewOnRightPane_16x_dark.svg index c18634bbaf5..390b2658bba 100644 --- a/extensions/markdown-language-features/media/PreviewOnRightPane_16x_dark.svg +++ b/extensions/markdown-language-features/media/PreviewOnRightPane_16x_dark.svg @@ -1,19 +1 @@ - - - - - - - - - - - - - - +PreviewInRightPanel_16x \ No newline at end of file diff --git a/extensions/markdown-language-features/media/Preview_inverse.svg b/extensions/markdown-language-features/media/Preview_inverse.svg index 87700309c0c..1e7e89f7d48 100644 --- a/extensions/markdown-language-features/media/Preview_inverse.svg +++ b/extensions/markdown-language-features/media/Preview_inverse.svg @@ -1 +1 @@ - \ No newline at end of file +SwitchToPreview_16x \ No newline at end of file diff --git a/src/vs/base/browser/ui/toolbar/ellipsis-inverse.svg b/src/vs/base/browser/ui/toolbar/ellipsis-inverse.svg index 1140c11ecc8..e3337557a23 100644 --- a/src/vs/base/browser/ui/toolbar/ellipsis-inverse.svg +++ b/src/vs/base/browser/ui/toolbar/ellipsis-inverse.svg @@ -1 +1 @@ - \ No newline at end of file +Ellipsis_bold_16x \ No newline at end of file diff --git a/src/vs/base/browser/ui/toolbar/ellipsis.svg b/src/vs/base/browser/ui/toolbar/ellipsis.svg index b61e2d0c750..e3f85623356 100644 --- a/src/vs/base/browser/ui/toolbar/ellipsis.svg +++ b/src/vs/base/browser/ui/toolbar/ellipsis.svg @@ -1 +1 @@ - \ No newline at end of file +Ellipsis_bold_16x \ No newline at end of file diff --git a/src/vs/workbench/browser/media/part.css b/src/vs/workbench/browser/media/part.css index 897d2aeaa9b..2cc798ac9b3 100644 --- a/src/vs/workbench/browser/media/part.css +++ b/src/vs/workbench/browser/media/part.css @@ -75,4 +75,4 @@ .monaco-workbench > .part > .content .monaco-progress-container .progress-bit { height: 2px; -} \ No newline at end of file +} diff --git a/src/vs/workbench/browser/parts/editor/media/split-editor-horizontal-inverse.svg b/src/vs/workbench/browser/parts/editor/media/split-editor-horizontal-inverse.svg index 4eab7536698..73ef1de025d 100644 --- a/src/vs/workbench/browser/parts/editor/media/split-editor-horizontal-inverse.svg +++ b/src/vs/workbench/browser/parts/editor/media/split-editor-horizontal-inverse.svg @@ -1 +1 @@ - \ No newline at end of file +SplitScreenVertical_16x \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor/media/split-editor-horizontal.svg b/src/vs/workbench/browser/parts/editor/media/split-editor-horizontal.svg index 3eeaf7c5362..12771810281 100644 --- a/src/vs/workbench/browser/parts/editor/media/split-editor-horizontal.svg +++ b/src/vs/workbench/browser/parts/editor/media/split-editor-horizontal.svg @@ -1 +1 @@ - \ No newline at end of file +SplitScreenVertical_16x \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor/media/split-editor-vertical-inverse.svg b/src/vs/workbench/browser/parts/editor/media/split-editor-vertical-inverse.svg index 4969d2e7851..b39817a4c5b 100644 --- a/src/vs/workbench/browser/parts/editor/media/split-editor-vertical-inverse.svg +++ b/src/vs/workbench/browser/parts/editor/media/split-editor-vertical-inverse.svg @@ -1 +1 @@ - \ No newline at end of file +SplitScreenHorizontal_16x \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor/media/split-editor-vertical.svg b/src/vs/workbench/browser/parts/editor/media/split-editor-vertical.svg index c307f0142b8..c999e6ae0da 100644 --- a/src/vs/workbench/browser/parts/editor/media/split-editor-vertical.svg +++ b/src/vs/workbench/browser/parts/editor/media/split-editor-vertical.svg @@ -1 +1 @@ - \ No newline at end of file +SplitScreenHorizontal_16x \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/panel/media/ellipsis-inverse.svg b/src/vs/workbench/browser/parts/panel/media/ellipsis-inverse.svg index 1140c11ecc8..e3337557a23 100644 --- a/src/vs/workbench/browser/parts/panel/media/ellipsis-inverse.svg +++ b/src/vs/workbench/browser/parts/panel/media/ellipsis-inverse.svg @@ -1 +1 @@ - \ No newline at end of file +Ellipsis_bold_16x \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/panel/media/ellipsis.svg b/src/vs/workbench/browser/parts/panel/media/ellipsis.svg index b61e2d0c750..e3f85623356 100644 --- a/src/vs/workbench/browser/parts/panel/media/ellipsis.svg +++ b/src/vs/workbench/browser/parts/panel/media/ellipsis.svg @@ -1 +1 @@ - \ No newline at end of file +Ellipsis_bold_16x \ 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 4b0a0a4c7e3..a4099559a64 100644 --- a/src/vs/workbench/browser/parts/panel/media/panelpart.css +++ b/src/vs/workbench/browser/parts/panel/media/panelpart.css @@ -37,12 +37,15 @@ /** Panel Switcher */ .monaco-workbench > .part.panel > .title > .panel-switcher-container.composite-bar > .monaco-action-bar .action-label.toggle-more { - background: url('ellipsis.svg') center center no-repeat; + background-image: url('ellipsis.svg'); display: block; height: 31px; min-width: 28px; margin-left: 0px; margin-right: 0px; + background-size: 16px; + background-repeat: no-repeat; + background-position: center center; } .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar { @@ -156,5 +159,5 @@ .vs-dark .monaco-workbench > .part.panel > .title > .panel-switcher-container.composite-bar > .monaco-action-bar .action-label.toggle-more, .hc-black .monaco-workbench > .part.panel > .title > .panel-switcher-container.composite-bar > .monaco-action-bar .action-label.toggle-more { - background: url('ellipsis-inverse.svg') center center no-repeat; + background-image: url('ellipsis-inverse.svg'); } diff --git a/src/vs/workbench/parts/search/browser/media/ellipsis-inverse.svg b/src/vs/workbench/parts/search/browser/media/ellipsis-inverse.svg index 1140c11ecc8..e3337557a23 100644 --- a/src/vs/workbench/parts/search/browser/media/ellipsis-inverse.svg +++ b/src/vs/workbench/parts/search/browser/media/ellipsis-inverse.svg @@ -1 +1 @@ - \ No newline at end of file +Ellipsis_bold_16x \ No newline at end of file diff --git a/src/vs/workbench/parts/search/browser/media/ellipsis.svg b/src/vs/workbench/parts/search/browser/media/ellipsis.svg index b61e2d0c750..e3f85623356 100644 --- a/src/vs/workbench/parts/search/browser/media/ellipsis.svg +++ b/src/vs/workbench/parts/search/browser/media/ellipsis.svg @@ -1 +1 @@ - \ No newline at end of file +Ellipsis_bold_16x \ No newline at end of file -- GitLab