Merge branch 'main' into KZN-2885/filter-select-jumping-issue

cultureamp · Jan 24, 2025 · d006ccf · d006ccf
2 parents 426898d + 0641f68
commit d006ccf
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git a/docs/.storybook/preview.css b/docs/.storybook/preview.css
@@ -15,6 +15,12 @@ pre code {
   padding: 2.5rem;
 }
 
+@media screen and (min-width >= 1069px) {
+  .sbdocs-wrapper {
+    margin-left: auto;
+  }
+}
+
 .sbdocs.sbdocs-content {
   max-width: unset;
 

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 1.70.12
+
+### Patch Changes
+
+- [#5476](https://github.com/cultureamp/kaizen-design-system/pull/5476) [`bb3b1c3`](https://github.com/cultureamp/kaizen-design-system/commit/bb3b1c30d7f3fc81837b774ba3b2c2ccf5648157) - [Revert] Content: use padding instead of margin for inline spacing
+
 ## 1.70.11
 
 ### Patch Changes

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kaizen/components",
-  "version": "1.70.11",
+  "version": "1.70.12",
   "description": "Kaizen component library",
   "author": "Geoffrey Chong <[email protected]>",
   "homepage": "https://cultureamp.design",

diff --git a/packages/components/src/Content/Content.module.scss b/packages/components/src/Content/Content.module.scss
@@ -3,10 +3,10 @@
 
 .content {
   max-width: $layout-content-max-width;
-  padding: 0 $layout-content-side-margin;
+  margin: 0 $layout-content-side-margin;
   width: 100%;
 
   @media (max-width: calc(#{$layout-breakpoints-large} - 1px)) {
-    padding: 0 $content-margin-width-on-medium-and-small;
+    margin: 0 $content-margin-width-on-medium-and-small;
   }
 }
diff --git a/...ges/components/src/Filter/FilterDateRangePicker/_docs/FilterDateRangePicker.mdx b/...ges/components/src/Filter/FilterDateRangePicker/_docs/FilterDateRangePicker.mdx
@@ -4,7 +4,7 @@ import * as FilterDRPStories from './FilterDateRangePicker.stories'
 
 <Meta of={FilterDRPStories} />
 
-# Filter
+# FilterDateRangePicker
 
 <ResourceLinks
   sourceCode="https://github.com/cultureamp/kaizen-design-system/tree/main/packages/components/src/FilterDateRangePicker"

diff --git a/packages/components/src/Filter/FilterMultiSelect/_docs/FilterMultiSelect.mdx b/packages/components/src/Filter/FilterMultiSelect/_docs/FilterMultiSelect.mdx
@@ -4,7 +4,7 @@ import * as FilterMultiSelectStories from './FilterMultiSelect.stories'
 
 <Meta of={FilterMultiSelectStories} />
 
-# Filter Bar
+# FilterMultiSelect
 
 <ResourceLinks
   sourceCode="https://github.com/cultureamp/kaizen-design-system/tree/main/packages/components/src/FilterMultiSelect"