diff --git a/src/commons/components/features/Items/Card/Card.css.ts b/src/commons/components/features/Items/Card/Card.css.ts index 09acfa6..3c11067 100644 --- a/src/commons/components/features/Items/Card/Card.css.ts +++ b/src/commons/components/features/Items/Card/Card.css.ts @@ -3,15 +3,26 @@ import { mediaQueries } from '@/commons/utils/ui/mediaQueries/mediaQueries'; import { style } from '@vanilla-extract/css'; export const wrapper = style({ + // flex: 1, + + width: '100%', display: 'grid', - gridTemplateColumns: 'repeat(4, 1fr)', + gridTemplateColumns: 'repeat(5, 1fr)', + gridTemplateRows: 'repeat(2, 1fr)', marginTop: '60px', - maxWidth: '1200px', + maxWidth: '1740px', - gap: '30px', + gap: '35px', + padding: '0 20px', ...mediaQueries({ + desktopXLarge: { + gridTemplateColumns: 'repeat(4, 1fr)', + }, + desktopLarge: { + gridTemplateColumns: 'repeat(3, 1fr)', + }, tabletLarge: { gridTemplateColumns: 'repeat(3, 1fr)', }, @@ -31,20 +42,24 @@ export const cardWrapper = style({ display: 'flex', flexDirection: 'column', - width: '15.6rem', - height: '19.9rem', + width: '100%', + maxWidth: '23rem', + height: '26rem', borderRadius: '12px', + justifySelf: 'center', + overflow: 'hidden', ...mediaQueries({ tablet: { - width: '20rem', - height: '19.9rem', + height: '22rem', + }, + tabletSmall: { + height: '22rem', }, mobile: { - width: '100%', - height: '19.9rem', + height: '24rem', }, }), @@ -60,12 +75,7 @@ export const cardWrapper = style({ export const imageWrapper = style({ position: 'relative', width: '100%', - height: '130px', -}); - -export const cardImageWrapper = style({ - width: '250px', - height: '130px', + height: '180px', }); export const bottomWrapper = style({ @@ -73,7 +83,9 @@ export const bottomWrapper = style({ flexDirection: 'column', flex: 1, - padding: '6px 12px 12px', + padding: '12px 12px 0', + + justifyContent: 'space-between', }); export const title = style({ @@ -85,6 +97,8 @@ export const infoWrapper = style({ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center', + + marginTop: 'auto', }); export const textWrapper = style({ @@ -95,7 +109,7 @@ export const textWrapper = style({ export const company = style({ marginRight: '4px', - fontSize: '14px', + fontSize: '16px', }); export const date = style({ diff --git a/src/commons/components/widgets/Header/header.css.ts b/src/commons/components/widgets/Header/header.css.ts index 35d4c5a..8e0f4de 100755 --- a/src/commons/components/widgets/Header/header.css.ts +++ b/src/commons/components/widgets/Header/header.css.ts @@ -10,10 +10,11 @@ export const wrapper = style({ width: '100dvw', height: '80px', - maxWidth: '1200px', + maxWidth: '1740px', + + padding: '0 20px', ...mediaQueries({ - tablet: { padding: '0 20px' }, mobile: { padding: '0 10px' }, }), }); diff --git a/src/commons/styles/rootStyles.css.ts b/src/commons/styles/rootStyles.css.ts index 3b82830..1d60a03 100644 --- a/src/commons/styles/rootStyles.css.ts +++ b/src/commons/styles/rootStyles.css.ts @@ -4,5 +4,4 @@ export const wrapper = style({ display: 'flex', flexDirection: 'column', alignItems: 'center', - justifyContent: 'center', }); diff --git a/src/commons/utils/ui/mediaQueries/mediaQueries.ts b/src/commons/utils/ui/mediaQueries/mediaQueries.ts index 04be026..57a3f20 100644 --- a/src/commons/utils/ui/mediaQueries/mediaQueries.ts +++ b/src/commons/utils/ui/mediaQueries/mediaQueries.ts @@ -6,10 +6,13 @@ export const breakpoints = { mobileSmall: 480, mobile: 768, mobileLarge: 896, - tabletSmall: 960, + tabletSmall: 980, tablet: 1024, tabletLarge: 1148, desktop: 1280, + desktopLarge: 1440, + desktopXLarge: 1740, + desktopXXLarge: 1920, }; export const mediaQuery = (breakpoint: BreakpointKey, rules: StyleRule) => ({