UI improvements (#119)

This commit is contained in:
Maria Rushkova 2021-11-05 18:37:39 +01:00 committed by GitHub
parent 23d3ee01ea
commit 52e457991b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 5 deletions

View File

@ -103,6 +103,9 @@ export const ChannelInfo = styled.div`
const ChannelTextInfo = styled.div` const ChannelTextInfo = styled.div`
display: flex; display: flex;
flex-direction: column; flex-direction: column;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
`; `;
export const ChannelLogo = styled.div` export const ChannelLogo = styled.div`

View File

@ -36,11 +36,11 @@ export function EmptyChannel({ channel }: EmptyChannelProps) {
<span>{channel.name.slice(0, 10)}</span>. <span>{channel.name.slice(0, 10)}</span>.
</EmptyText> </EmptyText>
) : channel.type === "group" ? ( ) : channel.type === "group" ? (
<EmptyText> <EmptyTextGroup>
You created a group with{" "} You created a group with{" "}
<span>{groupName.slice(groupName.length - 1)}</span> and{" "} <span>{groupName.slice(groupName.length - 1)}</span> and{" "}
<span>{groupName.at(-1)}</span> <span>{groupName.at(-1)}</span>
</EmptyText> </EmptyTextGroup>
) : ( ) : (
<EmptyText> <EmptyText>
Welcome to the beginning of the <span>#{channel.name}</span> <br /> Welcome to the beginning of the <span>#{channel.name}</span> <br />
@ -93,3 +93,7 @@ const EmptyText = styled.p`
${textMediumStyles} ${textMediumStyles}
`; `;
const EmptyTextGroup = styled(EmptyText)`
word-break: break-all;
`;

View File

@ -55,7 +55,9 @@ export function Chat() {
{communityData ? ( {communityData ? (
<StyledCommunity onClick={showModal} community={communityData} /> <StyledCommunity onClick={showModal} community={communityData} />
) : ( ) : (
<CommunitySkeleton /> <SkeletonWrapper>
<CommunitySkeleton />
</SkeletonWrapper>
)} )}
<Channels <Channels
membersList={membersList} membersList={membersList}
@ -126,6 +128,10 @@ const ChannelsWrapper = styled.div`
flex-direction: column; flex-direction: column;
`; `;
const SkeletonWrapper = styled.div`
margin-bottom: 16px;
`;
const StyledCommunity = styled(Community)` const StyledCommunity = styled(Community)`
padding: 0 0 0 8px; padding: 0 0 0 8px;
margin: 0 0 16px; margin: 0 0 16px;

View File

@ -108,7 +108,9 @@ export function ChatBody({
/> />
</> </>
) : ( ) : (
<CommunitySkeleton /> <SkeletonWrapper>
<CommunitySkeleton />
</SkeletonWrapper>
)} )}
</ChannelWrapper> </ChannelWrapper>
@ -184,6 +186,7 @@ export function ChatBody({
} }
const ChatBodyWrapper = styled.div` const ChatBodyWrapper = styled.div`
width: 61%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex: 1; flex: 1;
@ -198,15 +201,21 @@ const ChatBodyWrapper = styled.div`
const ChannelWrapper = styled.div` const ChannelWrapper = styled.div`
display: flex; display: flex;
align-items: center; align-items: center;
max-width: 85%;
&.narrow { &.narrow {
width: calc(100% - 46px); width: calc(100% - 46px);
} }
`; `;
const SkeletonWrapper = styled.div`
padding: 8px;
`;
const ChatTopbar = styled.div` const ChatTopbar = styled.div`
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center;
padding: 5px 8px; padding: 5px 8px;
background: ${({ theme }) => theme.bodyBackgroundColor}; background: ${({ theme }) => theme.bodyBackgroundColor};
position: relative; position: relative;

View File

@ -26,5 +26,4 @@ const LogoSkeleton = styled(Skeleton)`
const Loading = styled.div` const Loading = styled.div`
display: flex; display: flex;
padding: 0 0 0 10px; padding: 0 0 0 10px;
margin: 0 0 16px;
`; `;