Skip to content

Commit

Permalink
Merge branch 'main' into remove-toast-notification
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronknol authored Sep 20, 2024
2 parents 4422137 + 218f3d0 commit 7af65d9
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 38 deletions.
2 changes: 2 additions & 0 deletions .changeset/real-shoes-relate.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/shy-turkeys-serve.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ This document serves to orient you within the repository — to get you set up a

- [Kaizen Issues](https://github.com/cultureamp/kaizen-discourse/issues)
- [Kaizen Design Tokens README](./packages/design-tokens/README.md)
- [Kaizen Component Library README](./packages/component-library/README.md)
- [Contributing guidelines](./CONTRIBUTING.md)

## Designers
Expand Down
10 changes: 10 additions & 0 deletions docs/components/DosAndDonts/DosAndDonts.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.dosAndDonts {
position: relative;
display: grid;
grid-template-columns: 1fr 1fr;
gap: var(--spacing-16);

> :only-child {
grid-column: span 2;
}
}
52 changes: 24 additions & 28 deletions docs/components/DosAndDonts/DosAndDonts.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@ import { Canvas } from "@storybook/blocks"
import classnames from "classnames"
import { CheckIcon, CloseIcon } from "~components/Icon"
import { SbContent } from "../SbContent"
import styles from "./DosAndDonts.module.css"

export const DosAndDonts = ({
className,
children,
...otherProps
}: HTMLAttributes<HTMLDivElement>): JSX.Element => (
<div
className={classnames(className, "grid grid-cols-1 gap-16 lg:grid-cols-2")}
{...otherProps}
>
<div className={classnames(styles.dosAndDonts, className)} {...otherProps}>
{children}
</div>
)
Expand All @@ -29,31 +27,29 @@ export const DoOrDont = ({
isDont?: boolean
story: any
} & HTMLAttributes<HTMLDivElement>): JSX.Element => (
<div className={classnames("relative [&>*]:m-0", className)} {...otherProps}>
<div className="relative [&>*]:m-0">
<div
className={classnames(
"absolute top-6 left-6 z-10 py-4 px-6 font-bold text-white rounded flex gap-2 items-center justify-center",
isDont ? "bg-red-500" : "bg-green-500"
)}
>
{isDont ? (
<CloseIcon role="presentation" />
) : (
<CheckIcon role="presentation" />
)}
<SbContent>
<span className="text-white">
<strong>{isDont ? "Don't" : "Do"}</strong>
</span>
</SbContent>
</div>
<Canvas
sourceState="none"
className="[&>*]:bg-gray-100 rounded-none shadow-none border-none"
of={story}
/>
<div className={classnames("relative", className)} {...otherProps}>
<div
className={classnames(
"absolute top-6 left-6 z-10 py-4 px-6 font-bold text-white rounded flex gap-2 items-center justify-center",
isDont ? "bg-red-500" : "bg-green-500"
)}
>
{isDont ? (
<CloseIcon role="presentation" />
) : (
<CheckIcon role="presentation" />
)}
<SbContent>
<span className="text-white">
<strong>{isDont ? "Don't" : "Do"}</strong>
</span>
</SbContent>
</div>
<Canvas
sourceState="none"
className="h-full m-0 bg-gray-100 rounded-none shadow-none border-none"
of={story}
/>
</div>
)

Expand Down
4 changes: 2 additions & 2 deletions docs/components/StickerSheet/StickerSheet.module.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
.stickerSheetSectionHeading {
margin-bottom: var(--spacing-md);
margin-bottom: var(--spacing-12);

.stickerSheet + .stickerSheet & {
margin-top: var(--spacing-lg);
}
}

.stickerSheetTable {
margin-left: calc(-1 * var(--spacing-md));
margin-left: calc(-1 * var(--spacing-12));
}
7 changes: 0 additions & 7 deletions docs/pages/welcome.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,6 @@ To achieve this, Kaizen provides a set of React components and tokens which repr

You can find a comprehensive overview of how to get your code base started on our [Github page](https://github.com/cultureamp/kaizen-design-system#getting-started).

We have 4 main sections:
- Components: React components you can use in your Apps
- Helpers: Any hooks or utilities we provide
- Design tokens: Primarily used for creating new components that don't already exist.
- Deprecated: components which are on their way out. (Find out more on the [Component Health page](https://cultureamp.design/component-health/))


## Support

The Kaizen Design System Team is here to support the usage of the library via #prod_design_system channel on Slack.
Expand Down

0 comments on commit 7af65d9

Please sign in to comment.