diff --git a/src/components/Grid/Col.tsx b/src/components/Grid/Col.tsx index fbeebdd..8feafb1 100644 --- a/src/components/Grid/Col.tsx +++ b/src/components/Grid/Col.tsx @@ -15,7 +15,7 @@ export const Col: React.FC = React.forwardRef((props, ref) => { ...rest } = props; return ( -
+
{children}
); diff --git a/src/components/Grid/style.ts b/src/components/Grid/style.ts index 3d835ee..7e247d9 100644 --- a/src/components/Grid/style.ts +++ b/src/components/Grid/style.ts @@ -1,7 +1,7 @@ import { createUseStyles } from 'react-jss'; -export const colStyle = createUseStyles( - { +export const colStyle = () => { + const styles = { col: (props) => ({ maxWidth: !props.flex && 100 / (24 / props.span) + '%', flexBasis: !props.flex && 100 / (24 / props.span) + '%', @@ -17,7 +17,6 @@ export const colStyle = createUseStyles( marginLeft: props.offset && typeof props.offset === 'object' && 100 / (24 / props.offset.xs) + '%', }), }, - '@media (min-width: 576px)': { col: (props) => ({ maxWidth: !props.flex && 100 / (24 / props.spanSm) + '%', @@ -49,9 +48,9 @@ export const colStyle = createUseStyles( marginLeft: props.offset && typeof props.offset === 'object' && 100 / (24 / props.offset.xl) + '%', }), }, - }, - { name: 'sha-el-col' }, -); + }; + return createUseStyles(styles, { name: 'sha-el-col' }); +}; export const rowStyle = createUseStyles( {