From 5f9c1f6fea8145083dd9ad992f0a3e6b9bad8c3d Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Mon, 22 Jun 2020 23:49:50 -0300 Subject: [PATCH 1/2] Few ajustments to accept fugelage theme --- app/threads/client/components/ThreadList.js | 11 +++++++++-- app/threads/client/components/ThreadListMessage.js | 2 +- client/admin/cloud/ConnectToCloudSection.js | 2 +- client/admin/cloud/TroubleshootingSection.js | 4 ++-- client/admin/cloud/WhatIsItSection.js | 2 +- client/admin/cloud/WorkspaceLoginSection.js | 4 ++-- client/admin/cloud/WorkspaceRegistrationSection.js | 2 +- client/admin/sidebar/AdminSidebar.js | 2 +- client/components/basic/Page.js | 2 ++ client/components/basic/VerticalBar.js | 4 ++-- 10 files changed, 22 insertions(+), 13 deletions(-) diff --git a/app/threads/client/components/ThreadList.js b/app/threads/client/components/ThreadList.js index 6f7a136f86085..4dbb0811c5990 100644 --- a/app/threads/client/components/ThreadList.js +++ b/app/threads/client/components/ThreadList.js @@ -29,14 +29,21 @@ import { useSetting } from '../../../../client/contexts/SettingsContext'; function clickableItem(WrappedComponent) { const clickable = css` cursor: pointer; - border-bottom: 2px solid #F2F3F5 !important; &:hover, &:focus { background: #F7F8FA; } `; - return (props) => ; + return (props) => ( + + ); } function mapProps(WrappedComponent) { diff --git a/app/threads/client/components/ThreadListMessage.js b/app/threads/client/components/ThreadListMessage.js index 9b9250315c518..039c2300cc41c 100644 --- a/app/threads/client/components/ThreadListMessage.js +++ b/app/threads/client/components/ThreadListMessage.js @@ -123,5 +123,5 @@ const style = { }; function Body(props) { - return ; + return ; } diff --git a/client/admin/cloud/ConnectToCloudSection.js b/client/admin/cloud/ConnectToCloudSection.js index 2b1009d35ccc5..dc04984121f61 100644 --- a/client/admin/cloud/ConnectToCloudSection.js +++ b/client/admin/cloud/ConnectToCloudSection.js @@ -47,7 +47,7 @@ function ConnectToCloudSection({ return {t('Cloud_registration_required')} - +

{t('Cloud_registration_required_description')}

 diff --git a/client/admin/cloud/TroubleshootingSection.js b/client/admin/cloud/TroubleshootingSection.js index 4d1c8e7238d72..90d0e7017e18a 100644 --- a/client/admin/cloud/TroubleshootingSection.js +++ b/client/admin/cloud/TroubleshootingSection.js @@ -41,7 +41,7 @@ function TroubleshootingSection({ return {t('Cloud_troubleshooting')} - +

{t('Cloud_workspace_support')}

 @@ -51,7 +51,7 @@ function TroubleshootingSection({ - +

{t('Cloud_status_page_description')}:{' '} {statusPageUrl} diff --git a/client/admin/cloud/WhatIsItSection.js b/client/admin/cloud/WhatIsItSection.js index 3bafb0e65f573..43068468066a3 100644 --- a/client/admin/cloud/WhatIsItSection.js +++ b/client/admin/cloud/WhatIsItSection.js @@ -10,7 +10,7 @@ function WhatIsItSection(props) { return {t('Cloud_what_is_it')} - +

{t('Cloud_what_is_it_description')}

diff --git a/client/admin/cloud/WorkspaceLoginSection.js b/client/admin/cloud/WorkspaceLoginSection.js index bc98cc544755b..ee505d14e4c68 100644 --- a/client/admin/cloud/WorkspaceLoginSection.js +++ b/client/admin/cloud/WorkspaceLoginSection.js @@ -85,7 +85,7 @@ function WorkspaceLoginSection({ }, [checkUserLoggedIn, dispatchToastMessage, setLoading, setLoggedIn]); return - +

{t('Cloud_workspace_connected')}

 @@ -95,7 +95,7 @@ function WorkspaceLoginSection({ : } - +

{t('Cloud_workspace_disconnect')}

 diff --git a/client/admin/cloud/WorkspaceRegistrationSection.js b/client/admin/cloud/WorkspaceRegistrationSection.js index 8f2884afa63ae..f1fc89c8cff95 100644 --- a/client/admin/cloud/WorkspaceRegistrationSection.js +++ b/client/admin/cloud/WorkspaceRegistrationSection.js @@ -118,7 +118,7 @@ function WorkspaceRegistrationSection({ - +

{t('Cloud_connect_support')}: {supportEmailAddress}

 diff --git a/client/admin/sidebar/AdminSidebar.js b/client/admin/sidebar/AdminSidebar.js index e0f334ada8a11..a2a4a73218b3f 100644 --- a/client/admin/sidebar/AdminSidebar.js +++ b/client/admin/sidebar/AdminSidebar.js @@ -184,7 +184,7 @@ export default React.memo(function AdminSidebar() { // TODO: uplift this provider return - + {t('Administration')} diff --git a/client/components/basic/Page.js b/client/components/basic/Page.js index deb42507fef4e..90d84373aec66 100644 --- a/client/components/basic/Page.js +++ b/client/components/basic/Page.js @@ -12,6 +12,7 @@ function Page(props) { const [border, setBorder] = useState(false); return {hasBurgerMenuButton && {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} > {children} From e7c8a1a26fbb4c56b40212efd6e72793206e9278 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Fri, 17 Jul 2020 14:10:14 -0300 Subject: [PATCH 2/2] Fix some colors --- client/components/basic/Page.js | 2 +- client/components/basic/TextCopy.js | 2 +- client/components/basic/VerticalBar.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/components/basic/Page.js b/client/components/basic/Page.js index 90d84373aec66..ae9c59b821f97 100644 --- a/client/components/basic/Page.js +++ b/client/components/basic/Page.js @@ -12,7 +12,7 @@ function Page(props) { const [border, setBorder] = useState(false); return { alignItems='flex-start' flexGrow={1} padding='x16' - backgroundColor='neutral-100' + backgroundColor='surface' width='full' {...props} > diff --git a/client/components/basic/VerticalBar.js b/client/components/basic/VerticalBar.js index f9aa36e8e9c35..b1c131e410033 100644 --- a/client/components/basic/VerticalBar.js +++ b/client/components/basic/VerticalBar.js @@ -11,7 +11,7 @@ function VerticalBar({ children, ...props }) { return