From df2c04240d3d94603b40513386abcedf1cced6fc Mon Sep 17 00:00:00 2001
From: Vitaly Rtishchev <rtivital@gmail.com>
Date: Wed, 5 Oct 2022 16:07:18 +0400
Subject: [PATCH] [@mantine/core] Grid: Fix incorrect responsive offsets
 handling (#2556)

---
 src/mantine-core/src/Grid/Col/Col.tsx    | 9 +--------
 src/mantine-core/src/Grid/Grid.story.tsx | 8 ++++----
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/mantine-core/src/Grid/Col/Col.tsx b/src/mantine-core/src/Grid/Col/Col.tsx
index 6b9d82ada72..6825aecec03 100644
--- a/src/mantine-core/src/Grid/Col/Col.tsx
+++ b/src/mantine-core/src/Grid/Col/Col.tsx
@@ -60,14 +60,7 @@ export interface ColProps extends DefaultProps, React.ComponentPropsWithoutRef<'
   xl?: ColSpan;
 }
 
-const defaultProps: Partial<ColProps> = {
-  offset: 0,
-  offsetXs: 0,
-  offsetSm: 0,
-  offsetMd: 0,
-  offsetLg: 0,
-  offsetXl: 0,
-};
+const defaultProps: Partial<ColProps> = {};
 
 function isValidSpan(span: ColSpan) {
   if (span === 'auto' || span === 'content') {
diff --git a/src/mantine-core/src/Grid/Grid.story.tsx b/src/mantine-core/src/Grid/Grid.story.tsx
index 7b7a35fd222..da83a851c63 100644
--- a/src/mantine-core/src/Grid/Grid.story.tsx
+++ b/src/mantine-core/src/Grid/Grid.story.tsx
@@ -19,11 +19,11 @@ export function UnexpectedRowBreak() {
 export function Offset0() {
   return (
     <Grid>
-      <Grid.Col sx={{ backgroundColor: 'pink' }} span={3} offset={2} offsetSm={0}>
-        Column 1
+      <Grid.Col span={3} offsetMd={3}>
+        <div style={{ background: 'silver' }}>Column 1</div>
       </Grid.Col>
-      <Grid.Col sx={{ backgroundColor: 'silver' }} span={7}>
-        Column 2
+      <Grid.Col span={6}>
+        <div style={{ background: 'pink' }}>Column 2</div>
       </Grid.Col>
     </Grid>
   );