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

Don't show public indicator on spaces (#8607)

Browse source
This commit is contained in:
Šimon Brandner 2022-05-16 10:24:01 +02:00 • committed by GitHub
parent 42f12485bc
commit e1d11db256
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
res/css/views/avatars/_BaseAvatar.scss
View file

@ -29,8 +29,6 @@ limitations under the License.
user-select: none; user-select: none;
&.mx_RoomAvatar_isSpaceRoom { &.mx_RoomAvatar_isSpaceRoom {
mask-image: unset !important; // override mx_DecoratedRoomAvatar_cutout
&.mx_BaseAvatar_image, .mx_BaseAvatar_image { &.mx_BaseAvatar_image, .mx_BaseAvatar_image {
border-radius: 8px; border-radius: 8px;
} }

6
src/components/views/rooms/RecentlyViewedButton.tsx
View file

@ -27,6 +27,7 @@ import { Action } from "../../../dispatcher/actions";
import DecoratedRoomAvatar from "../avatars/DecoratedRoomAvatar"; import DecoratedRoomAvatar from "../avatars/DecoratedRoomAvatar";
import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload"; import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
import { roomContextDetailsText } from "../../../utils/i18n-helpers"; import { roomContextDetailsText } from "../../../utils/i18n-helpers";
import RoomAvatar from "../avatars/RoomAvatar";
const RecentlyViewedButton = () => { const RecentlyViewedButton = () => {
const tooltipRef = useRef<InteractiveTooltip>(); const tooltipRef = useRef<InteractiveTooltip>();
@ -50,7 +51,10 @@ const RecentlyViewedButton = () => {
tooltipRef.current?.hideTooltip(); tooltipRef.current?.hideTooltip();
}} }}
> >
<DecoratedRoomAvatar room={crumb} avatarSize={24} tooltipProps={{ tabIndex: -1 }} /> { crumb.isSpaceRoom()
? <RoomAvatar room={crumb} width={24} height={24} />
: <DecoratedRoomAvatar room={crumb} avatarSize={24} tooltipProps={{ tabIndex: -1 }} />
}
<span className="mx_RecentlyViewedButton_entry_label"> <span className="mx_RecentlyViewedButton_entry_label">
<div>{ crumb.name }</div> <div>{ crumb.name }</div>
{ contextDetails && <div className="mx_RecentlyViewedButton_entry_spaces"> { contextDetails && <div className="mx_RecentlyViewedButton_entry_spaces">