From 729d59160df74580861ca376ac0426155c20af61 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 23 Nov 2020 15:27:37 +0000
Subject: [PATCH] Rename buttons in CSS & remove unused

---
 res/css/views/voip/_CallView.scss            | 10 +++++-----
 res/img/element-icons/call/video-muted.svg   |  5 -----
 res/img/element-icons/call/voice-muted.svg   |  4 ----
 res/img/element-icons/call/voice-unmuted.svg |  3 ---
 4 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 res/img/element-icons/call/video-muted.svg
 delete mode 100644 res/img/element-icons/call/voice-muted.svg
 delete mode 100644 res/img/element-icons/call/voice-unmuted.svg

diff --git a/res/css/views/voip/_CallView.scss b/res/css/views/voip/_CallView.scss
index f0bcf0959c..2b87181b1e 100644
--- a/res/css/views/voip/_CallView.scss
+++ b/res/css/views/voip/_CallView.scss
@@ -175,31 +175,31 @@ limitations under the License.
 
 .mx_CallView_callControls_button_micOn {
     &::before {
-        background-image: url('$(res)/img/voip_buttons/mic_on.svg');
+        background-image: url('$(res)/img/voip/mic-on.svg');
     }
 }
 
 .mx_CallView_callControls_button_micOff {
     &::before {
-        background-image: url('$(res)/img/voip_buttons/mic_off.svg');
+        background-image: url('$(res)/img/voip/mic-off.svg');
     }
 }
 
 .mx_CallView_callControls_button_vidOn {
     &::before {
-        background-image: url('$(res)/img/voip_buttons/vid_on.svg');
+        background-image: url('$(res)/img/voip/vid-on.svg');
     }
 }
 
 .mx_CallView_callControls_button_vidOff {
     &::before {
-        background-image: url('$(res)/img/voip_buttons/vid_off.svg');
+        background-image: url('$(res)/img/voip/vid-off.svg');
     }
 }
 
 .mx_CallView_callControls_button_hangup {
     &::before {
-        background-image: url('$(res)/img/voip_buttons/hangup.svg');
+        background-image: url('$(res)/img/voip/hangup.svg');
     }
 }
 
diff --git a/res/img/element-icons/call/video-muted.svg b/res/img/element-icons/call/video-muted.svg
deleted file mode 100644
index d2aea71d11..0000000000
--- a/res/img/element-icons/call/video-muted.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1 2L19 20" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3 4H4.41122L17 16.615V19.415C16.9914 19.4057 16.9825 19.3965 16.9735 19.3874L1.98909 4.37176C1.93823 4.32079 1.88324 4.27646 1.82519 4.23876C2.18599 4.08505 2.58306 4 3 4ZM0.386676 5.52565C0.140502 5.96107 0 6.46413 0 7V17C0 18.6569 1.34315 20 3 20H14.7593L0.573407 5.78449C0.495634 5.70656 0.433392 5.619 0.386676 5.52565ZM17 7V13.7837L7.2367 4H14C15.6569 4 17 5.34315 17 7Z" fill="white"/>
-<path d="M19 9L22.3753 6.29976C23.0301 5.77595 24 6.24212 24 7.08062V16.9194C24 17.7579 23.0301 18.2241 22.3753 17.7002L19 15V9Z" fill="white"/>
-</svg>
diff --git a/res/img/element-icons/call/voice-muted.svg b/res/img/element-icons/call/voice-muted.svg
deleted file mode 100644
index 32abafb04a..0000000000
--- a/res/img/element-icons/call/voice-muted.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 3L21 21" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8 6.59209V12C8 14.2091 9.79086 16 12 16C13.4616 16 14.7402 15.216 15.4381 14.0457L8 6.59209ZM16.8804 15.491C15.7918 17.0102 14.0115 18 12 18C8.68629 18 6 15.3137 6 12C6 11.4477 5.55228 11 5 11C4.44772 11 4 11.4477 4 12C4 16.0796 7.05369 19.446 11 19.9381V21C11 21.5523 11.4477 22 12 22C12.5523 22 13 21.5523 13 21V19.9381C15.1511 19.6699 17.037 18.5476 18.3077 16.9213L16.8804 15.491ZM19.3589 15.1433L17.7917 13.5729C17.9275 13.0716 18 12.5443 18 12C18 11.4477 18.4477 11 19 11C19.5523 11 20 11.4477 20 12C20 13.1159 19.7715 14.1783 19.3589 15.1433ZM16 11.7774L8.43077 4.19238C9.09091 2.89149 10.4413 2 12 2C14.2091 2 16 3.79086 16 6V11.7774Z" fill="white"/>
-</svg>
diff --git a/res/img/element-icons/call/voice-unmuted.svg b/res/img/element-icons/call/voice-unmuted.svg
deleted file mode 100644
index e664080217..0000000000
--- a/res/img/element-icons/call/voice-unmuted.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8 6C8 3.79086 9.79086 2 12 2C14.2091 2 16 3.79086 16 6V12C16 14.2091 14.2091 16 12 16C9.79086 16 8 14.2091 8 12V6ZM5 11C5.55228 11 6 11.4477 6 12C6 15.3137 8.68629 18 12 18C15.3137 18 18 15.3137 18 12C18 11.4477 18.4477 11 19 11C19.5523 11 20 11.4477 20 12C20 16.0796 16.9463 19.446 13 19.9381V21C13 21.5523 12.5523 22 12 22C11.4477 22 11 21.5523 11 21V19.9381C7.05369 19.446 4 16.0796 4 12C4 11.4477 4.44772 11 5 11Z" fill="white"/>
-</svg>