From dc48c3863d4d7689d4c24861047c510b2f832483 Mon Sep 17 00:00:00 2001 From: balibabu Date: Thu, 7 Aug 2025 15:19:45 +0800 Subject: [PATCH] Feat: Replace color variables according to design draft #3221 (#9305) ### What problem does this PR solve? Feat: Replace color variables according to design draft #3221 ### Type of change - [x] New Feature (non-breaking change which adds functionality) --- web/src/components/bulk-operate-bar.tsx | 2 +- web/src/components/confirm-delete-dialog.tsx | 2 +- .../components/list-filter-bar/filter-popover.tsx | 2 +- web/src/components/list-filter-bar/index.tsx | 2 +- .../next-message-item/uploaded-message-files.tsx | 2 +- web/src/components/prompt-editor/index.tsx | 2 +- web/src/components/ui/breadcrumb.tsx | 2 +- web/src/components/ui/dual-range-slider.tsx | 4 ++-- web/src/components/ui/ragflow-pagination.tsx | 4 ++-- web/src/components/ui/segmented.tsx | 8 ++++---- web/src/components/ui/sidebar.tsx | 1 + web/src/components/ui/switch.tsx | 2 +- web/src/components/ui/table.tsx | 4 ++-- web/src/components/ui/tabs.tsx | 2 +- web/src/layouts/next-header.tsx | 4 ++-- web/src/layouts/next.tsx | 2 +- web/src/pages/agent/canvas/edge/index.tsx | 4 ++-- web/src/pages/agent/canvas/node/agent-node.tsx | 4 ++-- .../canvas/node/dropdown/next-step-dropdown.tsx | 2 +- web/src/pages/agent/canvas/node/handle.tsx | 2 +- web/src/pages/agent/canvas/node/node-wrapper.tsx | 2 +- web/src/pages/agent/canvas/node/switch-node.tsx | 6 +++--- web/src/pages/agent/embed-dialog/index.tsx | 4 ++-- .../agent/form-sheet/single-debug-sheet/index.tsx | 2 +- .../pages/agent/form/agent-form/agent-tools.tsx | 6 +++--- .../pages/agent/form/code-form/next-variable.tsx | 4 ++-- web/src/pages/agent/form/components/output.tsx | 4 ++-- .../agent/form/components/prompt-editor/index.tsx | 2 +- .../agent/form/iteration-form/dynamic-output.tsx | 4 ++-- web/src/pages/agent/form/switch-form/index.tsx | 4 ++-- .../pages/agent/form/tool-form/mcp-form/index.tsx | 2 +- .../agent/form/tool-form/mcp-form/mcp-card.tsx | 2 +- web/src/pages/agent/index.tsx | 2 +- .../pages/agent/log-sheet/toolTimelineItem.tsx | 4 ++-- .../pages/agent/log-sheet/workFlowTimeline.tsx | 8 ++++---- web/src/pages/agent/operator-icon.tsx | 2 +- web/src/pages/agent/version-dialog/index.tsx | 2 +- web/src/pages/agents/agent-card.tsx | 4 ++-- web/src/pages/agents/agent-dropdown.tsx | 2 +- .../components/document-preview/csv-preview.tsx | 2 +- web/src/pages/dataset/dataset-title.tsx | 2 +- web/src/pages/dataset/sidebar/index.tsx | 6 +++--- web/src/pages/dataset/testing/index.tsx | 2 +- web/src/pages/dataset/testing/testing-result.tsx | 2 +- web/src/pages/datasets/dataset-card.tsx | 6 +++--- web/src/pages/datasets/dataset-dropdown.tsx | 2 +- web/src/pages/home/application-card.tsx | 4 ++-- web/src/pages/home/banner.tsx | 2 +- web/src/pages/next-chats/chat-card.tsx | 4 ++-- web/src/pages/next-chats/chat-dropdown.tsx | 2 +- .../pages/profile-setting/mcp/edit-mcp-dialog.tsx | 2 +- web/src/pages/profile-setting/mcp/index.tsx | 4 ++-- web/src/pages/profile-setting/mcp/mcp-card.tsx | 6 +++--- .../pages/profile-setting/mcp/mcp-dropdown.tsx | 2 +- web/src/pages/profile-setting/mcp/tool-card.tsx | 2 +- web/tailwind.config.js | 10 +++------- web/tailwind.css | 15 +++------------ 57 files changed, 93 insertions(+), 105 deletions(-) diff --git a/web/src/components/bulk-operate-bar.tsx b/web/src/components/bulk-operate-bar.tsx index c15e66c75..bf13c765d 100644 --- a/web/src/components/bulk-operate-bar.tsx +++ b/web/src/components/bulk-operate-bar.tsx @@ -40,7 +40,7 @@ export function BulkOperateBar({ {list.map((x) => (
  • - + {initialValue.map((value, index) => ( - + {label && ( @@ -174,7 +174,7 @@ export function RAGFlowPagination({ options={sizeChangerOptions} value={currentPageSize} onChange={handlePageSizeChange} - triggerClassName="bg-background-header-bar" + triggerClassName="bg-bg-card" > )} diff --git a/web/src/components/ui/segmented.tsx b/web/src/components/ui/segmented.tsx index 27cf6e5d9..cec2bb6df 100644 --- a/web/src/components/ui/segmented.tsx +++ b/web/src/components/ui/segmented.tsx @@ -43,7 +43,7 @@ export function Segmented({ return (
    @@ -55,10 +55,10 @@ export function Segmented({
    handleOnChange(actualValue)} diff --git a/web/src/components/ui/sidebar.tsx b/web/src/components/ui/sidebar.tsx index b9fbf0d0f..8747a240c 100644 --- a/web/src/components/ui/sidebar.tsx +++ b/web/src/components/ui/sidebar.tsx @@ -316,6 +316,7 @@ const SidebarRail = React.forwardRef< '[[data-side=right][data-collapsible=offcanvas]_&]:-left-2', className, )} + type="button" {...props} /> ); diff --git a/web/src/components/ui/switch.tsx b/web/src/components/ui/switch.tsx index 18c94e8ea..6c4d6cf96 100644 --- a/web/src/components/ui/switch.tsx +++ b/web/src/components/ui/switch.tsx @@ -11,7 +11,7 @@ const Switch = React.forwardRef< >(({ className, ...props }, ref) => ( -
    +
    21.5k stars
    @@ -164,7 +164,7 @@ export function Header() { className="size-8 cursor-pointer" onClick={navigateToProfile} > - + Pro
    diff --git a/web/src/layouts/next.tsx b/web/src/layouts/next.tsx index f98ee225c..d92a3ff07 100644 --- a/web/src/layouts/next.tsx +++ b/web/src/layouts/next.tsx @@ -3,7 +3,7 @@ import { Header } from './next-header'; export default function NextLayout() { return ( -
    +
    diff --git a/web/src/pages/agent/canvas/edge/index.tsx b/web/src/pages/agent/canvas/edge/index.tsx index d762d7413..3e1b57e85 100644 --- a/web/src/pages/agent/canvas/edge/index.tsx +++ b/web/src/pages/agent/canvas/edge/index.tsx @@ -90,7 +90,7 @@ function InnerButtonEdge({ path={edgePath} markerEnd={markerEnd} style={{ ...style, ...selectedStyle, ...highlightStyle }} - className="text-text-sub-title" + className="text-text-secondary" /> @@ -108,7 +108,7 @@ function InnerButtonEdge({ >
    diff --git a/web/src/pages/agent/log-sheet/toolTimelineItem.tsx b/web/src/pages/agent/log-sheet/toolTimelineItem.tsx index 035476a15..8408e43f1 100644 --- a/web/src/pages/agent/log-sheet/toolTimelineItem.tsx +++ b/web/src/pages/agent/log-sheet/toolTimelineItem.tsx @@ -157,13 +157,13 @@ const ToolTimelineItem = ({ ] ?? changeToolName(tool.tool_name)} )} - + {/* 0:00 {x.data.elapsed_time?.toString().slice(0, 6)} */} Online diff --git a/web/src/pages/agent/log-sheet/workFlowTimeline.tsx b/web/src/pages/agent/log-sheet/workFlowTimeline.tsx index 75fa4fb5a..f7ec1c3c4 100644 --- a/web/src/pages/agent/log-sheet/workFlowTimeline.tsx +++ b/web/src/pages/agent/log-sheet/workFlowTimeline.tsx @@ -211,7 +211,7 @@ export const WorkFlowTimeline = ({ > - + {x.data.elapsed_time?.toString().slice(0, 6)} Online diff --git a/web/src/pages/agent/operator-icon.tsx b/web/src/pages/agent/operator-icon.tsx index cf8d9af4a..52261f068 100644 --- a/web/src/pages/agent/operator-icon.tsx +++ b/web/src/pages/agent/operator-icon.tsx @@ -64,7 +64,7 @@ const OperatorIcon = ({ name, className }: IProps) => { if (name === Operator.Begin) { return ( -
    +
    ); diff --git a/web/src/pages/agent/version-dialog/index.tsx b/web/src/pages/agent/version-dialog/index.tsx index 5197048c4..9a0b9741c 100644 --- a/web/src/pages/agent/version-dialog/index.tsx +++ b/web/src/pages/agent/version-dialog/index.tsx @@ -92,7 +92,7 @@ export function VersionDialog({
    {agent?.title}
    -

    +

    Created: {formatDate(agent?.create_date)}

    diff --git a/web/src/pages/agents/agent-card.tsx b/web/src/pages/agents/agent-card.tsx index c6497b968..107929805 100644 --- a/web/src/pages/agents/agent-card.tsx +++ b/web/src/pages/agents/agent-card.tsx @@ -37,8 +37,8 @@ export function AgentCard({ data, showAgentRenameModal }: DatasetCardProps) {

    {data.title}

    -

    {data.description}

    -

    +

    {data.description}

    +

    {formatDate(data.update_time)}

    diff --git a/web/src/pages/agents/agent-dropdown.tsx b/web/src/pages/agents/agent-dropdown.tsx index 3a3360a3d..9cffae867 100644 --- a/web/src/pages/agents/agent-dropdown.tsx +++ b/web/src/pages/agents/agent-dropdown.tsx @@ -47,7 +47,7 @@ export function AgentDropdown({ { e.preventDefault(); }} diff --git a/web/src/pages/chunk/parsed-result/add-knowledge/components/knowledge-chunk/components/document-preview/csv-preview.tsx b/web/src/pages/chunk/parsed-result/add-knowledge/components/knowledge-chunk/components/document-preview/csv-preview.tsx index d31b02975..0f5a9444d 100644 --- a/web/src/pages/chunk/parsed-result/add-knowledge/components/knowledge-chunk/components/document-preview/csv-preview.tsx +++ b/web/src/pages/chunk/parsed-result/add-knowledge/components/knowledge-chunk/components/document-preview/csv-preview.tsx @@ -84,7 +84,7 @@ const CSVFileViewer: React.FC = () => { {data.headers.map((header, index) => ( {header} diff --git a/web/src/pages/dataset/dataset-title.tsx b/web/src/pages/dataset/dataset-title.tsx index 60eb46033..328fb3ec6 100644 --- a/web/src/pages/dataset/dataset-title.tsx +++ b/web/src/pages/dataset/dataset-title.tsx @@ -9,7 +9,7 @@ export function TopTitle({ title, description }: TopTitleProps) { return (
    {title}
    -

    {description}

    +

    {description}

    ); } diff --git a/web/src/pages/dataset/sidebar/index.tsx b/web/src/pages/dataset/sidebar/index.tsx index b872213fb..37e46ca0a 100644 --- a/web/src/pages/dataset/sidebar/index.tsx +++ b/web/src/pages/dataset/sidebar/index.tsx @@ -62,8 +62,8 @@ export function SideBar({ refreshCount }: PropType) { name={data.name} className="size-16" > -
    -

    +
    +

    {data.name}

    @@ -85,7 +85,7 @@ export function SideBar({ refreshCount }: PropType) { 'w-full justify-start gap-2.5 px-3 relative h-10 text-text-sub-title-invert', { 'bg-bg-card': active, - 'text-text-title': active, + 'text-text-primary': active, }, )} onClick={handleMenuClick(item.key)} diff --git a/web/src/pages/dataset/testing/index.tsx b/web/src/pages/dataset/testing/index.tsx index 244457d0b..e7a644441 100644 --- a/web/src/pages/dataset/testing/index.tsx +++ b/web/src/pages/dataset/testing/index.tsx @@ -44,7 +44,7 @@ export default function RetrievalTesting() {
    - + Test setting {/*

    -

    +

    {dataset.doc_num} files

    -

    +

    {formatDate(dataset.update_time)}

    @@ -76,7 +76,7 @@ export function SeeAllCard() { className="bg-colors-background-inverse-weak w-40" onClick={navigateToDatasetList} > - + See All diff --git a/web/src/pages/datasets/dataset-dropdown.tsx b/web/src/pages/datasets/dataset-dropdown.tsx index 16e175dda..774f87866 100644 --- a/web/src/pages/datasets/dataset-dropdown.tsx +++ b/web/src/pages/datasets/dataset-dropdown.tsx @@ -47,7 +47,7 @@ export function DatasetDropdown({ { e.preventDefault(); }} diff --git a/web/src/pages/home/application-card.tsx b/web/src/pages/home/application-card.tsx index 6a6003f57..63e97b971 100644 --- a/web/src/pages/home/application-card.tsx +++ b/web/src/pages/home/application-card.tsx @@ -25,7 +25,7 @@ export function ApplicationCard({ app }: ApplicationCardProps) {

    {app.title}

    -

    +

    {formatDate(app.update_time)}

    @@ -44,7 +44,7 @@ export type SeeAllAppCardProps = { export function SeeAllAppCard({ click }: SeeAllAppCardProps) { return ( - + See All diff --git a/web/src/pages/home/banner.tsx b/web/src/pages/home/banner.tsx index 284ceae94..3173a40ba 100644 --- a/web/src/pages/home/banner.tsx +++ b/web/src/pages/home/banner.tsx @@ -43,7 +43,7 @@ export function NextBanner() { const { t } = useTranslation(); return (
    - {t('header.welcome')} + {t('header.welcome')} RAGFlow diff --git a/web/src/pages/next-chats/chat-card.tsx b/web/src/pages/next-chats/chat-card.tsx index 82ad69345..56451fe10 100644 --- a/web/src/pages/next-chats/chat-card.tsx +++ b/web/src/pages/next-chats/chat-card.tsx @@ -34,8 +34,8 @@ export function ChatCard({ data, showChatRenameModal }: IProps) {

    {data.name}

    -

    {data.description}

    -

    +

    {data.description}

    +

    {formatDate(data.update_time)}

    diff --git a/web/src/pages/next-chats/chat-dropdown.tsx b/web/src/pages/next-chats/chat-dropdown.tsx index 29fb33da4..fd8fc691a 100644 --- a/web/src/pages/next-chats/chat-dropdown.tsx +++ b/web/src/pages/next-chats/chat-dropdown.tsx @@ -47,7 +47,7 @@ export function ChatDropdown({ { e.preventDefault(); }} diff --git a/web/src/pages/profile-setting/mcp/edit-mcp-dialog.tsx b/web/src/pages/profile-setting/mcp/edit-mcp-dialog.tsx index 6be9c5cd4..c878d917d 100644 --- a/web/src/pages/profile-setting/mcp/edit-mcp-dialog.tsx +++ b/web/src/pages/profile-setting/mcp/edit-mcp-dialog.tsx @@ -133,7 +133,7 @@ export function EditMcpDialog({ onClick={handleTest} > diff --git a/web/src/pages/profile-setting/mcp/index.tsx b/web/src/pages/profile-setting/mcp/index.tsx index 2f721105e..912d71cb6 100644 --- a/web/src/pages/profile-setting/mcp/index.tsx +++ b/web/src/pages/profile-setting/mcp/index.tsx @@ -33,9 +33,9 @@ export default function McpServer() { return (
    -
    MCP Servers
    +
    MCP Servers
    -
    +
    Customize the list of MCP servers
    diff --git a/web/src/pages/profile-setting/mcp/mcp-card.tsx b/web/src/pages/profile-setting/mcp/mcp-card.tsx index b83c20c5e..298f6a8cf 100644 --- a/web/src/pages/profile-setting/mcp/mcp-card.tsx +++ b/web/src/pages/profile-setting/mcp/mcp-card.tsx @@ -36,7 +36,7 @@ export function McpCard({
    -

    {data.name}

    +

    {data.name}

    @@ -52,10 +52,10 @@ export function McpCard({
    -
    +
    {toolLength} cached tools
    -

    +

    {formatDate(data.update_date)}

    diff --git a/web/src/pages/profile-setting/mcp/mcp-dropdown.tsx b/web/src/pages/profile-setting/mcp/mcp-dropdown.tsx index 33e14970d..28f4cb2a5 100644 --- a/web/src/pages/profile-setting/mcp/mcp-dropdown.tsx +++ b/web/src/pages/profile-setting/mcp/mcp-dropdown.tsx @@ -43,7 +43,7 @@ export function McpDropdown({ { e.preventDefault(); }} diff --git a/web/src/pages/profile-setting/mcp/tool-card.tsx b/web/src/pages/profile-setting/mcp/tool-card.tsx index f1b15d8b0..a5c8f2953 100644 --- a/web/src/pages/profile-setting/mcp/tool-card.tsx +++ b/web/src/pages/profile-setting/mcp/tool-card.tsx @@ -10,7 +10,7 @@ export function McpToolCard({ data }: McpToolCardProps) {

    {data.name}

    -
    +
    {data.description}
    diff --git a/web/tailwind.config.js b/web/tailwind.config.js index c8ab34460..06e51dc4c 100644 --- a/web/tailwind.config.js +++ b/web/tailwind.config.js @@ -40,7 +40,6 @@ module.exports = { 'colors-text-inverse-strong': 'var(--colors-text-inverse-strong)', 'colors-text-persist-light': 'var(--colors-text-persist-light)', 'colors-text-inverse-weak': 'var(--colors-text-inverse-weak)', - 'text-delete-red': 'var(--text-delete-red)', 'background-badge': 'var(--background-badge)', 'text-badge': 'var(--text-badge)', @@ -51,12 +50,9 @@ module.exports = { 'background-header-bar': 'var(--background-header-bar)', 'background-card': 'var(--background-card)', 'background-note': 'var(--background-note)', - 'background-checked': 'var(--background-checked)', 'background-highlight': 'var(--background-highlight)', 'input-border': 'var(--input-border)', - 'dot-green': 'var(--dot-green)', - 'dot-red': 'var(--dot-red)', /* design colors */ @@ -70,9 +66,9 @@ module.exports = { 'border-button': 'var(--border-button)', 'accent-primary': 'var(--accent-primary)', 'bg-accent': 'var(--bg-accent)', - 'state--success': 'var(--state--success)', - 'state--warning': 'var(--state--warning)', - 'state--error': 'var(--state--error)', + 'state-success': 'var(--state-success)', + 'state-warning': 'var(--state-warning)', + 'state-error': 'var(--state-error)', 'team-group': 'var(--team-group)', 'team-member': 'var(--team-member)', 'team-department': 'var(--team-department)', diff --git a/web/tailwind.css b/web/tailwind.css index 9ab7dca6c..2b92885b6 100644 --- a/web/tailwind.css +++ b/web/tailwind.css @@ -61,7 +61,6 @@ --colors-text-inverse-strong: rgba(255, 255, 255, 1); --colors-text-persist-light: rgba(255, 255, 255, 1); --colors-text-inverse-weak: rgba(184, 181, 203, 1); - --text-delete-red: rgba(216, 73, 75, 1); --sidebar-background: 0 0% 98%; --sidebar-foreground: 240 5.3% 26.1%; @@ -87,12 +86,9 @@ --background-note: rgba(22, 22, 24, 0.1); - --background-checked: rgba(76, 164, 231, 1); --background-highlight: rgba(76, 164, 231, 0.1); --input-border: rgba(22, 22, 24, 0.2); - --dot-green: rgba(59, 160, 92, 1); - --dot-red: rgba(216, 73, 75, 1); /* design colors */ @@ -115,8 +111,8 @@ /* Output Variables Box */ --bg-accent: rgba(76, 164, 231, 0.05); - --state--success: #3ba05c; - --state--warning: #faad14; + --state-success: #3ba05c; + --state-warning: #faad14; --state-error: #d8494b; --team-group: #5ab77e; @@ -211,7 +207,6 @@ --colors-text-inverse-strong: rgba(17, 16, 23, 1); --colors-text-persist-light: rgba(255, 255, 255, 1); --colors-text-inverse-weak: rgba(84, 80, 106, 1); - --text-delete-red: rgba(216, 73, 75, 1); --sidebar-background: 240 5.9% 10%; --sidebar-foreground: 240 4.8% 95.9%; @@ -231,15 +226,11 @@ --background-card: rgba(255, 255, 255, 0.05); --background-note: rgba(255, 255, 255, 0.05); - --background-checked: rgba(76, 164, 231, 1); --background-highlight: rgba(76, 164, 231, 0.1); --input-border: rgba(255, 255, 255, 0.2); - --dot-green: rgba(59, 160, 92, 1); - --dot-red: rgba(216, 73, 75, 1); - /* design colors */ --bg-base: #161618; @@ -259,7 +250,7 @@ @apply border-border; } body { - @apply bg-text-title-invert text-foreground; + @apply bg-bg-base text-text-primary; font-feature-settings: 'rlig' 1, 'calt' 1;