Merge remote-tracking branch 'origin/develop' into feat/add-message-edition-wysiwyg-composer

res/css/_components.pcss

@@ -4,7 +4,7 @@
 @import "./_font-sizes.pcss";
 @import "./_font-weights.pcss";
 @import "./_spacing.pcss";
-@import "./components/atoms/_Icon.pcss";
+@import "./compound/_Icon.pcss";
 @import "./components/views/beacon/_BeaconListItem.pcss";
 @import "./components/views/beacon/_BeaconStatus.pcss";
 @import "./components/views/beacon/_BeaconStatusTooltip.pcss";
@@ -371,6 +371,7 @@
 @import "./views/voip/_VideoFeed.pcss";
 @import "./voice-broadcast/atoms/_LiveBadge.pcss";
 @import "./voice-broadcast/atoms/_PlaybackControlButton.pcss";
+@import "./voice-broadcast/atoms/_VoiceBroadcastControl.pcss";
 @import "./voice-broadcast/atoms/_VoiceBroadcastHeader.pcss";
 @import "./voice-broadcast/molecules/_VoiceBroadcastPlaybackBody.pcss";
 @import "./voice-broadcast/molecules/_VoiceBroadcastRecordingBody.pcss";

res/css/compound/_Icon.pcss

@@ -14,13 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+/*
+ * Compound icon
+
+ * {@link https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed}
+ */
+
 .mx_Icon {
     box-sizing: border-box;
-    display: inline-block;
-    mask-origin: content-box;
-    mask-position: center;
-    mask-repeat: no-repeat;
-    mask-size: contain;
     padding: 1px;
 }
 
@@ -28,15 +29,3 @@ limitations under the License.
     height: 16px;
     width: 16px;
 }
-
-.mx_Icon_accent {
-    background-color: $accent;
-}
-
-.mx_Icon_live-badge {
-    background-color: #fff;
-}
-
-.mx_Icon_compound-secondary-content {
-    background-color: $secondary-content;
-}

res/css/views/rooms/_RoomCallBanner.pcss

@@ -41,14 +41,14 @@ limitations under the License.
 
     &::before {
         display: inline-block;
-        vertical-align: text-top;
+        vertical-align: middle;
         content: "";
         background-color: $secondary-content;
         mask-size: 16px;
+        mask-position-y: center;
         width: 16px;
-        height: 16px;
-        margin-right: 4px;
-        bottom: 2px;
+        height: 1.2em; /* to match line height */
+        margin-right: 8px;
         mask-image: url("$(res)/img/element-icons/call/video-call.svg");
     }
 }

res/css/voice-broadcast/atoms/_VoiceBroadcastControl.pcss

@@ -0,0 +1,31 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_VoiceBroadcastControl {
+    align-items: center;
+    background-color: $background;
+    border-radius: 50%;
+    color: $secondary-content;
+    display: flex;
+    height: 32px;
+    justify-content: center;
+    margin-bottom: $spacing-8;
+    width: 32px;
+}
+
+.mx_VoiceBroadcastControl-recording {
+    color: $alert;
+}

res/css/voice-broadcast/molecules/_VoiceBroadcastRecordingPip.pcss

@@ -31,5 +31,5 @@ limitations under the License.
 
 .mx_VoiceBroadcastRecordingPip_controls {
     display: flex;
-    justify-content: center;
+    justify-content: space-around;
 }