From d55699211e0a3b93ffc1ed898dc10c18c78dcf41 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 27 Jul 2020 15:13:02 +0100
Subject: [PATCH] Update copy icon on pre block and share dialogues

---
 res/css/views/dialogs/_ShareDialog.scss        | 3 ++-
 res/css/views/rooms/_EventTile.scss            | 5 +++--
 res/img/feather-customised/clipboard.svg       | 4 ++++
 res/themes/legacy-light/css/_legacy-light.scss | 3 ++-
 res/themes/light/css/_light.scss               | 2 +-
 src/components/views/dialogs/ShareDialog.tsx   | 1 -
 src/i18n/strings/en_EN.json                    | 1 -
 7 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 res/img/feather-customised/clipboard.svg

diff --git a/res/css/views/dialogs/_ShareDialog.scss b/res/css/views/dialogs/_ShareDialog.scss
index d2fe98e8f9..c343b872fd 100644
--- a/res/css/views/dialogs/_ShareDialog.scss
+++ b/res/css/views/dialogs/_ShareDialog.scss
@@ -51,7 +51,8 @@ limitations under the License.
     display: inherit;
 }
 .mx_ShareDialog_matrixto_copy > div {
-    background-image: url($copy-button-url);
+    mask-image: url($copy-button-url);
+    background-color: $message-action-bar-fg-color;
     margin-left: 5px;
     width: 20px;
     height: 20px;
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 2a2191b799..eb0e1dd7b0 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -536,11 +536,12 @@ $left-gutter: 64px;
     display: inline-block;
     visibility: hidden;
     cursor: pointer;
-    top: 8px;
+    top: 6px;
     right: 6px;
     width: 19px;
     height: 19px;
-    background-image: url($copy-button-url);
+    mask-image: url($copy-button-url);
+    background-color: $message-action-bar-fg-color;
 }
 
 .mx_EventTile_body .mx_EventTile_pre_container:focus-within .mx_EventTile_copyButton,
diff --git a/res/img/feather-customised/clipboard.svg b/res/img/feather-customised/clipboard.svg
new file mode 100644
index 0000000000..b25b97176c
--- /dev/null
+++ b/res/img/feather-customised/clipboard.svg
@@ -0,0 +1,4 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.75 3.75H3.75V10.75" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<rect x="7" y="7" width="7" height="7" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss
index 3465aa307e..af5461be83 100644
--- a/res/themes/legacy-light/css/_legacy-light.scss
+++ b/res/themes/legacy-light/css/_legacy-light.scss
@@ -228,7 +228,8 @@ $event-redacted-border-color: #cccccc;
 // event timestamp
 $event-timestamp-color: #acacac;
 
-$copy-button-url: "$(res)/img/icon_copy_message.svg";
+$copy-button-url: "$(res)/img/feather-customised/clipboard.svg";
+
 
 // e2e
 $e2e-verified-color: #76cfa5; // N.B. *NOT* the same as $accent-color
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index e317683963..315ea1c0a5 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -227,7 +227,7 @@ $event-redacted-border-color: #cccccc;
 // event timestamp
 $event-timestamp-color: #acacac;
 
-$copy-button-url: "$(res)/img/icon_copy_message.svg";
+$copy-button-url: "$(res)/img/feather-customised/clipboard.svg";
 
 // e2e
 $e2e-verified-color: #76cfa5; // N.B. *NOT* the same as $accent-color
diff --git a/src/components/views/dialogs/ShareDialog.tsx b/src/components/views/dialogs/ShareDialog.tsx
index 2e1529cbf1..0712e6fe3f 100644
--- a/src/components/views/dialogs/ShareDialog.tsx
+++ b/src/components/views/dialogs/ShareDialog.tsx
@@ -211,7 +211,6 @@ export default class ShareDialog extends React.PureComponent<IProps, IState> {
                         { matrixToUrl }
                     </a>
                     <a href={matrixToUrl} className="mx_ShareDialog_matrixto_copy" onClick={this.onCopyClick}>
-                        { _t('COPY') }
                         <div>&nbsp;</div>
                     </a>
                 </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 18e2da9a31..04ddb71444 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1778,7 +1778,6 @@
     "Share Community": "Share Community",
     "Share Room Message": "Share Room Message",
     "Link to selected message": "Link to selected message",
-    "COPY": "COPY",
     "Command Help": "Command Help",
     "To help us prevent this in future, please <a>send us logs</a>.": "To help us prevent this in future, please <a>send us logs</a>.",
     "Missing session data": "Missing session data",