[FIX] Few adjustments to accept fuselage theme (#18009)

Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>
pull/18290/head
Guilherme Gazzo 6 years ago committed by GitHub
parent 1bed2977ca
commit be559796df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      client/Channel/Threads/ContextualBar/List.js
  2. 2
      client/admin/cloud/ConnectToCloudSection.js
  3. 4
      client/admin/cloud/TroubleshootingSection.js
  4. 2
      client/admin/cloud/WhatIsItSection.js
  5. 4
      client/admin/cloud/WorkspaceLoginSection.js
  6. 2
      client/admin/cloud/WorkspaceRegistrationSection.js
  7. 2
      client/components/basic/Page.js
  8. 2
      client/components/basic/TextCopy.js
  9. 4
      client/components/basic/VerticalBar.js

@ -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}/>;

@ -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>

@ -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>
@ -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>

@ -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>

@ -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>
@ -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>

@ -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>

@ -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'
@ -43,6 +44,7 @@ function PageHeader({ children, title, ...props }) {
flexDirection='row'
flexWrap='nowrap'
alignItems='center'
color='neutral-800'
{...props}
>
{hasBurgerMenuButton && <BurgerMenuButton

@ -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}
>

@ -11,6 +11,7 @@ function VerticalBar({ children, ...props }) {
return <Box
rcx-vertical-bar
backgroundColor='surface'
display='flex'
flexDirection='column'
flexShrink={0}
@ -18,7 +19,6 @@ function VerticalBar({ children, ...props }) {
height='full'
position={small ? 'absolute' : undefined}
insetInlineEnd={small ? 'none' : undefined}
backgroundColor='white'
{...props}
>
{children}
@ -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>

Loading…
Cancel
Save