Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/marigold-ui/marigold into r…
Browse files Browse the repository at this point in the history
…adiogroup
  • Loading branch information
ti10le committed Apr 25, 2022
2 parents b9175bf + 37d3cf4 commit 28786f2
Show file tree
Hide file tree
Showing 12 changed files with 49 additions and 36 deletions.
10 changes: 0 additions & 10 deletions docs/src/theme/component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,16 +146,6 @@ export const component = {
...button.select,
},
},
divider: {
do: {
height: '8px',
bg: 'green60',
},
dont: {
height: '8px',
bg: 'red60',
},
},
navigation: {
wrapper: {
fontFamily: 'body',
Expand Down
22 changes: 22 additions & 0 deletions docs/src/theme/components/Divider.style.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import type { Theme } from '@marigold/components';

export const Divider: Theme['components']['Divider'] = {
base: {
width: '100%',
height: '1px',
bg: 'text',
},
variant: {
bold: {
height: '2px',
},
do: {
height: '8px',
bg: 'green60',
},
dont: {
height: '8px',
bg: 'red60',
},
},
};
1 change: 1 addition & 0 deletions docs/src/theme/components/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export * from './Button.style';
export * from './Card.style';
export * from './Divider.style';
export * from './Headline.style';
export * from './Link.style';
export * from './Text.style';
2 changes: 1 addition & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
},
"devDependencies": {
"@marigold/tsconfig": "workspace:*",
"tsup": "5.12.5"
"tsup": "5.12.6"
},
"scripts": {
"build": "tsup src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/create-theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@marigold/components": "workspace:*",
"@marigold/system": "workspace:*",
"@marigold/tsconfig": "workspace:*",
"tsup": "5.12.5"
"tsup": "5.12.6"
},
"scripts": {
"build": "tsup src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
},
"devDependencies": {
"@marigold/tsconfig": "workspace:*",
"tsup": "5.12.5"
"tsup": "5.12.6"
},
"scripts": {
"build": "tsup src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/system/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"devDependencies": {
"@marigold/tsconfig": "workspace:*",
"tsup": "5.12.5"
"tsup": "5.12.6"
},
"scripts": {
"build": "tsup src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/tokens/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"devDependencies": {
"@marigold/tsconfig": "workspace:*",
"tsup": "5.12.5"
"tsup": "5.12.6"
},
"scripts": {
"build": "tsup src/index.ts",
Expand Down
36 changes: 18 additions & 18 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion themes/theme-b2b/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"devDependencies": {
"@marigold/components": "workspace:*",
"@marigold/tsconfig": "workspace:*",
"tsup": "5.12.5"
"tsup": "5.12.6"
},
"scripts": {
"build": "tsup src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion themes/theme-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"devDependencies": {
"@marigold/components": "workspace:*",
"@marigold/tsconfig": "workspace:*",
"tsup": "5.12.5"
"tsup": "5.12.6"
},
"scripts": {
"build": "tsup src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion themes/theme-unicorn/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"devDependencies": {
"@marigold/components": "workspace:*",
"@marigold/tsconfig": "workspace:*",
"tsup": "5.12.5"
"tsup": "5.12.6"
},
"scripts": {
"build": "tsup src/index.ts",
Expand Down

0 comments on commit 28786f2

Please sign in to comment.