Merge branch 'dev' into add-international-time

This commit is contained in:
Gimle Larpes 2025-05-28 22:30:56 +02:00 committed by GitHub
commit 0ba17f9cdb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 15 additions and 18 deletions

View file

@ -71,7 +71,7 @@ const useSettingsMenuItems = (): SettingsMenuItem[] =>
{
page: SettingsPages.DevicesPage,
name: 'Devices',
icon: Icons.Category,
icon: Icons.Monitor,
},
{
page: SettingsPages.EmojisStickersPage,

View file

@ -209,7 +209,7 @@ export function Explore() {
<Box as="span" grow="Yes" alignItems="Center" gap="200">
<Avatar size="200" radii="400">
<Icon
src={Icons.Category}
src={Icons.Server}
size="100"
filled={selectedServer === userServer}
/>
@ -243,11 +243,7 @@ export function Explore() {
<NavItemContent>
<Box as="span" grow="Yes" alignItems="Center" gap="200">
<Avatar size="200" radii="400">
<Icon
src={Icons.Category}
size="100"
filled={server === selectedServer}
/>
<Icon src={Icons.Server} size="100" filled={server === selectedServer} />
</Avatar>
<Box as="span" grow="Yes">
<Text as="span" size="Inherit" truncate>

View file

@ -507,7 +507,7 @@ export function PublicRooms() {
)}
</Box>
<Box grow="Yes" justifyContent="Center" alignItems="Center" gap="200">
{screenSize !== ScreenSize.Mobile && <Icon size="400" src={Icons.Category} />}
{screenSize !== ScreenSize.Mobile && <Icon size="400" src={Icons.Server} />}
<Text size="H3" truncate>
{server}
</Text>