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.

Sign up for GitHub

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

Chore: Add spacing adjustments Home page #27367

Merged
merged 2 commits into from
Dec 6, 2022
Merged

Chore: Add spacing adjustments Home page #27367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f642589
add spacing adjustments
guijun13 Nov 25, 2022
617c25f
Merge branch 'develop' into feat/homepage-adjustments
guijun13 Nov 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions apps/meteor/client/components/Page/PageHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,15 @@ const PageHeader: FC<PageHeaderProps> = ({ children = undefined, title, onClickB
const { isMobile } = useLayout();

return (
<Box borderBlockEndWidth='x2' borderBlockEndColor={borderBlockEndColor ?? border ? 'extra-light' : 'transparent'} {...props}>
<Box
borderBlockEndWidth='x2'
minHeight='x64'
borderBlockEndColor={borderBlockEndColor ?? border ? 'extra-light' : 'transparent'}
{...props}
>
<Box
marginBlock='x16'
marginBlock='x8'
marginInline='x24'
minHeight='x40'
display='flex'
flexDirection='row'
flexWrap='nowrap'
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/client/views/home/DefaultHomePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const DefaultHomePage = (): ReactElement => {
<Page color='default' is='main' data-qa='page-home' data-qa-type='default' background='tint'>
<HomePageHeader />
<PageScrollableContent>
<Box is='h2' fontScale='h1' data-qa-id='homepage-welcome-text'>
<Box is='h2' fontScale='h1' mb='x20' data-qa-id='homepage-welcome-text'>
{t('Welcome_to', { Site_Name: workspaceName || 'Rocket.Chat' })}
</Box>
<Box is='h3' fontScale='h3' mb='x16'>
Expand Down Expand Up @@ -58,7 +58,7 @@ const DefaultHomePage = (): ReactElement => {
</HomepageGridItem>
</Grid>
{displayCustomBody && (
<Box mb='x16'>
<Box mbs='x32' mbe='x16'>
<CustomHomePageContent />
</Box>
)}
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/home/HomepageGridItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const HomepageGridItem = ({ children }: { children: ReactNode }): ReactElement =
const isMedium = !breakpoints.includes('lg');

return (
<Grid.Item xs={4} sm={4} md={4} lg={6} xl={4} maxWidth={isMedium ? '100%' : '50%'} flexGrow={1}>
<Grid.Item xs={4} sm={4} md={4} lg={6} xl={4} p='x8' maxWidth={isMedium ? '100%' : '50%'} flexGrow={1}>
{children}
</Grid.Item>
);
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-client/src/components/Card/CardFooterWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Box } from '@rocket.chat/fuselage';
import type { ReactElement, ReactNode } from 'react';

const CardFooterWrapper = ({ children }: { children: ReactNode }): ReactElement => <Box mbs='x24'>{children}</Box>;
const CardFooterWrapper = ({ children }: { children: ReactNode }): ReactElement => <Box mbs='x16'>{children}</Box>;

export default CardFooterWrapper;
2 changes: 1 addition & 1 deletion packages/ui-client/src/components/Card/CardTitle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Box } from '@rocket.chat/fuselage';
import type { FC } from 'react';

const CardTitle: FC = ({ children }) => (
<Box mb='x8' fontScale='h4' color='default'>
<Box mbe='x12' fontScale='h4' color='default'>
{children}
</Box>
);
Expand Down