Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feature/filled-icons
Browse files Browse the repository at this point in the history
# Conflicts:
#	packages/elements/src/icons/ui/IconsUi.ts
  • Loading branch information
mattias800 committed Sep 7, 2023
2 parents 73cbc94 + 146c76b commit 22e3520
Show file tree
Hide file tree
Showing 131 changed files with 6,559 additions and 3,157 deletions.
2 changes: 1 addition & 1 deletion .autorc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"author": {
"name": "github-actions[bot]",
"email": "github-actions[bot]@users.noreply.github.com"
"email": "41898282+github-actions[bot]@users.noreply.github.com"
},
"plugins": [
[
Expand Down
1 change: 1 addition & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const config: StorybookViteConfig = {
},
addons: [
"@storybook/addon-viewport",
"@storybook/addon-backgrounds",
"@storybook/addon-storysource",
"@storybook/addon-a11y",
"@storybook/addon-actions",
Expand Down
10 changes: 10 additions & 0 deletions .storybook/preview-head.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@
font-size: 14px;
}

html {
box-sizing: border-box;
}

*,
*:before,
*:after {
box-sizing: inherit;
}

.margin-wrapper > * {
margin: 8px;
}
Expand Down
13 changes: 13 additions & 0 deletions .storybook/preview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,18 @@ export const parameters = {
options: {},
manual: true,
},
backgrounds: {
default: "white",
values: [
{
name: "white",
value: "#fff",
},
{
name: "grey",
value: "#efeff2",
},
],
},
controls: { expanded: true },
};
Loading

0 comments on commit 22e3520

Please sign in to comment.