From f3a07be7eb6d216567691de880255f9a0ea25e8e Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Wed, 7 Feb 2018 10:36:20 +0100
Subject: [PATCH] Fixes #41141: Change Ignore Trim Whitespace icon

---
 .../editor/media/IgnoreTrimWhiteSpaceChecked_16x.svg   |  1 -
 .../media/IgnoreTrimWhiteSpaceChecked_16x_inverse.svg  |  1 -
 .../parts/editor/media/IgnoreTrimWhiteSpace_16x.svg    |  1 -
 .../editor/media/IgnoreTrimWhiteSpace_16x_inverse.svg  |  1 -
 .../parts/editor/media/Paragraph_16x_nohalo.svg        |  1 +
 .../editor/media/Paragraph_16x_nohalo_inversep.svg     |  1 +
 .../browser/parts/editor/media/textdiffeditor.css      | 10 ++++++----
 7 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 src/vs/workbench/browser/parts/editor/media/IgnoreTrimWhiteSpaceChecked_16x.svg
 delete mode 100644 src/vs/workbench/browser/parts/editor/media/IgnoreTrimWhiteSpaceChecked_16x_inverse.svg
 delete mode 100644 src/vs/workbench/browser/parts/editor/media/IgnoreTrimWhiteSpace_16x.svg
 delete mode 100644 src/vs/workbench/browser/parts/editor/media/IgnoreTrimWhiteSpace_16x_inverse.svg
 create mode 100755 src/vs/workbench/browser/parts/editor/media/Paragraph_16x_nohalo.svg
 create mode 100755 src/vs/workbench/browser/parts/editor/media/Paragraph_16x_nohalo_inversep.svg

diff --git a/src/vs/workbench/browser/parts/editor/media/IgnoreTrimWhiteSpaceChecked_16x.svg b/src/vs/workbench/browser/parts/editor/media/IgnoreTrimWhiteSpaceChecked_16x.svg
deleted file mode 100644
index 12a8e9f981a34..0000000000000
--- a/src/vs/workbench/browser/parts/editor/media/IgnoreTrimWhiteSpaceChecked_16x.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.st0{opacity:0}.st0,.st1{fill:#f6f6f6}.st2{fill:#424242}</style><g id="outline"><path class="st0" d="M0 0h16v16H0z"/><path class="st1" d="M12 4v8H4V4h8z"/></g><path class="st2" d="M5 9h6v2H5V9zm0-4v2h6V5H5z" id="icon_x5F_bg"/><rect fill="#000000" x="1" y="1" width="14" height="14" fill-opacity="0" stroke="#424242"></rect></svg>
diff --git a/src/vs/workbench/browser/parts/editor/media/IgnoreTrimWhiteSpaceChecked_16x_inverse.svg b/src/vs/workbench/browser/parts/editor/media/IgnoreTrimWhiteSpaceChecked_16x_inverse.svg
deleted file mode 100644
index d44a01472d4bd..0000000000000
--- a/src/vs/workbench/browser/parts/editor/media/IgnoreTrimWhiteSpaceChecked_16x_inverse.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.st0{opacity:0}.st0,.st1{fill:#252526}.st2{fill:#c5c5c5}</style><g id="outline"><path class="st0" d="M0 0h16v16H0z"/><path class="st1" d="M12 4v8H4V4h8z"/></g><path class="st2" d="M5 9h6v2H5V9zm0-4v2h6V5H5z" id="icon_x5F_bg"/><rect fill="#000000" x="1" y="1" width="14" height="14" fill-opacity="0" stroke="#c5c5c5"></rect></svg>
diff --git a/src/vs/workbench/browser/parts/editor/media/IgnoreTrimWhiteSpace_16x.svg b/src/vs/workbench/browser/parts/editor/media/IgnoreTrimWhiteSpace_16x.svg
deleted file mode 100644
index 05b193a5d028d..0000000000000
--- a/src/vs/workbench/browser/parts/editor/media/IgnoreTrimWhiteSpace_16x.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.st0{opacity:0}.st0,.st1{fill:#f6f6f6}.st2{fill:#424242}</style><g id="outline"><path class="st0" d="M0 0h16v16H0z"/><path class="st1" d="M12 4v8H4V4h8z"/></g><path class="st2" d="M5 9h6v2H5V9zm0-4v2h6V5H5z" id="icon_x5F_bg"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/media/IgnoreTrimWhiteSpace_16x_inverse.svg b/src/vs/workbench/browser/parts/editor/media/IgnoreTrimWhiteSpace_16x_inverse.svg
deleted file mode 100644
index 3b904eafa79a9..0000000000000
--- a/src/vs/workbench/browser/parts/editor/media/IgnoreTrimWhiteSpace_16x_inverse.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.st0{opacity:0}.st0,.st1{fill:#252526}.st2{fill:#c5c5c5}</style><g id="outline"><path class="st0" d="M0 0h16v16H0z"/><path class="st1" d="M12 4v8H4V4h8z"/></g><path class="st2" d="M5 9h6v2H5V9zm0-4v2h6V5H5z" id="icon_x5F_bg"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/media/Paragraph_16x_nohalo.svg b/src/vs/workbench/browser/parts/editor/media/Paragraph_16x_nohalo.svg
new file mode 100755
index 0000000000000..60eb7c92c9080
--- /dev/null
+++ b/src/vs/workbench/browser/parts/editor/media/Paragraph_16x_nohalo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-bg{fill:#424242;}</style></defs><title>Paragraph_16x</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M13,1V4H12V16H6V9.973A4.5,4.5,0,0,1,6.5,1Z"/></g><g id="iconBg"><path class="icon-vs-bg" d="M12,2V3H11V15H10V3H8V15H7V8.95A3.588,3.588,0,0,1,6.5,9a3.5,3.5,0,0,1,0-7Z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/media/Paragraph_16x_nohalo_inversep.svg b/src/vs/workbench/browser/parts/editor/media/Paragraph_16x_nohalo_inversep.svg
new file mode 100755
index 0000000000000..2cd7be5db696e
--- /dev/null
+++ b/src/vs/workbench/browser/parts/editor/media/Paragraph_16x_nohalo_inversep.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#252526;}.icon-canvas-transparent{opacity:0;}.icon-vs-bg{fill:#c5c5c5;}</style></defs><title>Paragraph_16x</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M13,1V4H12V16H6V9.973A4.5,4.5,0,0,1,6.5,1Z"/></g><g id="iconBg"><path class="icon-vs-bg" d="M12,2V3H11V15H10V3H8V15H7V8.95A3.588,3.588,0,0,1,6.5,9a3.5,3.5,0,0,1,0-7Z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/media/textdiffeditor.css b/src/vs/workbench/browser/parts/editor/media/textdiffeditor.css
index 86c6b735e4746..9fb019fa1aed2 100644
--- a/src/vs/workbench/browser/parts/editor/media/textdiffeditor.css
+++ b/src/vs/workbench/browser/parts/editor/media/textdiffeditor.css
@@ -22,17 +22,19 @@
 }
 
 .vs .monaco-workbench .textdiff-editor-action.toggleIgnoreTrimWhitespace {
-	background: url('IgnoreTrimWhiteSpace_16x.svg') center center no-repeat;
+	opacity: 1;
+	background: url('Paragraph_16x_nohalo.svg') center center no-repeat;
 }
 .vs-dark .monaco-workbench .textdiff-editor-action.toggleIgnoreTrimWhitespace,
 .hc-black .monaco-workbench .textdiff-editor-action.toggleIgnoreTrimWhitespace {
-	background: url('IgnoreTrimWhiteSpace_16x_inverse.svg	') center center no-repeat;
+	opacity: 1;
+	background: url('Paragraph_16x_nohalo_inversep.svg') center center no-repeat;
 }
 
 .vs .monaco-workbench .textdiff-editor-action.toggleIgnoreTrimWhitespace.is-checked {
-	background: url('IgnoreTrimWhiteSpaceChecked_16x.svg') center center no-repeat;
+	opacity: 0.5;
 }
 .vs-dark .monaco-workbench .textdiff-editor-action.toggleIgnoreTrimWhitespace.is-checked,
 .hc-black .monaco-workbench .textdiff-editor-action.toggleIgnoreTrimWhitespace.is-checked {
-	background: url('IgnoreTrimWhiteSpaceChecked_16x_inverse.svg	') center center no-repeat;
+	opacity: 0.5;
 }