Merge branch 'toger5/move-settings-out-of-bottom-bar' into

toger5/bottom-bar-storybook
This commit is contained in:
Timo K
2026-04-14 18:09:50 +02:00
7 changed files with 57 additions and 29 deletions

View File

@@ -16,7 +16,7 @@ import {
useMemo,
useState,
} from "react";
import { Button, Heading, Tooltip } from "@vector-im/compound-web";
import { Heading, IconButton, Tooltip } from "@vector-im/compound-web";
import { CollapseIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
import { useTranslation } from "react-i18next";
import { logger } from "matrix-js-sdk/lib/logger";
@@ -71,12 +71,9 @@ export const AppBar: FC<Props> = ({ children }) => {
>
<LeftNav>
<Tooltip label={t("common.back")}>
<Button
kind={"tertiary"}
iconOnly
Icon={CollapseIcon}
onClick={onBackClick}
/>
<IconButton onClick={onBackClick}>
<CollapseIcon />
</IconButton>
</Tooltip>
</LeftNav>
{title && (