Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Few adjustments to accept fuselage theme #18009

Merged
merged 4 commits into from Jul 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions client/Channel/Threads/ContextualBar/List.js
Expand Up @@ -17,13 +17,13 @@ import RawText from '../../../components/basic/RawText';
import { useRoute } from '../../../contexts/RouterContext';
import { useUserId } from '../../../contexts/UserContext';
import { useEndpointDataExperimental, ENDPOINT_STATES } from '../../../hooks/useEndpointDataExperimental';
import { useTimeAgo } from '../../../hooks/useTimeAgo';
import { MessageSkeleton } from '../../components/Message';
import { useUserSubscription } from '../../hooks/useUserSubscription';
import { useUserRoom } from '../../hooks/useUserRoom';
import { useUserSubscription } from '../../hooks/useUserSubscription';
import { useSetting } from '../../../contexts/SettingsContext';
import ThreadListMessage from './components/Message';
import { useTimeAgo } from '../../../hooks/useTimeAgo';
import { clickableItem } from '../../helpers/clickableItem';
import { MessageSkeleton } from '../../components/Message';
import ThreadListMessage from './components/Message';

function mapProps(WrappedComponent) {
return ({ msg, username, replies, tcount, ts, ...props }) => <WrappedComponent replies={tcount} participants={replies.length} username={username} msg={msg} ts={ts} {...props}/>;
Expand Down
2 changes: 1 addition & 1 deletion client/admin/cloud/ConnectToCloudSection.js
Expand Up @@ -47,7 +47,7 @@ function ConnectToCloudSection({

return <Box is='section' {...props}>
<Subtitle>{t('Cloud_registration_required')}</Subtitle>
<Box withRichContent>
<Box withRichContent color='neutral-800'>
<p>{t('Cloud_registration_required_description')}</p>
</Box>
<ButtonGroup>
Expand Down
4 changes: 2 additions & 2 deletions client/admin/cloud/TroubleshootingSection.js
Expand Up @@ -41,7 +41,7 @@ function TroubleshootingSection({
return <Box is='section' {...props}>
<Subtitle>{t('Cloud_troubleshooting')}</Subtitle>

<Box withRichContent>
<Box withRichContent color='neutral-800'>
<p>{t('Cloud_workspace_support')}</p>
</Box>

Expand All @@ -51,7 +51,7 @@ function TroubleshootingSection({
</Button>
</ButtonGroup>

<Box withRichContent>
<Box withRichContent color='neutral-800'>
<p>
{t('Cloud_status_page_description')}:{' '}
<a href={statusPageUrl} target='_blank' rel='noopener noreferrer'>{statusPageUrl}</a>
Expand Down
2 changes: 1 addition & 1 deletion client/admin/cloud/WhatIsItSection.js
Expand Up @@ -10,7 +10,7 @@ function WhatIsItSection(props) {
return <Box is='section' {...props}>
<Subtitle>{t('Cloud_what_is_it')}</Subtitle>

<Box withRichContent>
<Box withRichContent color='neutral-800'>
<p>{t('Cloud_what_is_it_description')}</p>

<details>
Expand Down
4 changes: 2 additions & 2 deletions client/admin/cloud/WorkspaceLoginSection.js
Expand Up @@ -85,7 +85,7 @@ function WorkspaceLoginSection({
}, [checkUserLoggedIn, dispatchToastMessage, setLoading, setLoggedIn]);

return <Box is='section' {...props}>
<Box withRichContent>
<Box withRichContent color='neutral-800'>
<p>{t('Cloud_workspace_connected')}</p>
</Box>

Expand All @@ -95,7 +95,7 @@ function WorkspaceLoginSection({
: <Button primary disabled={isLoading} onClick={handleLoginButtonClick}>{t('Cloud_login_to_cloud')}</Button>}
</ButtonGroup>

<Box withRichContent>
<Box withRichContent color='neutral-800'>
<p>{t('Cloud_workspace_disconnect')}</p>
</Box>

Expand Down
2 changes: 1 addition & 1 deletion client/admin/cloud/WorkspaceRegistrationSection.js
Expand Up @@ -118,7 +118,7 @@ function WorkspaceRegistrationSection({
<Button primary disabled={isProcessing} onClick={handleConnectButtonClick}>{t('Connect')}</Button>
</ButtonGroup>

<Box withRichContent>
<Box withRichContent color='neutral-800'>
<p>{t('Cloud_connect_support')}: <a href={supportMailtoUrl} target='_blank' rel='noopener noreferrer'>{supportEmailAddress}</a></p>
</Box>
</Margins>
Expand Down
2 changes: 2 additions & 0 deletions client/components/basic/Page.js
Expand Up @@ -12,6 +12,7 @@ function Page(props) {
const [border, setBorder] = useState(false);
return <PageContext.Provider value={[border, setBorder]}>
<Box
backgroundColor='surface'
is='section'
display='flex'
flexDirection='column'
Expand Down Expand Up @@ -43,6 +44,7 @@ function PageHeader({ children, title, ...props }) {
flexDirection='row'
flexWrap='nowrap'
alignItems='center'
color='neutral-800'
{...props}
>
{hasBurgerMenuButton && <BurgerMenuButton
Expand Down
2 changes: 1 addition & 1 deletion client/components/basic/TextCopy.js
Expand Up @@ -26,7 +26,7 @@ const TextCopy = ({ text, wordBreak = 'break-all', ...props }) => {
alignItems='flex-start'
flexGrow={1}
padding='x16'
backgroundColor='neutral-100'
backgroundColor='surface'
width='full'
{...props}
>
Expand Down
4 changes: 2 additions & 2 deletions client/components/basic/VerticalBar.js
Expand Up @@ -11,14 +11,14 @@ function VerticalBar({ children, ...props }) {

return <Box
rcx-vertical-bar
backgroundColor='surface'
display='flex'
flexDirection='column'
flexShrink={0}
width={mobile ? 'full' : 'x380'}
height='full'
position={small ? 'absolute' : undefined}
insetInlineEnd={small ? 'none' : undefined}
backgroundColor='white'
{...props}
>
{children}
Expand All @@ -33,10 +33,10 @@ function VerticalBarHeader({ children, ...props }) {
display='flex'
alignItems='center'
justifyContent='space-between'
backgroundColor='white'
borderBlockColor='neutral-200'
borderBlockEndWidth='x2'
fontScale='s2'
color='neutral-800'
{...props}
>
<Margins inline='x4'>{children}</Margins>
Expand Down