From 55b576a299ceaffe57bd763bba6cd617d0633bef Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Tue, 27 Apr 2021 10:28:09 +0200 Subject: [PATCH] rename .TimelinePanel to .RoomView_body --- src/platform/web/ui/css/layout.css | 6 +++--- src/platform/web/ui/css/timeline.css | 5 +---- src/platform/web/ui/session/room/RoomView.js | 14 +++++++------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/platform/web/ui/css/layout.css b/src/platform/web/ui/css/layout.css index 9917ca74..e47f7777 100644 --- a/src/platform/web/ui/css/layout.css +++ b/src/platform/web/ui/css/layout.css @@ -122,8 +122,8 @@ main { height: 100%; } -.TimelinePanel { - flex: 3; +.RoomView_body { + flex: 1; min-height: 0; min-width: 0; display: flex; @@ -131,7 +131,7 @@ main { height: 100%; } -.TimelinePanel .Timeline, .TimelinePanel .TimelineLoadingView { +.RoomView_body .Timeline, .RoomView_body .TimelineLoadingView { flex: 1 0 0; } diff --git a/src/platform/web/ui/css/timeline.css b/src/platform/web/ui/css/timeline.css index 8a766a54..5d082c08 100644 --- a/src/platform/web/ui/css/timeline.css +++ b/src/platform/web/ui/css/timeline.css @@ -15,7 +15,7 @@ limitations under the License. */ -.TimelinePanel ul { +.RoomView_body ul { overflow-y: auto; overscroll-behavior: contain; list-style: none; @@ -23,9 +23,6 @@ limitations under the License. margin: 0; } -.TimelinePanel li { -} - .message-container { flex: 0 1 auto; /* first try break-all, then break-word, which isn't supported everywhere */ diff --git a/src/platform/web/ui/session/room/RoomView.js b/src/platform/web/ui/session/room/RoomView.js index a218964b..470e940d 100644 --- a/src/platform/web/ui/session/room/RoomView.js +++ b/src/platform/web/ui/session/room/RoomView.js @@ -24,14 +24,14 @@ import {AvatarView} from "../../avatar.js"; export class RoomView extends TemplateView { render(t, vm) { return t.main({className: "RoomView middle"}, [ - t.div({className: "TimelinePanel"}, [ - t.div({className: "RoomHeader middle-header"}, [ - t.a({className: "button-utility close-middle", href: vm.closeUrl, title: vm.i18n`Close room`}), - t.view(new AvatarView(vm, 32)), - t.div({className: "room-description"}, [ - t.h2(vm => vm.name), - ]), + t.div({className: "RoomHeader middle-header"}, [ + t.a({className: "button-utility close-middle", href: vm.closeUrl, title: vm.i18n`Close room`}), + t.view(new AvatarView(vm, 32)), + t.div({className: "room-description"}, [ + t.h2([vm => vm.name, vm => vm.membership]), ]), + ]), + t.div({className: "RoomView_body"}, [ t.div({className: "RoomView_error"}, vm => vm.error), t.mapView(vm => vm.timelineViewModel, timelineViewModel => { return timelineViewModel ?