Skip to content

Commit

Permalink
Merge branch 'update/hadas/storybook-3' of github.com:mondaycom/monda…
Browse files Browse the repository at this point in the history
…y-ui-react-core into update/hadas/storybook-3

� Conflicts:
�	package-lock.json
�	src/components/Checkbox/__tests__/__snapshots__/checkbox.jest.js.snap
�	src/components/Checkbox/__tests__/checkbox.jest.js
  • Loading branch information
Hadas Farhi committed Nov 25, 2021
2 parents 9a70b31 + 5daf1cf commit 7955eeb
Show file tree
Hide file tree
Showing 58 changed files with 53,971 additions and 734 deletions.
4 changes: 3 additions & 1 deletion .storybook/preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ import {
RelatedComponents,
DocFooter,
MultipleStoryElementsWrapper,
Link
Link,
Paragraph
} from "../src/storybook/components";
import LinkComponent from "../src/storybook/components/link-component/link-component";

Expand All @@ -33,6 +34,7 @@ addParameters({
h3: Title,
li: AnchorListItem,
a: LinkComponent,
p: Paragraph,
Tip,
ComponentRules,
UsageGuidelines,
Expand Down
4,758 changes: 4,758 additions & 0 deletions build-storybook.log

Large diffs are not rendered by default.

Loading

0 comments on commit 7955eeb

Please sign in to comment.