Use compound Mic icons everywhere (#9849)

matrix-org · Jan 2, 2023 · ecb3e7a · ecb3e7a
1 parent 0f7a2ce
commit ecb3e7a
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 29 deletions.
diff --git a/res/css/views/rooms/_MessageComposer.pcss b/res/css/views/rooms/_MessageComposer.pcss
@@ -254,7 +254,7 @@ limitations under the License.
 }
 
 .mx_MessageComposer_voiceMessage::before {
-    mask-image: url("$(res)/img/voip/mic-on-mask.svg");
+    mask-image: url("$(res)/img/element-icons/mic.svg");
 }
 
 .mx_MessageComposer_voiceBroadcast::before {

diff --git a/res/css/views/voip/LegacyCallView/_LegacyCallViewButtons.pcss b/res/css/views/voip/LegacyCallView/_LegacyCallViewButtons.pcss
@@ -94,7 +94,9 @@ limitations under the License.
             }
 
             &.mx_LegacyCallViewButtons_button_mic::before {
-                mask-image: url("$(res)/img/voip/call-view/mic-on.svg");
+                height: 20px;
+                mask-image: url("$(res)/img/element-icons/mic.svg");
+                width: 20px;
             }
 
             &.mx_LegacyCallViewButtons_button_vid::before {
@@ -123,7 +125,9 @@ limitations under the License.
             }
 
             &.mx_LegacyCallViewButtons_button_mic::before {
-                mask-image: url("$(res)/img/voip/call-view/mic-off.svg");
+                height: 20px;
+                mask-image: url("$(res)/img/element-icons/Mic-off.svg");
+                width: 20px;
             }
 
             &.mx_LegacyCallViewButtons_button_vid::before {

diff --git a/res/css/views/voip/_CallView.pcss b/res/css/views/voip/_CallView.pcss
@@ -135,7 +135,8 @@ limitations under the License.
                         }
 
                         &.mx_CallView_deviceButton_audio::before {
-                            mask-image: url("$(res)/img/voip/call-view/mic-on.svg");
+                            mask-image: url("$(res)/img/element-icons/mic.svg");
+                            mask-size: 14px;
                         }
 
                         &.mx_CallView_deviceButton_video::before {
@@ -179,7 +180,8 @@ limitations under the License.
 
                         .mx_CallView_deviceButton {
                             &.mx_CallView_deviceButton_audio::before {
-                                mask-image: url("$(res)/img/voip/call-view/mic-off.svg");
+                                mask-image: url("$(res)/img/element-icons/Mic-off.svg");
+                                mask-size: 14px;
                             }
 
                             &.mx_CallView_deviceButton_video::before {

diff --git a/res/css/views/voip/_VideoFeed.pcss b/res/css/views/voip/_VideoFeed.pcss
@@ -70,8 +70,8 @@ limitations under the License.
         &::before {
             position: absolute;
             content: "";
-            width: 16px;
-            height: 16px;
+            width: 17px;
+            height: 17px;
             mask-repeat: no-repeat;
             mask-size: contain;
             mask-position: center;
@@ -80,11 +80,11 @@ limitations under the License.
         }
 
         &.mx_VideoFeed_mic_muted::before {
-            mask-image: url("$(res)/img/voip/mic-muted.svg");
+            mask-image: url("$(res)/img/element-icons/Mic-off.svg");
         }
 
         &.mx_VideoFeed_mic_unmuted::before {
-            mask-image: url("$(res)/img/voip/mic-unmuted.svg");
+            mask-image: url("$(res)/img/element-icons/mic.svg");
         }
     }
 }
diff --git a/res/img/element-icons/Mic-off.svg b/res/img/element-icons/Mic-off.svg
diff --git a/res/img/element-icons/Mic.svg → res/img/element-icons/mic.svg b/res/img/element-icons/Mic.svg → res/img/element-icons/mic.svg
diff --git a/res/img/voip/call-view/mic-off.svg b/res/img/voip/call-view/mic-off.svg
diff --git a/res/img/voip/call-view/mic-on.svg b/res/img/voip/call-view/mic-on.svg
diff --git a/res/img/voip/mic-muted.svg b/res/img/voip/mic-muted.svg
diff --git a/res/img/voip/mic-on-mask.svg b/res/img/voip/mic-on-mask.svg
diff --git a/res/img/voip/mic-unmuted.svg b/res/img/voip/mic-unmuted.svg
diff --git a/src/voice-broadcast/components/atoms/VoiceBroadcastHeader.tsx b/src/voice-broadcast/components/atoms/VoiceBroadcastHeader.tsx
@@ -17,7 +17,7 @@ import classNames from "classnames";
 
 import { LiveBadge, VoiceBroadcastLiveness } from "../..";
 import { Icon as LiveIcon } from "../../../../res/img/element-icons/live.svg";
-import { Icon as MicrophoneIcon } from "../../../../res/img/voip/call-view/mic-on.svg";
+import { Icon as MicrophoneIcon } from "../../../../res/img/element-icons/mic.svg";
 import { Icon as TimerIcon } from "../../../../res/img/element-icons/Timer.svg";
 import { _t } from "../../../languageHandler";
 import RoomAvatar from "../../../components/views/avatars/RoomAvatar";

diff --git a/src/voice-broadcast/components/molecules/VoiceBroadcastRecordingPip.tsx b/src/voice-broadcast/components/molecules/VoiceBroadcastRecordingPip.tsx
@@ -22,7 +22,7 @@ import { VoiceBroadcastHeader } from "../atoms/VoiceBroadcastHeader";
 import { Icon as StopIcon } from "../../../../res/img/element-icons/Stop.svg";
 import { Icon as PauseIcon } from "../../../../res/img/element-icons/pause.svg";
 import { Icon as RecordIcon } from "../../../../res/img/element-icons/Record.svg";
-import { Icon as MicrophoneIcon } from "../../../../res/img/element-icons/Mic.svg";
+import { Icon as MicrophoneIcon } from "../../../../res/img/element-icons/mic.svg";
 import { _t } from "../../../languageHandler";
 import { useAudioDeviceSelection } from "../../../hooks/useAudioDeviceSelection";
 import { DevicesContextMenu } from "../../../components/views/audio_messages/DevicesContextMenu";