Commit 96191dfb authored by tom's avatar tom

fix paddings

parent f80a5e7e
...@@ -4,6 +4,7 @@ export const viewport = { ...@@ -4,6 +4,7 @@ export const viewport = {
mobile: devices['iPhone 13 Pro'].viewport, mobile: devices['iPhone 13 Pro'].viewport,
md: { width: 1001, height: 800 }, md: { width: 1001, height: 800 },
xl: { width: 1600, height: 1000 }, xl: { width: 1600, height: 1000 },
xxl: { width: 1920, height: 1200 },
}; };
export const maskColor = '#4299E1'; // blue.400 export const maskColor = '#4299E1'; // blue.400
......
...@@ -4,8 +4,9 @@ const breakpoints = { ...@@ -4,8 +4,9 @@ const breakpoints = {
// md: '768px', // md: '768px',
lg: '1000px', lg: '1000px',
xl: '1440px', xl: '1440px',
'2xl': '1920px',
// these breakpoint are needed just to make others work // these breakpoint are needed just to make others work
'2xl': '3000px', '3xl': '3000px',
}; };
export default breakpoints; export default breakpoints;
...@@ -18,8 +18,8 @@ test('base view +@mobile', async({ render, mockEnvs, mockApiResponse }) => { ...@@ -18,8 +18,8 @@ test('base view +@mobile', async({ render, mockEnvs, mockApiResponse }) => {
await expect(component).toHaveScreenshot(); await expect(component).toHaveScreenshot();
}); });
test.describe('xl screen', () => { test.describe('xxl screen', () => {
test.use({ viewport: pwConfig.viewport.xl }); test.use({ viewport: pwConfig.viewport.xxl });
test('vertical navigation', async({ render }) => { test('vertical navigation', async({ render }) => {
const component = await render(<Layout>Page Content</Layout>); const component = await render(<Layout>Page Content</Layout>);
......
...@@ -16,6 +16,7 @@ const MainColumn = ({ children, className }: Props) => { ...@@ -16,6 +16,7 @@ const MainColumn = ({ children, className }: Props) => {
flexGrow={ 1 } flexGrow={ 1 }
w={{ base: '100%', lg: config.UI.navigation.layout === 'horizontal' ? '100%' : 'auto' }} w={{ base: '100%', lg: config.UI.navigation.layout === 'horizontal' ? '100%' : 'auto' }}
paddingX={{ base: 3, lg: config.UI.navigation.layout === 'horizontal' ? 6 : 12 }} 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 paddingTop={{ base: `${ 12 + 52 }px`, lg: 6 }} // 12px is top padding of content area, 52px is search bar height
paddingBottom={ 8 } paddingBottom={ 8 }
> >
......
...@@ -162,7 +162,7 @@ const Footer = () => { ...@@ -162,7 +162,7 @@ const Footer = () => {
}; };
const contentProps: GridProps = { 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 }, py: { base: 4, lg: 8 },
gridTemplateColumns: { base: '1fr', lg: 'minmax(auto, 470px) 1fr' }, gridTemplateColumns: { base: '1fr', lg: 'minmax(auto, 470px) 1fr' },
columnGap: { lg: '32px', xl: '100px' }, columnGap: { lg: '32px', xl: '100px' },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment