diff --git a/_locales/en/messages.json b/_locales/en/messages.json index e90f773aa..58d6d110e 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -2239,5 +2239,8 @@ }, "errorHappenedWhileRemovingModeratorDesc": { "message": "An error happened while removing this user from the moderator list." + }, + "orJoinOneOfThese": { + "message": "Or join one of these..." } } diff --git a/ts/components/basic/Flex.tsx b/ts/components/basic/Flex.tsx index eba869840..846ee57c3 100644 --- a/ts/components/basic/Flex.tsx +++ b/ts/components/basic/Flex.tsx @@ -49,7 +49,7 @@ export const Flex = styled.div` align-items: ${props => props.alignItems || 'stretch'}; margin: ${props => props.margin || '0'}; padding: ${props => props.padding || '0'}; - width: ${props => props.justifyContent || 'auto'}; + width: ${props => props.width || 'auto'}; height: ${props => props.height || 'auto'}; max-width: ${props => props.maxWidth || 'none'}; `; diff --git a/ts/components/basic/Text.tsx b/ts/components/basic/Text.tsx index 6cb4f1525..3b961627a 100644 --- a/ts/components/basic/Text.tsx +++ b/ts/components/basic/Text.tsx @@ -21,3 +21,19 @@ const StyledDefaultText = styled.div` export const Text = (props: TextProps) => { return {props.text}; }; + +type H3Props = { + text: string; + opposite?: boolean; +}; + +const StyledH3 = styled.div` + transition: ${props => props.theme.common.animations.defaultDuration}; + font-family: ${props => props.theme.common.fonts.sessionFontDefault}; + color: ${props => + props.opposite ? props.theme.colors.textColorOpposite : props.theme.colors.textColor}; + font-size: ${props => props.theme.common.fonts.md}; + font-weight: 700; +`; + +export const H3 = (props: H3Props) => {props.text}; diff --git a/ts/components/session/SessionJoinableDefaultRooms.tsx b/ts/components/session/SessionJoinableDefaultRooms.tsx index ad9cf2df8..5bcbd935b 100644 --- a/ts/components/session/SessionJoinableDefaultRooms.tsx +++ b/ts/components/session/SessionJoinableDefaultRooms.tsx @@ -5,6 +5,7 @@ import { StateType } from '../../state/reducer'; import { Avatar, AvatarSize } from '../Avatar'; import { Flex } from '../basic/Flex'; import { PillContainer } from '../basic/PillContainer'; +import { H3 } from '../basic/Text'; // tslint:disable: no-void-expression export type JoinableRoomProps = { @@ -52,19 +53,22 @@ export const SessionJoinableRooms = () => { } return ( - - {joinableRooms.map(r => { - return ( - { - void joinOpenGroupV2WithUIEvents(completeUrl, true); - }} - /> - ); - })} + +

+ + {joinableRooms.map(r => { + return ( + { + void joinOpenGroupV2WithUIEvents(completeUrl, true); + }} + /> + ); + })} + ); };