Skip to content

Dev color #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 28, 2025
Merged

Dev color #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0646ad4
feat: color
ikun97 Feb 28, 2025
7148b1f
feat: color
ikun97 Feb 28, 2025
b7eea4a
feat: ui
ikun97 Feb 28, 2025
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
Binary file added web/apps/web/public/workflow-thumbnail-old.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified web/apps/web/public/workflow-thumbnail.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion web/apps/web/src/components/layouts/side-content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const ItemContent = ({
className={cn(
'flex gap-3 p-2 cursor-pointer rounded-md text-subtler',
isActive(item.href)
? '!text-default bg-neutral-on-surface-active'
? '!text-default bg-brand-default'
: 'hover:bg-neutral-on-surface-hover hover:text-default',
)}>
{item.icon
Expand Down
2 changes: 0 additions & 2 deletions web/apps/web/src/stores/app/schema/intro-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ export const introConfigSchema: ISchema = {
'x-title-size': 'h4',
description:
'The intro message is crucial for user experience. Keep it within one iOS screen (text, image, and buttons) to ensure a smooth, engaging start.',
'x-show-bottom-border': true,
'x-wrapper-class': 'px-3',
properties: {
render: {
type: 'object',
Expand Down
4 changes: 2 additions & 2 deletions web/packages/flow-engine/src/components/flow-drag/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,10 @@ const FlowDag = forwardRef<FlowRef, IFlowDagProps>(
<Background
gap={24}
size={3}
color="#E1DCD7"
color="var(--background-neutral-primary-hover)"
variant={BackgroundVariant.Dots}
style={{
backgroundColor: '#F7F4F0',
backgroundColor: 'var(--background-neutral-primary-default)',
}}
/>
</ReactFlow>
Expand Down
4 changes: 1 addition & 3 deletions web/packages/form-engine/src/components/block/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,7 @@ const Block: React.FC<IBlockProps> = props => {
size="sm"
lineClamp={6}
color="subtlest"
className={cn('mt-1.5', {
'pb-3 border-b-[0.3px] border-default px-3': xShowBorder, //todo: 需要优化
})}>
className="mt-1.5 pb-3 border-b-[0.3px] border-default mx-3">
{description}
</Paragraph>
) : null}
Expand Down
32 changes: 16 additions & 16 deletions web/packages/tailwind-config/tailwind.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,18 @@ const config: Omit<Config, 'content' | 'plugins'> = {
'--pure-mauve-99': '#f9f7fc',
'--pure-mauve-100': '#ffffff',
'--neutral-0': '#000000',
'--neutral-5': '#12110e',
'--neutral-10': '#24201d',
'--neutral-20': '#37322d',
'--neutral-30': '#3d3934',
'--neutral-40': '#44403c',
'--neutral-50': '#55504b',
'--neutral-60': '#6e6964',
'--neutral-70': '#78736e',
'--neutral-80': '#8c8782',
'--neutral-90': '#c8c3be',
'--neutral-95': '#e1dcd7',
'--neutral-98': '#f7f4f0',
'--neutral-5': '#121110',
'--neutral-10': '#242220',
'--neutral-20': '#373430',
'--neutral-30': '#3d3a36',
'--neutral-40': '#44413f',
'--neutral-50': '#55524e',
'--neutral-60': '#6e6b67',
'--neutral-70': '#787572',
'--neutral-80': '#8c8986',
'--neutral-90': '#c8c5c2',
'--neutral-95': '#e1dfdc',
'--neutral-98': '#f5f4f2',
'--neutral-99': '#fcfbfa',
'--neutral-100': '#ffffff',
'--neutral-variant-0': '#000000',
Expand Down Expand Up @@ -273,10 +273,10 @@ const config: Omit<Config, 'content' | 'plugins'> = {
'--lake-blue-98': '#f8f9ff',
'--lake-blue-99': '#fdfcff',
'--lake-blue-100': '#ffffff',
'--opacity-on-surface-10': '#dbd3ca29',
'--opacity-on-surface-20': '#b8b0a933',
'--opacity-on-surface-30': '#a3999033',
'--opacity-on-surface-40': '#8c7f7333',
'--opacity-on-surface-10': '#dbd9d729',
'--opacity-on-surface-20': '#cccbca33',
'--opacity-on-surface-30': '#bab8b633',
'--opacity-on-surface-40': '#94928f33',
'--opacity-white-1': '#ffffff03',
'--opacity-white-3': '#ffffff08',
'--opacity-white-5': '#ffffff0d',
Expand Down