imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: Space scope header overflow (#11933)

Browse source 
* fix spacing for scope header

* extract scope header into component, apply line clamp

* update ThirdPartyMemberInfo styles

* pass onClose to ThirdPartyRoomMemberInfo

* rethemendex

* add View3pidInvite to actions enum, replace uses

* extract out action handler

* push card instead, test

* comment

* reinstate data-testid

* fix typo in styles
This commit is contained in:
Kerry 2023-11-29 21:25:34 +13:00 • committed by GitHub
parent 4d0a34bb26
commit 1ffa1c9c18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 188 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

3
res/css/_components.pcss
View file

@ -285,7 +285,6 @@
@import "./views/rooms/_LinkPreviewGroup.pcss";
@import "./views/rooms/_LinkPreviewWidget.pcss";
@import "./views/rooms/_LiveContentSummary.pcss";
@import "./views/rooms/_MemberInfo.pcss";
@import "./views/rooms/_MemberList.pcss";
@import "./views/rooms/_MessageComposer.pcss";
@import "./views/rooms/_MessageComposerFormatBar.pcss";
@ -310,7 +309,9 @@
@import "./views/rooms/_RoomUpgradeWarningBar.pcss";
@import "./views/rooms/_SearchBar.pcss";
@import "./views/rooms/_SendMessageComposer.pcss";
@import "./views/rooms/_SpaceScopeHeader.pcss";
@import "./views/rooms/_Stickers.pcss";
@import "./views/rooms/_ThirdPartyMemberInfo.pcss";
@import "./views/rooms/_ThreadSummary.pcss";
@import "./views/rooms/_TopUnreadMessagesBar.pcss";
@import "./views/rooms/_VoiceRecordComposerTile.pcss";

13
res/css/structures/_RightPanel.pcss
View file

@ -99,16 +99,3 @@ limitations under the License.
mask-position: center;
}
}
.mx_RightPanel_scopeHeader {
margin: 24px;
text-align: center;
font-weight: var(--cpd-font-weight-semibold);
font-size: $font-18px;
line-height: $font-22px;
.mx_BaseAvatar {
margin-right: 8px;
vertical-align: middle;
}
}

111
res/css/views/rooms/_MemberInfo.pcss
View file

@ -1,111 +0,0 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
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_MemberInfo {
display: flex;
flex-direction: column;
flex: 1;
overflow-y: auto;
margin-top: 8px;
h2 {
font-size: $font-18px;
font-weight: var(--cpd-font-weight-semibold);
margin: 16px 0 16px 15px;
}
.mx_RoomTile_titleContainer {
width: 154px;
}
.mx_RoomTile_badge {
display: none;
}
.mx_RoomTile_title {
width: 160px;
}
h3 {
text-transform: uppercase;
color: $input-darker-fg-color;
font-weight: bold;
font-size: $font-12px;
margin: 4px 0;
}
}
.mx_MemberInfo_name {
align-items: center;
display: flex;
> .mx_E2EIcon {
margin-right: 0;
}
h2 {
flex: 1;
overflow-x: auto;
max-height: 50px;
}
}
.mx_MemberInfo_cancel {
height: 16px;
width: 16px;
padding: 10px 0 10px 10px;
cursor: pointer;
mask-image: url("$(res)/img/minimise.svg");
mask-repeat: no-repeat;
mask-position: 16px center;
background-color: $header-panel-text-primary-color;
}
.mx_MemberInfo_container {
margin: 0 16px 16px 16px;
&.mx_MemberInfo_container--profile {
margin-bottom: 16px;
font-size: $font-15px;
position: relative;
}
}
.mx_MemberInfo_avatar {
background: $spacePanel-bg-color;
margin-bottom: 16px;
> img {
height: auto;
width: 100%;
max-height: 30vh;
object-fit: contain;
display: block;
}
.mx_BaseAvatar img {
cursor: zoom-in;
}
}
.mx_MemberInfo_field {
cursor: pointer;
font-size: $font-15px;
color: $primary-content;
margin-left: 8px;
margin-bottom: 16px;
line-height: $font-23px;
}

6
res/css/views/rooms/_MemberList.pcss
View file

@ -42,12 +42,6 @@ limitations under the License.
.mx_AutoHideScrollbar {
flex: 1 1 0;
}
.mx_RightPanel_scopeHeader {
/* vertically align with position on other right panel cards */
/* to prevent it bouncing as user navigates right panel */
margin-top: -8px;
}
}
.mx_MemberList_chevron {

29
res/css/views/rooms/_SpaceScopeHeader.pcss Normal file
View file

@ -0,0 +1,29 @@
/*
Copyright 2023 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_SpaceScopeHeader {
text-align: center;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
overflow: hidden;
.mx_BaseAvatar {
margin-right: var(--cpd-space-2x);
vertical-align: middle;
}
}

19
res/css/views/rooms/_ThirdPartyMemberInfo.pcss Normal file
View file

@ -0,0 +1,19 @@
/*
Copyright 2023 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_ThirdPartyMemberInfo {
padding: var(--cpd-space-4x);
}