diff --git a/ui/src/App.tsx b/ui/src/App.tsx index ddeb20e8d..d2b78bded 100644 --- a/ui/src/App.tsx +++ b/ui/src/App.tsx @@ -58,29 +58,21 @@ const RootApp = () => { ...antdTheme, token: { /* @see global.css, YOU MUST MODIFY BOTH DEFINITIONS AT THE SAME TIME! */ + colorBgBase: browserTheme === "dark" ? "#17191c" : "#ffffff", + colorTextBase: browserTheme === "dark" ? "#fafaf9" : "#141414", colorPrimary: browserTheme === "dark" ? "#f97316" : "#ea580c", colorLink: browserTheme === "dark" ? "#f97316" : "#ea580c", colorInfo: browserTheme === "dark" ? "#478be6" : "#0969da", colorSuccess: browserTheme === "dark" ? "#57ab5a" : "#1a7f37", colorWarning: browserTheme === "dark" ? "#daaa3f" : "#eac54f", colorError: browserTheme === "dark" ? "#e5534b" : "#d1242f", - colorBgContainer: "var(--color-container)", }, components: { Layout: { ...antdTheme?.components?.Layout, bodyBg: "transparent", - headerBg: "var(--color-container)", siderBg: "transparent", }, - Table: { - ...antdTheme?.components?.Table, - bodySortBg: "var(--color-container)", - headerBg: "var(--color-container)", - headerSortActiveBg: "var(--color-container)", - headerSortHoverBg: "var(--color-container-hover)", - rowHoverBg: "var(--color-container-hover)", - }, }, }} > diff --git a/ui/src/components/provider/ACMEDns01ProviderSelect.tsx b/ui/src/components/provider/ACMEDns01ProviderSelect.tsx index d761023b7..a6fb45953 100644 --- a/ui/src/components/provider/ACMEDns01ProviderSelect.tsx +++ b/ui/src/components/provider/ACMEDns01ProviderSelect.tsx @@ -36,7 +36,7 @@ const ACMEDns01ProviderSelect = ({ filter, ...props }: ACMEDns01ProviderSelectPr const renderOption = (key: string) => { const provider = acmeDns01ProvidersMap.get(key); return ( -
+
{t(provider?.name ?? "")}
diff --git a/ui/src/components/provider/AccessProviderSelect.tsx b/ui/src/components/provider/AccessProviderSelect.tsx index 3ba346387..7961eba2c 100644 --- a/ui/src/components/provider/AccessProviderSelect.tsx +++ b/ui/src/components/provider/AccessProviderSelect.tsx @@ -53,7 +53,7 @@ const AccessProviderSelect = ({ filter, showOptionTags, ...props }: AccessProvid const provider = accessProvidersMap.get(key) ?? ({ type: "", name: "", icon: "", usages: [] } as unknown as AccessProvider); return (
-
+
{t(provider.name)} diff --git a/ui/src/components/provider/CAProviderSelect.tsx b/ui/src/components/provider/CAProviderSelect.tsx index 5aef86d19..61a5f2c91 100644 --- a/ui/src/components/provider/CAProviderSelect.tsx +++ b/ui/src/components/provider/CAProviderSelect.tsx @@ -45,7 +45,7 @@ const CAProviderSelect = ({ filter, ...props }: CAProviderSelectProps) => { const renderOption = (key: string) => { if (key === "") { return ( -
+
{t("provider.default_ca_provider.label")} @@ -55,7 +55,7 @@ const CAProviderSelect = ({ filter, ...props }: CAProviderSelectProps) => { const provider = caProvidersMap.get(key); return ( -
+
{t(provider?.name ?? "")}
diff --git a/ui/src/components/provider/DeploymentProviderSelect.tsx b/ui/src/components/provider/DeploymentProviderSelect.tsx index 77d2a4635..1ca5162a4 100644 --- a/ui/src/components/provider/DeploymentProviderSelect.tsx +++ b/ui/src/components/provider/DeploymentProviderSelect.tsx @@ -36,7 +36,7 @@ const DeploymentProviderSelect = ({ filter, ...props }: DeploymentProviderSelect const renderOption = (key: string) => { const provider = deploymentProvidersMap.get(key); return ( -
+
{t(provider?.name ?? "")}
diff --git a/ui/src/components/provider/NotificationProviderSelect.tsx b/ui/src/components/provider/NotificationProviderSelect.tsx index 4f2164ee2..683c8fec2 100644 --- a/ui/src/components/provider/NotificationProviderSelect.tsx +++ b/ui/src/components/provider/NotificationProviderSelect.tsx @@ -36,7 +36,7 @@ const NotificationProviderSelect = ({ filter, ...props }: NotificationProviderSe const renderOption = (key: string) => { const provider = notificationProvidersMap.get(key); return ( -
+
{t(provider?.name ?? "")}
diff --git a/ui/src/components/workflow/node/ApplyNode.tsx b/ui/src/components/workflow/node/ApplyNode.tsx index ff0d64bfe..ca5664474 100644 --- a/ui/src/components/workflow/node/ApplyNode.tsx +++ b/ui/src/components/workflow/node/ApplyNode.tsx @@ -33,7 +33,7 @@ const ApplyNode = ({ node, disabled }: ApplyNodeProps) => { } const config = (node.config as WorkflowNodeConfigForApply) ?? {}; - return {config.domains || " "}; + return {config.domains || "\u00A0"}; }, [node]); const formRef = useRef(null); diff --git a/ui/src/components/workflow/node/NotifyNode.tsx b/ui/src/components/workflow/node/NotifyNode.tsx index 0ab418291..d652b3f76 100644 --- a/ui/src/components/workflow/node/NotifyNode.tsx +++ b/ui/src/components/workflow/node/NotifyNode.tsx @@ -42,7 +42,7 @@ const NotifyNode = ({ node, disabled }: NotifyNodeProps) => { return ( - {t(provider?.name ?? " ")} + {t(provider?.name ?? "\u00A0")} {config.subject ?? ""} diff --git a/ui/src/components/workflow/node/StartNode.tsx b/ui/src/components/workflow/node/StartNode.tsx index 4b920bd92..b1540b638 100644 --- a/ui/src/components/workflow/node/StartNode.tsx +++ b/ui/src/components/workflow/node/StartNode.tsx @@ -44,7 +44,7 @@ const StartNode = ({ node, disabled }: StartNodeProps) => { ? t("workflow.props.trigger.auto") : config.trigger === WORKFLOW_TRIGGERS.MANUAL ? t("workflow.props.trigger.manual") - : " "} + : "\u00A0"} {config.trigger === WORKFLOW_TRIGGERS.AUTO ? config.triggerCron : ""} diff --git a/ui/src/global.css b/ui/src/global.css index b401f20ad..f5496404e 100644 --- a/ui/src/global.css +++ b/ui/src/global.css @@ -11,8 +11,6 @@ @theme { --color-background: var(---twColorBackground); --color-foreground: var(---twColorForeground); - --color-container: var(---twColorContainer); - --color-container-hover: var(---twColorContainerHover); --color-primary: var(---twColorPrimary); --color-info: var(---twColorInfo); --color-success: var(---twColorSuccess); @@ -24,8 +22,6 @@ :root { ---twColorBackground: #ffffff; ---twColorForeground: #141414; - ---twColorContainer: #f9fafb; - ---twColorContainerHover: #e5e7eb; ---twColorPrimary: #f97316; ---twColorInfo: #478ce6; ---twColorSuccess: #59ab5c; @@ -36,8 +32,6 @@ .dark { ---twColorBackground: #17191c; ---twColorForeground: #fafaf9; - ---twColorContainer: #1e2124; - ---twColorContainerHover: #32373e; ---twColorPrimary: #ea580c; ---twColorInfo: #0969da; ---twColorSuccess: #1a7f37; diff --git a/ui/src/pages/accesses/AccessList.tsx b/ui/src/pages/accesses/AccessList.tsx index 5c1b09ee4..2e760ccb7 100644 --- a/ui/src/pages/accesses/AccessList.tsx +++ b/ui/src/pages/accesses/AccessList.tsx @@ -54,9 +54,9 @@ const AccessList = () => {
- {record.name} + {record.name || "\u00A0"} - {t(accessProvidersMap.get(record.provider)?.name ?? "")} + {t(accessProvidersMap.get(record.provider)?.name ?? "") || "\u00A0"}
diff --git a/ui/src/pages/certificates/CertificateList.tsx b/ui/src/pages/certificates/CertificateList.tsx index aebc892c6..49c0b4a3b 100644 --- a/ui/src/pages/certificates/CertificateList.tsx +++ b/ui/src/pages/certificates/CertificateList.tsx @@ -90,8 +90,8 @@ const CertificateList = () => { title: t("certificate.props.brand"), render: (_, record) => (
- {record.issuerOrg} - {record.keyAlgorithm} + {record.issuerOrg || "\u00A0"} + {record.keyAlgorithm || "\u00A0"}
), }, diff --git a/ui/src/pages/workflows/WorkflowDetail.tsx b/ui/src/pages/workflows/WorkflowDetail.tsx index 2c04581b4..531ef7e8d 100644 --- a/ui/src/pages/workflows/WorkflowDetail.tsx +++ b/ui/src/pages/workflows/WorkflowDetail.tsx @@ -199,8 +199,8 @@ const WorkflowDetail = () => {
-

{workflow.name || " "}

-

{workflow.description || " "}

+

{workflow.name || "\u00A0"}

+

{workflow.description || "\u00A0"}

{initialized @@ -238,6 +238,7 @@ const WorkflowDetail = () => {
{ ellipsis: true, render: (_, record) => (
- {record.name} + {record.name || "\u00A0"} - {record.description || " "} + {record.description || "\u00A0"}
), @@ -65,7 +65,7 @@ const WorkflowList = () => { return (
{t("workflow.props.trigger.auto")} - {record.triggerCron ?? ""} + {record.triggerCron || "\u00A0"}
); }