Skip to content

Commit

Permalink
fix paddings
Browse files Browse the repository at this point in the history
  • Loading branch information
tom2drum committed Sep 16, 2024
1 parent f80a5e7 commit 96191df
Show file tree
Hide file tree
Showing 9 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions playwright/utils/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export const viewport = {
mobile: devices['iPhone 13 Pro'].viewport,
md: { width: 1001, height: 800 },
xl: { width: 1600, height: 1000 },
xxl: { width: 1920, height: 1200 },
};

export const maskColor = '#4299E1'; // blue.400
Expand Down
3 changes: 2 additions & 1 deletion theme/foundations/breakpoints.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ const breakpoints = {
// md: '768px',
lg: '1000px',
xl: '1440px',
'2xl': '1920px',
// these breakpoint are needed just to make others work
'2xl': '3000px',
'3xl': '3000px',
};

export default breakpoints;
4 changes: 2 additions & 2 deletions ui/shared/layout/Layout.pw.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ test('base view +@mobile', async({ render, mockEnvs, mockApiResponse }) => {
await expect(component).toHaveScreenshot();
});

test.describe('xl screen', () => {
test.use({ viewport: pwConfig.viewport.xl });
test.describe('xxl screen', () => {
test.use({ viewport: pwConfig.viewport.xxl });

test('vertical navigation', async({ render }) => {
const component = await render(<Layout>Page Content</Layout>);
Expand Down
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions ui/shared/layout/components/MainColumn.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const MainColumn = ({ children, className }: Props) => {
flexGrow={ 1 }
w={{ base: '100%', lg: config.UI.navigation.layout === 'horizontal' ? '100%' : 'auto' }}
paddingX={{ base: 3, lg: config.UI.navigation.layout === 'horizontal' ? 6 : 12 }}
paddingRight={{ '2xl': 6 }}
paddingTop={{ base: `${ 12 + 52 }px`, lg: 6 }} // 12px is top padding of content area, 52px is search bar height
paddingBottom={ 8 }
>
Expand Down
2 changes: 1 addition & 1 deletion ui/snippets/footer/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ const Footer = () => {
};

const contentProps: GridProps = {
px: { base: 4, lg: config.UI.navigation.layout === 'horizontal' ? 6 : 12 },
px: { base: 4, lg: config.UI.navigation.layout === 'horizontal' ? 6 : 12, '2xl': 6 },
py: { base: 4, lg: 8 },
gridTemplateColumns: { base: '1fr', lg: 'minmax(auto, 470px) 1fr' },
columnGap: { lg: '32px', xl: '100px' },
Expand Down

0 comments on commit 96191df

Please sign in to comment.