Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/five-tables-smile.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@example/ui-playground': patch
'@genseki/react': patch
---

Revamp new design system and design token for Genseki.
5 changes: 5 additions & 0 deletions .changeset/yummy-boxes-type.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@genseki/react': minor
---

Add surface colors
2 changes: 1 addition & 1 deletion examples/erp/src/app/(admin)/admin/tiptap-style.css
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@
}

.tiptap-image-upload-subtext {
color: var(--color-text-trivial);
color: var(--color-text-secondary);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const PlaygroundCard = ({
<div className="border-border flex w-full flex-col gap-y-4 border-b px-4 py-6">
<div className="flex items-center gap-x-2">
<div className="rounded-md bg-blue-500 p-2">
<BaseIcon icon={StarIcon} size="sm" weight="duotone" className="text-white" />
<BaseIcon icon={StarIcon} size="sm" weight="duotone" className="text-text-inverse" />
</div>
<Typography type="caption" weight="medium" className="text-blue-500">
{categoryTitle}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Typography } from '@genseki/react'
export const Wrapper = ({ children, title }: { children: React.ReactNode; title: string }) => {
return (
<div className="flex flex-col space-y-6 p-8">
<Typography type="h4" weight="semibold" className="text-text-nontrivial">
<Typography type="h4" weight="semibold" className="text-text-primary">
{title}
</Typography>
{children}
Expand Down
120 changes: 80 additions & 40 deletions examples/ui-playground/src/app/playground/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -316,9 +316,10 @@ export default function UIPlayground() {

return (
<div className="bg-white pb-24 relative dark:bg-black">
<div className="bg-warning text-warning-fg">xxxx</div>
<div className="fixed top-6 right-6 z-50">
<Button
variant={theme === 'dark' ? 'secondary' : 'primary'}
variant={'secondary'}
size="md"
onClick={() => setTheme(theme === 'dark' ? 'light' : 'dark')}
>
Expand All @@ -332,10 +333,9 @@ export default function UIPlayground() {
Background: --color-bg | Foreground: --color-fg
</Typography>
</div>
<div className="bg-primary border-primary-emphasis rounded-sm border px-8 py-4">
<div className="bg-primary border-primary rounded-sm border px-8 py-4">
<Typography type="body" weight="normal" className="text-primary-fg">
Background: --color-primary | Foreground: --color-primary-fg | border:
--color-primary-emphasis
Background: --color-primary | Foreground: --color-primary-fg | border: --color-primary
</Typography>
</div>
<div className="bg-secondary border-border rounded-sm border px-8 py-4">
Expand Down Expand Up @@ -1093,13 +1093,22 @@ export default function UIPlayground() {
isDisabled
placeholder="Data"
/>
<TextField
isRequired
type="text"
label="Something label and small textfield"
description="This is a helper text"
prefix={<BaseIcon icon={PlusCircleIcon} size="sm" />}
suffix={<BaseIcon icon={PlusCircleIcon} size="sm" />}
size="xs"
/>
<TextField
isRequired
type="password"
label="Package name"
label="Some large textfield"
isPending
description="This is a helper text"
size="md"
size="lg"
/>
<TextField
isRequired
Expand Down Expand Up @@ -1188,9 +1197,63 @@ export default function UIPlayground() {
trailingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
size="md"
>
TESTER
Primary
</Button>
<Button
variant="secondary"
isDisabled
leadingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
trailingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
size="md"
>
Secondary
</Button>
<Button
variant="tertiary"
leadingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
trailingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
size="md"
>
Tertiary
</Button>
<Button
variant="naked"
leadingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
trailingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
size="md"
>
Naked
</Button>
<Button
variant="outline"
leadingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
trailingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
size="md"
>
Outline
</Button>
<Button
variant="ghost"
leadingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
trailingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
size="md"
>
Ghost
</Button>
<Button
variant="destruction"
leadingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
trailingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
size="md"
>
Destruction
</Button>
</div>
</PlaygroundCard>
<PlaygroundCard title="Medium size (md) (disabled)" categoryTitle="Button">
<div className="flex w-full flex-col items-start gap-y-3">
<Button
isDisabled
variant="primary"
leadingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
trailingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
Expand All @@ -1199,6 +1262,7 @@ export default function UIPlayground() {
Primary
</Button>
<Button
isDisabled
variant="secondary"
leadingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
trailingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
Expand All @@ -1207,6 +1271,7 @@ export default function UIPlayground() {
Secondary
</Button>
<Button
isDisabled
variant="tertiary"
leadingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
trailingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
Expand All @@ -1215,6 +1280,7 @@ export default function UIPlayground() {
Tertiary
</Button>
<Button
isDisabled
variant="naked"
leadingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
trailingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
Expand All @@ -1223,6 +1289,7 @@ export default function UIPlayground() {
Naked
</Button>
<Button
isDisabled
variant="outline"
leadingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
trailingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
Expand All @@ -1231,6 +1298,7 @@ export default function UIPlayground() {
Outline
</Button>
<Button
isDisabled
variant="ghost"
leadingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
trailingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
Expand All @@ -1239,6 +1307,7 @@ export default function UIPlayground() {
Ghost
</Button>
<Button
isDisabled
variant="destruction"
leadingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
trailingIcon={<BaseIcon icon={PlusCircleIcon} size="md" />}
Expand Down Expand Up @@ -1447,31 +1516,6 @@ export default function UIPlayground() {
</Button>
</div>
</PlaygroundCard>
<PlaygroundCard title="Double extra small size (xxs)" categoryTitle="Button">
<div className="flex w-full flex-col items-start gap-y-3">
<Button variant="primary" size="xxs">
<BaseIcon icon={PlusCircleIcon} size="sm" />
</Button>
<Button variant="secondary" size="xxs">
<BaseIcon icon={PlusCircleIcon} size="sm" />
</Button>
<Button variant="tertiary" size="xxs">
<BaseIcon icon={PlusCircleIcon} size="sm" />
</Button>
<Button variant="naked" size="xxs">
<BaseIcon icon={PlusCircleIcon} size="sm" />
</Button>
<Button variant="outline" size="xxs">
<BaseIcon icon={PlusCircleIcon} size="sm" />
</Button>
<Button variant="ghost" size="xxs">
<BaseIcon icon={PlusCircleIcon} size="sm" />
</Button>
<Button variant="destruction" size="xxs">
<BaseIcon icon={PlusCircleIcon} size="sm" />
</Button>
</div>
</PlaygroundCard>
</div>
</Wrapper>
<Wrapper title="Base icon">
Expand Down Expand Up @@ -1584,17 +1628,13 @@ export default function UIPlayground() {
</PlaygroundCard>
<PlaygroundCard title="Large size (lg)" categoryTitle="Checkbox">
<CheckboxGroup>
<Checkbox value="x" size="lg">
X
</Checkbox>
<Checkbox
size="lg"
value="y"
label="Remember me"
description="Save my login details for next time"
></Checkbox>
<Checkbox isDisabled value="z">
Z
</Checkbox>
/>
<Checkbox isDisabled value="z" label="Hello world" size="lg" />
</CheckboxGroup>
</PlaygroundCard>
</div>
Expand Down Expand Up @@ -1690,7 +1730,7 @@ export default function UIPlayground() {

<Wrapper title="Annotation">
<Annotation>Annotation</Annotation>
<Annotation className="bg-red-50 text-red-700">Annotation</Annotation>
<Annotation className="bg-surface-incorrect text-text-incorrect">Annotation</Annotation>
</Wrapper>

<Wrapper title="Tools Tip group">
Expand Down
2 changes: 1 addition & 1 deletion examples/ui-playground/src/app/playground/tiptap-style.css
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@
}

.tiptap-image-upload-subtext {
color: var(--color-text-trivial);
color: var(--color-text-secondary);
}
}
}
Expand Down
Loading