Compare commits

..

No commits in common. "b86967fc3c7f860cd7e441768c98731b4906572a" and "0d0ea8f09f9d3ff9959e772a035c0c21309f4ee8" have entirely different histories.

7 changed files with 10 additions and 10 deletions

View file

@ -17,6 +17,7 @@
} }
& .segmented-controls { & .segmented-controls {
margin: var(--sp-extra-tight); margin: var(--sp-extra-tight);
flex-grow: 1;
& > button { & > button {
padding: var(--sp-ultra-tight) 0; padding: var(--sp-ultra-tight) 0;
} }

View file

@ -2,15 +2,16 @@
@use '../../partials/dir'; @use '../../partials/dir';
.room-profile { .room-profile {
&__content { &__content {
@extend .cp-fx__row; @extend .cp-fx__row;
align-items: center;
& .avatar-container { & .avatar-container {
min-width: var(--av-large); min-width: var(--av-large);
} }
} }
&__display { &__display {
align-self: flex-end;
@include dir.side(margin, var(--sp-loose), 0); @include dir.side(margin, var(--sp-loose), 0);
& > div:first-child { & > div:first-child {

View file

@ -132,13 +132,13 @@ function DrawerHeader({ selectedTab, spaceId }) {
onMouseUp={(e) => blurOnBubbling(e, '.drawer-header__btn')} onMouseUp={(e) => blurOnBubbling(e, '.drawer-header__btn')}
> >
<TitleWrapper> <TitleWrapper>
<Text primary>{twemojify(spaceName)}</Text> <Text variant="s1" weight="medium" primary>{twemojify(spaceName)}</Text>
</TitleWrapper> </TitleWrapper>
<RawIcon size="small" src={ChevronBottomIC} /> <RawIcon size="small" src={ChevronBottomIC} />
</button> </button>
) : ( ) : (
<TitleWrapper> <TitleWrapper>
<Text primary>{tabName}</Text> <Text variant="s1" weight="medium" primary>{tabName}</Text>
</TitleWrapper> </TitleWrapper>
)} )}

View file

@ -48,8 +48,6 @@
} }
& .room-selector { & .room-selector {
margin: var(--sp-extra-tight); margin: var(--sp-ultra-tight);
margin-top: var(--sp-ultra-tight);
margin-bottom: var(--sp-ultra-tight);
} }
} }

View file

@ -15,10 +15,10 @@
.profile-viewer { .profile-viewer {
&__user { &__user {
display: flex; display: flex;
align-items: center;
padding-bottom: var(--sp-normal); padding-bottom: var(--sp-normal);
&__info { &__info {
align-self: flex-end;
flex: 1; flex: 1;
min-width: 0; min-width: 0;

View file

@ -128,7 +128,7 @@ function PeopleDrawer({ roomId }) {
<div className="people-drawer"> <div className="people-drawer">
<Header> <Header>
<TitleWrapper> <TitleWrapper>
<Text primary> <Text variant="s1" primary>
People People
<Text className="people-drawer__member-count" variant="b3">{`${room.getJoinedMemberCount()} members`}</Text> <Text className="people-drawer__member-count" variant="b3">{`${room.getJoinedMemberCount()} members`}</Text>
</Text> </Text>

View file

@ -90,9 +90,9 @@ function RoomViewHeader({ roomId }) {
> >
<Avatar imageSrc={avatarSrc} text={roomName} bgColor={colorMXID(roomId)} size="small" /> <Avatar imageSrc={avatarSrc} text={roomName} bgColor={colorMXID(roomId)} size="small" />
<TitleWrapper> <TitleWrapper>
<Text weight="bold" primary>{twemojify(roomName)}</Text> <Text variant="h2" weight="medium" primary>{twemojify(roomName)}</Text>
</TitleWrapper> </TitleWrapper>
<RawIcon size="extra-small" src={ChevronBottomIC} /> <RawIcon src={ChevronBottomIC} />
</button> </button>
{mx.isRoomEncrypted(roomId) === false && <IconButton onClick={() => toggleRoomSettings(tabText.SEARCH)} tooltip="Search" src={SearchIC} />} {mx.isRoomEncrypted(roomId) === false && <IconButton onClick={() => toggleRoomSettings(tabText.SEARCH)} tooltip="Search" src={SearchIC} />}
<IconButton className="room-header__drawer-btn" onClick={togglePeopleDrawer} tooltip="People" src={UserIC} /> <IconButton className="room-header__drawer-btn" onClick={togglePeopleDrawer} tooltip="People" src={UserIC} />