Merge remote-tracking branch 'upstream/main' into SimonBrandner/feat/volume-design

This commit is contained in:
Šimon Brandner committed 2022-08-01 19:23:07 +02:00
commit c5e7fe7bdc
2 files changed
+3 -3

No files matched your search

+2 -2
View File
@@ -31,8 +31,8 @@ interface Props extends HTMLAttributes<HTMLDivElement> {
className: string; className: string;
client: MatrixClient; client: MatrixClient;
participants: RoomMember[]; participants: RoomMember[];
max: number; max?: number;
size: Size; size?: Size;
} }
export function Facepile({ export function Facepile({
+1 -1
View File
@@ -8,7 +8,7 @@ import { ProfileModal } from "./profile/ProfileModal";
import { UserMenu } from "./UserMenu"; import { UserMenu } from "./UserMenu";
interface Props { interface Props {
preventNavigation: boolean; preventNavigation?: boolean;
} }
export function UserMenuContainer({ preventNavigation }: Props) { export function UserMenuContainer({ preventNavigation }: Props) {