Release video rooms as a beta feature

res/css/_components.scss

@@ -255,9 +255,11 @@
 @import "./views/rooms/_ReplyTile.scss";
 @import "./views/rooms/_RoomBreadcrumbs.scss";
 @import "./views/rooms/_RoomHeader.scss";
+@import "./views/rooms/_RoomInfoLine.scss";
 @import "./views/rooms/_RoomList.scss";
 @import "./views/rooms/_RoomListHeader.scss";
 @import "./views/rooms/_RoomPreviewBar.scss";
+@import "./views/rooms/_RoomPreviewCard.scss";
 @import "./views/rooms/_RoomSublist.scss";
 @import "./views/rooms/_RoomTile.scss";
 @import "./views/rooms/_RoomUpgradeWarningBar.scss";

res/css/structures/_SpaceRoomView.scss

@@ -137,124 +137,6 @@ $SpaceRoomViewInnerWidth: 428px;
         }
     }
 
-    .mx_SpaceRoomView_preview,
-    .mx_SpaceRoomView_landing {
-        .mx_SpaceRoomView_info_memberCount {
-            color: inherit;
-            position: relative;
-            padding: 0 0 0 16px;
-            font-size: $font-15px;
-            display: inline; // cancel inline-flex
-
-            &::before {
-                content: "·"; // visual separator
-                position: absolute;
-                left: 6px;
-            }
-        }
-    }
-
-    .mx_SpaceRoomView_preview {
-        padding: 32px 24px !important; // override default padding from above
-        margin: auto;
-        max-width: 480px;
-        box-sizing: border-box;
-        box-shadow: 2px 15px 30px $dialog-shadow-color;
-        border-radius: 8px;
-        position: relative;
-
-        // XXX remove this when spaces leaves Beta
-        .mx_BetaCard_betaPill {
-            position: absolute;
-            right: 24px;
-            top: 32px;
-        }
-
-        // XXX remove this when spaces leaves Beta
-        .mx_SpaceRoomView_preview_spaceBetaPrompt {
-            font-weight: $font-semi-bold;
-            font-size: $font-14px;
-            line-height: $font-24px;
-            color: $primary-content;
-            margin-top: 24px;
-            position: relative;
-            padding-left: 24px;
-
-            .mx_AccessibleButton_kind_link {
-                display: inline;
-                padding: 0;
-                font-size: inherit;
-                line-height: inherit;
-            }
-
-            &::before {
-                content: "";
-                position: absolute;
-                height: $font-24px;
-                width: 20px;
-                left: 0;
-                mask-repeat: no-repeat;
-                mask-position: center;
-                mask-size: contain;
-                mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
-                background-color: $secondary-content;
-            }
-        }
-
-        .mx_SpaceRoomView_preview_inviter {
-            display: flex;
-            align-items: center;
-            margin-bottom: 20px;
-            font-size: $font-15px;
-
-            > div {
-                margin-left: 8px;
-
-                .mx_SpaceRoomView_preview_inviter_name {
-                    line-height: $font-18px;
-                }
-
-                .mx_SpaceRoomView_preview_inviter_mxid {
-                    line-height: $font-24px;
-                    color: $secondary-content;
-                }
-            }
-        }
-
-        > .mx_RoomAvatar_isSpaceRoom {
-            &.mx_BaseAvatar_image, .mx_BaseAvatar_image {
-                border-radius: 12px;
-            }
-        }
-
-        h1.mx_SpaceRoomView_preview_name {
-            margin: 20px 0 !important; // override default margin from above
-        }
-
-        .mx_SpaceRoomView_preview_topic {
-            font-size: $font-14px;
-            line-height: $font-22px;
-            color: $secondary-content;
-            margin: 20px 0;
-            max-height: 160px;
-            overflow-y: auto;
-        }
-
-        .mx_SpaceRoomView_preview_joinButtons {
-            margin-top: 20px;
-
-            .mx_AccessibleButton {
-                width: 200px;
-                box-sizing: border-box;
-                padding: 14px 0;
-
-                & + .mx_AccessibleButton {
-                    margin-left: 20px;
-                }
-            }
-        }
-    }
-
     .mx_SpaceRoomView_landing {
         display: flex;
         flex-direction: column;
@@ -314,40 +196,6 @@ $SpaceRoomViewInnerWidth: 428px;
             flex-wrap: wrap;
             line-height: $font-24px;
 
-            .mx_SpaceRoomView_info {
-                color: $secondary-content;
-                font-size: $font-15px;
-                display: inline-block;
-
-                .mx_SpaceRoomView_info_public,
-                .mx_SpaceRoomView_info_private {
-                    padding-left: 20px;
-                    position: relative;
-
-                    &::before {
-                        position: absolute;
-                        content: "";
-                        width: 20px;
-                        height: 20px;
-                        top: 0;
-                        left: -2px;
-                        mask-position: center;
-                        mask-repeat: no-repeat;
-                        background-color: $tertiary-content;
-                    }
-                }
-
-                .mx_SpaceRoomView_info_public::before {
-                    mask-size: 12px;
-                    mask-image: url("$(res)/img/globe.svg");
-                }
-
-                .mx_SpaceRoomView_info_private::before {
-                    mask-size: 14px;
-                    mask-image: url("$(res)/img/element-icons/lock.svg");
-                }
-            }
-
             .mx_SpaceRoomView_landing_infoBar_interactive {
                 display: flex;
                 flex-wrap: wrap;

res/css/structures/_VideoRoomView.scss

@@ -24,8 +24,7 @@ limitations under the License.
     margin-right: calc($container-gap-width / 2);
 
     background-color: $header-panel-bg-color;
-    padding-top: 33px; // to match the right panel chat heading
-    border: 8px solid $header-panel-bg-color;
+    padding: 8px;
     border-radius: 8px;
 
     .mx_AppTile {

res/css/views/beta/_BetaCard.scss

@@ -20,6 +20,7 @@ limitations under the License.
     background-color: $system;
     border-radius: 8px;
     box-sizing: border-box;
+    color: $secondary-content;
 
     .mx_BetaCard_columns {
         display: flex;
@@ -45,14 +46,13 @@ limitations under the License.
             .mx_BetaCard_caption {
                 font-size: $font-15px;
                 line-height: $font-20px;
-                color: $secondary-content;
             }
 
             .mx_BetaCard_buttons {
                 display: flex;
                 flex-wrap: wrap-reverse;
-                gap: 12px;
-                margin: 20px auto;
+                gap: $spacing-12;
+                margin: $spacing-20 auto 0;
 
                 .mx_AccessibleButton {
                     padding: 7px 40px;
@@ -66,10 +66,16 @@ limitations under the License.
                 }
             }
 
-            .mx_BetaCard_disclaimer {
+            .mx_BetaCard_refreshWarning {
+                margin-top: $spacing-8;
+                font-size: $font-10px;
+                text-align: center;
+            }
+
+            .mx_BetaCard_faq {
+                margin-top: $spacing-20;
                 font-size: $font-12px;
                 line-height: $font-15px;
-                color: $secondary-content;
 
                 > h4 {
                     margin: 12px 0 0;
@@ -105,7 +111,6 @@ limitations under the License.
                 margin-top: 4px;
                 font-size: $font-12px;
                 line-height: $font-15px;
-                color: $secondary-content;
             }
         }
     }

res/css/views/elements/_FacePile.scss

@@ -15,6 +15,9 @@ limitations under the License.
 */
 
 .mx_FacePile {
+    display: flex;
+    align-items: center;
+
     .mx_FacePile_faces {
         display: inline-flex;
         flex-direction: row-reverse;

res/css/views/rooms/_RoomHeader.scss

@@ -44,6 +44,10 @@ limitations under the License.
     .mx_InviteOnlyIcon_large {
         margin: 0;
     }
+
+    .mx_BetaCard_betaPill {
+        margin-right: $spacing-8;
+    }
 }
 
 .mx_RoomHeader_spinner {

res/css/views/rooms/_RoomInfoLine.scss

@@ -0,0 +1,58 @@
+/*
+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_RoomInfoLine {
+    color: $secondary-content;
+    display: inline-block;
+
+    &::before {
+        content: "";
+        display: inline-block;
+        height: 1.2em;
+        mask-position-y: center;
+        mask-repeat: no-repeat;
+        background-color: $tertiary-content;
+        vertical-align: text-bottom;
+        margin-right: 6px;
+    }
+
+    &.mx_RoomInfoLine_public::before {
+        width: 12px;
+        mask-size: 12px;
+        mask-image: url("$(res)/img/globe.svg");
+    }
+
+    &.mx_RoomInfoLine_private::before {
+        width: 14px;
+        mask-size: 14px;
+        mask-image: url("$(res)/img/element-icons/lock.svg");
+    }
+
+    &.mx_RoomInfoLine_video::before {
+        width: 16px;
+        mask-size: 16px;
+        mask-image: url("$(res)/img/element-icons/call/video-call.svg");
+    }
+
+    .mx_RoomInfoLine_members {
+        color: inherit;
+
+        &::before {
+            content: "·"; // visual separator
+            margin: 0 6px;
+        }
+    }
+}