diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss index 3547225ce7..a008a83aa6 100644 --- a/res/css/structures/_RoomView.scss +++ b/res/css/structures/_RoomView.scss @@ -213,14 +213,20 @@ hr.mx_RoomView_myReadMarker { } // Immersive widgets -.mx_RoomView_body > .mx_AppTile { - margin: $container-gap-width; - margin-right: calc($container-gap-width / 2); - width: auto; - height: 100%; - padding-top: 33px; // to match the right panel chat heading +.mx_RoomView_immersive { + .mx_RoomHeader_wrapper { + border: unset; + } - border-radius: 8px; + .mx_AppTile { + margin: $container-gap-width; + margin-right: calc($container-gap-width / 2); + width: auto; + height: 100%; + padding-top: 33px; // to match the right panel chat heading + + border-radius: 8px; + } } .mx_RoomView_callStatusBar .mx_UploadBar_uploadProgressInner { diff --git a/res/css/views/rooms/_AppsDrawer.scss b/res/css/views/rooms/_AppsDrawer.scss index 1b008d76aa..47aa9a9d2a 100644 --- a/res/css/views/rooms/_AppsDrawer.scss +++ b/res/css/views/rooms/_AppsDrawer.scss @@ -148,8 +148,6 @@ $MinWidth: 240px; width: 50%; min-width: $MinWidth; border: $container-border-width solid $widget-menu-bar-bg-color; - border-left-width: 5px; - border-right-width: 5px; display: flex; flex-direction: column; box-sizing: border-box; diff --git a/res/css/views/rooms/_RoomList.scss b/res/css/views/rooms/_RoomList.scss index 2763ad653f..bbac00e0e6 100644 --- a/res/css/views/rooms/_RoomList.scss +++ b/res/css/views/rooms/_RoomList.scss @@ -25,7 +25,7 @@ limitations under the License. mask-image: url('$(res)/img/element-icons/roomlist/hash-plus.svg'); } .mx_RoomList_iconNewVideoRoom::before { - mask-image: url('$(res)/img/element-icons/call/video-call.svg'); + mask-image: url('$(res)/img/element-icons/roomlist/hash-video.svg'); } .mx_RoomList_iconAddExistingRoom::before { mask-image: url('$(res)/img/element-icons/roomlist/hash.svg'); diff --git a/res/css/views/rooms/_RoomListHeader.scss b/res/css/views/rooms/_RoomListHeader.scss index c4bc8c151f..7f5d06d549 100644 --- a/res/css/views/rooms/_RoomListHeader.scss +++ b/res/css/views/rooms/_RoomListHeader.scss @@ -107,7 +107,7 @@ limitations under the License. mask-image: url('$(res)/img/element-icons/roomlist/hash-plus.svg'); } .mx_RoomListHeader_iconNewVideoRoom::before { - mask-image: url('$(res)/img/element-icons/call/video-call.svg'); + mask-image: url('$(res)/img/element-icons/roomlist/hash-video.svg'); } .mx_RoomListHeader_iconExplore::before { mask-image: url('$(res)/img/element-icons/roomlist/hash-search.svg'); diff --git a/res/img/element-icons/roomlist/hash-video.svg b/res/img/element-icons/roomlist/hash-video.svg new file mode 100644 index 0000000000..b0e1decf68 --- /dev/null +++ b/res/img/element-icons/roomlist/hash-video.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx index 2cf8b42265..29f6445574 100644 --- a/src/components/structures/RoomView.tsx +++ b/src/components/structures/RoomView.tsx @@ -2100,6 +2100,7 @@ export class RoomView extends React.Component { const mainClasses = classNames("mx_RoomView", { mx_RoomView_inCall: Boolean(activeCall), + mx_RoomView_immersive: this.state.mainSplitContentType === MainSplitContentType.Video, }); const showChatEffects = SettingsStore.getValue('showChatEffects');