From 1e2a2bcbebf91be8c39cf747cddb312663923ad9 Mon Sep 17 00:00:00 2001
From: Harshit Shah <dinkushah169@gmail.com>
Date: Mon, 12 Oct 2026 21:52:23 +0530
Subject: [PATCH 1/3] fix(ui): dark-mode legacy surfaces and borders render
 light

tokens.css (imported after app.less) declares light values for the
legacy --om-* aliases on :root, which ties the .dark-mode bridge on
<html> and wins on order, so every bridged var stayed light in dark.
Scope the bridge to :root.dark-mode.

- point #dde3ea borders at the core secondary border token
- column panel: drop max-width 95% that always clipped the title;
  align Key Profile Metrics padding/divider with sibling sections
- dark accents follow the devrel palette: brand-400 for text/icons/links,
  brand-600 for the selected explore card and nav pill (20%)

Fixes open-metadata/openmetadata-collate#7317
---
 .../main/resources/ui/src/styles/globals.css  | 16 ++---
 .../ActivityFeed/FeedEditor/feed-editor.less  |  4 +-
 .../ColumnDetailPanel/ColumnDetailPanel.less  |  1 -
 .../KeyProfileMetrics.component.tsx           |  4 +-
 .../RetentionPeriod.component.tsx             |  4 +-
 .../explore-search-card.less                  |  6 ++
 .../ExploreV1/ExploreV1.component.tsx         |  4 +-
 .../src/components/Glossary/glossaryV1.less   |  2 +-
 .../src/components/Settings/Users/users.less  |  2 +-
 .../ManageButton/ManageButton.less            |  2 +-
 .../connection-step-card.less                 |  2 +-
 .../platform/ai-shell/Sidebar/sidebar.less    | 21 ++++---
 .../src/main/resources/ui/src/styles/app.less | 58 ++++++++++---------
 .../main/resources/ui/src/styles/modal.less   |  4 +-
 .../main/resources/ui/src/styles/tailwind.css |  4 +-
 .../resources/ui/src/styles/variables.less    |  2 +-
 16 files changed, 74 insertions(+), 62 deletions(-)

diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/styles/globals.css b/openmetadata-ui-core-components/src/main/resources/ui/src/styles/globals.css
index 736eb7dcc225..d189603012ef 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/styles/globals.css
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/styles/globals.css
@@ -1226,12 +1226,12 @@
     --color-text-disabled: theme(--color-gray-500);
     /* Brand text = blue-300 link tone in dark (palette guideline + Collate #6491
        --ai-link); regular text stays on the gray ramp. */
-    --color-text-brand-primary: theme(--color-brand-300);
-    --color-text-brand-secondary: theme(--color-brand-300);
+    --color-text-brand-primary: theme(--color-brand-400);
+    --color-text-brand-secondary: theme(--color-brand-400);
     --color-text-brand-tertiary: theme(--color-gray-400);
     --color-text-placeholder: theme(--color-gray-400);
     --color-text-placeholder_subtle: theme(--color-gray-700);
-    --color-text-link: theme(--color-brand-300);
+    --color-text-link: theme(--color-brand-400);
     --color-text-link-hover: theme(--color-brand-200);
     --color-text-primary_on-brand: theme(--color-gray-50);
     --color-text-secondary_on-brand: theme(--color-gray-300);
@@ -1282,10 +1282,10 @@
     --color-fg-disabled_subtle: theme(--color-gray-600);
     /* Brand foreground (icons, tab underline, active accents) = blue-300 link
        tone in dark (palette guideline + Collate #6491 --ai-link). */
-    --color-fg-brand-primary: theme(--color-brand-300);
-    --color-fg-brand-secondary: theme(--color-brand-300);
-    --color-fg-brand-primary_alt: theme(--color-brand-300);
-    --color-fg-brand-secondary_alt: theme(--color-brand-300);
+    --color-fg-brand-primary: theme(--color-brand-400);
+    --color-fg-brand-secondary: theme(--color-brand-400);
+    --color-fg-brand-primary_alt: theme(--color-brand-400);
+    --color-fg-brand-secondary_alt: theme(--color-brand-400);
     --color-fg-brand-secondary_hover: theme(--color-brand-200);
 
     /* BACKGROUND COLORS */
@@ -1350,7 +1350,7 @@
     --color-avatar-styles-bg-neutral: rgb(224 224 224 / 1);
     --color-button-destructive-primary-icon: theme(--color-error-300);
     --color-button-destructive-primary-icon_hover: theme(--color-error-200);
-    --color-button-primary-icon: theme(--color-brand-300);
+    --color-button-primary-icon: theme(--color-brand-400);
     --color-button-primary-icon_hover: theme(--color-brand-200);
     --color-featured-icon-light-fg-brand: theme(--color-brand-200);
     --color-featured-icon-light-fg-error: theme(--color-error-200);
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/FeedEditor/feed-editor.less b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/FeedEditor/feed-editor.less
index 6344c0c92835..462b36bce87c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/FeedEditor/feed-editor.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/FeedEditor/feed-editor.less
@@ -999,7 +999,7 @@
   margin: var(--om-space-6);
 }
 .ql-toolbar.ql-snow {
-  border-color: var(--om-legacy-color-dde3ea);
+  border-color: var(--tw-border-color-secondary);
   border-top-left-radius: var(--om-radius-md);
   border-top-right-radius: var(--om-radius-md);
   display: flex;
@@ -1009,7 +1009,7 @@
   width: 100%;
 }
 .ql-container.ql-snow {
-  border-color: var(--om-legacy-color-dde3ea);
+  border-color: var(--tw-border-color-secondary);
   border-bottom-left-radius: var(--om-radius-md);
   border-bottom-right-radius: var(--om-radius-md);
   width: 100%;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnDetailPanel/ColumnDetailPanel.less b/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnDetailPanel/ColumnDetailPanel.less
index 0b6bece50ec5..26e1437d7e18 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnDetailPanel/ColumnDetailPanel.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnDetailPanel/ColumnDetailPanel.less
@@ -91,7 +91,6 @@
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
-        max-width: 95%;
       }
     }
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnDetailPanel/KeyProfileMetrics/KeyProfileMetrics.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnDetailPanel/KeyProfileMetrics/KeyProfileMetrics.component.tsx
index 60ed5c5f055c..d30a840f8fe6 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnDetailPanel/KeyProfileMetrics/KeyProfileMetrics.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnDetailPanel/KeyProfileMetrics/KeyProfileMetrics.component.tsx
@@ -29,8 +29,8 @@ export const KeyProfileMetrics = ({ profile }: KeyProfileMetricsProps) => {
   );
 
   const sectionClassName =
-    'tw:border-b-[0.6px] tw:border-tertiary tw:-mt-2 tw:pb-4 tw:px-4';
-  const titleClassName = 'tw:text-sm tw:font-semibold tw:mb-1.5';
+    'tw:border-b-[0.6px] tw:border-secondary tw:pb-4 tw:px-3.5';
+  const titleClassName = 'tw:text-sm tw:font-semibold tw:mb-3';
 
   return (
     <div className={sectionClassName}>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/RetentionPeriod/RetentionPeriod.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/RetentionPeriod/RetentionPeriod.component.tsx
index af240f9f4428..f898c7fc1978 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/RetentionPeriod/RetentionPeriod.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/RetentionPeriod/RetentionPeriod.component.tsx
@@ -145,7 +145,7 @@ const RetentionPeriod = ({
             width={520}>
             <Dialog.Header
               className={classNames(
-                'tw:border-b tw:border-[var(--om-legacy-color-dde3ea)] tw:px-6 tw:py-4',
+                'tw:border-b tw:border-secondary tw:px-6 tw:py-4',
                 'tw:sm:px-6 tw:sm:pt-4 tw:*:font-medium! tw:*:leading-[22px]!',
                 'tw:*:text-black/85! tw:dark:border-subtle tw:dark:*:text-primary!'
               )}
@@ -175,7 +175,7 @@ const RetentionPeriod = ({
                   onChange={setValue}
                 />
               </Dialog.Content>
-              <Dialog.Footer className="tw:mt-0 tw:border-[var(--om-legacy-color-dde3ea)] tw:sm:mt-0 tw:dark:border-subtle tw:*:gap-[13px]! tw:*:px-[23px]! tw:*:py-4!">
+              <Dialog.Footer className="tw:mt-0 tw:border-secondary tw:sm:mt-0 tw:*:gap-[13px]! tw:*:px-[23px]! tw:*:py-4!">
                 <Button
                   className="tw:h-10 tw:rounded-lg tw:px-[15px] tw:py-0 tw:font-normal tw:text-[var(--ant-primary-color)] tw:hover:bg-transparent tw:hover:text-[var(--ant-primary-color-hover)]"
                   color="tertiary"
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreSearchCard/explore-search-card.less b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreSearchCard/explore-search-card.less
index 0f8a9796503e..07e986a141e7 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreSearchCard/explore-search-card.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreSearchCard/explore-search-card.less
@@ -193,3 +193,9 @@
   gap: var(--om-space-8);
   align-items: baseline;
 }
+
+// Dark: selected card is a 1px #1570ef edge (devrel dark palette); brand-300
+// stays for light, which is frozen.
+.dark-mode .explore-search-card.highlight-card {
+  border-color: var(--tw-color-brand-600);
+}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.component.tsx
index d91267e0ff89..670583a5c79b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.component.tsx
@@ -217,7 +217,7 @@ const ExploreExportScopeModal = ({
           onClose={onCancel}>
           <Dialog.Header
             className={classNames(
-              'tw:border-b tw:border-[var(--om-legacy-color-dde3ea)] tw:px-6 tw:py-4',
+              'tw:border-b tw:border-secondary tw:px-6 tw:py-4',
               'tw:sm:px-6 tw:sm:pt-4 tw:*:font-medium! tw:*:leading-[22px]!',
               'tw:*:text-black/85! tw:dark:border-subtle tw:dark:*:text-primary!'
             )}>
@@ -331,7 +331,7 @@ const ExploreExportScopeModal = ({
               </CoreCard>
             </RadioGroup>
           </Dialog.Content>
-          <Dialog.Footer className="tw:mt-0 tw:border-[var(--om-legacy-color-dde3ea)] tw:sm:mt-0 tw:dark:border-subtle tw:*:gap-[13px]! tw:*:px-[23px]! tw:*:py-4!">
+          <Dialog.Footer className="tw:mt-0 tw:border-secondary tw:sm:mt-0 tw:*:gap-[13px]! tw:*:px-[23px]! tw:*:py-4!">
             <Button
               className="tw:h-10 tw:rounded-lg tw:px-[15px] tw:py-0 tw:font-normal tw:text-[var(--ant-primary-color)] tw:hover:bg-transparent tw:hover:text-[var(--ant-primary-color-hover)]"
               color="tertiary"
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/glossaryV1.less b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/glossaryV1.less
index bfa1e1b6db13..18a2ad65a1e0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/glossaryV1.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/glossaryV1.less
@@ -51,7 +51,7 @@
   .ant-dropdown-menu {
     padding: var(--om-space-8) 0;
     background: var(--tw-color-bg-primary);
-    border: 1px solid var(--om-legacy-color-dde3ea);
+    border: 1px solid var(--tw-border-color-secondary);
     box-shadow: 1px 1px 3px var(--om-legacy-color-0-0-0-0-12);
     border-radius: var(--om-radius-sm);
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/users.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/users.less
index d1c0e0ab2b1b..fd2eb957b2a5 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/users.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/users.less
@@ -283,7 +283,7 @@
 
 .custom-domain-edit-select {
   .ant-select-selector {
-    border: 1px solid var(--om-legacy-color-dde3ea) !important;
+    border: 1px solid var(--tw-border-color-secondary) !important;
   }
 
   width: 339px;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/ManageButton/ManageButton.less b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/ManageButton/ManageButton.less
index 8510407cb4b3..2b37654b82fe 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/ManageButton/ManageButton.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/ManageButton/ManageButton.less
@@ -52,7 +52,7 @@
   .ant-dropdown-menu {
     padding: var(--om-space-8) 0;
     background: var(--tw-color-bg-primary);
-    border: 1px solid var(--om-legacy-color-dde3ea);
+    border: 1px solid var(--tw-border-color-secondary);
     box-shadow: 1px 1px 3px var(--om-legacy-color-0-0-0-0-12);
     border-radius: var(--om-radius-sm);
     .ant-dropdown-menu-item {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/TestConnection/ConnectionStepCard/connection-step-card.less b/openmetadata-ui/src/main/resources/ui/src/components/common/TestConnection/ConnectionStepCard/connection-step-card.less
index 8d1d01812354..97c3062db23b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/TestConnection/ConnectionStepCard/connection-step-card.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/TestConnection/ConnectionStepCard/connection-step-card.less
@@ -12,7 +12,7 @@
  */
 
 @import '../../../../styles/variables.less';
-@border-color: var(--om-legacy-color-dde3ea);
+@border-color: var(--tw-border-color-secondary);
 @awaiting-bg: var(--om-legacy-color-221-227-234-0-2);
 @success-bg: var(--om-legacy-color-40-167-69-0-059);
 @failure-bg: var(--om-legacy-color-203-36-49-0-059);
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/platform/ai-shell/Sidebar/sidebar.less b/openmetadata-ui/src/main/resources/ui/src/components/platform/ai-shell/Sidebar/sidebar.less
index 0a06101c4e97..b4aab050537a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/platform/ai-shell/Sidebar/sidebar.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/platform/ai-shell/Sidebar/sidebar.less
@@ -109,19 +109,22 @@
 
 // Dark-only overrides that match the design recording exactly. Light leaves both
 // unset, falling back to the frozen light values (gray-blue-100 pill, brand-800 fg).
-//  - selected surface -> interactive-selected (brand-500 @16%), a blue-tinted pill;
-//    a solid gray-blue-900 was invisible against the gray-blue-950 panel.
-//  - selected label/icon -> brand-300 (#84caff); the utility-brand-800 scale lands
-//    on brand-200 in dark, one step too pale versus the recording.
+//  - selected surface -> brand-600 (#1570ef) @20%, a blue-tinted pill (devrel
+//    dark palette); a solid gray-blue-900 was invisible against the panel.
+//  - selected label/icon -> brand-400 (#53b1fd); the utility-brand-800 scale lands
+//    on brand-200 in dark, one step too pale.
 //  - rest nav/list icons -> gray-600; quaternary (gray-400) is a step too bright.
-//  - hover fill -> gray-700; nav-item hover reads a step up from the gray-800 nav
-//    backing, matching the PageShell (PR #33581) hover token.
+//  - hover fill -> white @6% (secondary_hover), per the devrel dark palette.
 //  - border/divider -> gray-700; the PageShell nav/card edges sit on gray-700.
 .dark-mode {
-  --ask-selected-surface: var(--color-bg-brand-primary);
-  --ask-selected-fg: var(--color-brand-300);
+  --ask-selected-surface: color-mix(
+    in srgb,
+    var(--tw-color-brand-600) 20%,
+    transparent
+  );
+  --ask-selected-fg: var(--tw-color-brand-400);
   --ask-rest-icon: var(--color-gray-600);
-  --ask-hover: var(--om-color-gray-700);
+  --ask-hover: var(--tw-background-color-secondary_hover);
   --ask-border: var(--om-color-gray-700);
 }
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/app.less b/openmetadata-ui/src/main/resources/ui/src/styles/app.less
index b1cb7ab57822..b60f06dae839 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/app.less
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/app.less
@@ -827,7 +827,10 @@ a[href].link-text-grey,
 // .dark-mode, so referencing them here yields the dark value. Categorical ramps
 // (severity, heatmap gradients) are intentionally excluded — they belong to the
 // token foundation.
-.dark-mode {
+// `:root.dark-mode` (not `.dark-mode`): tokens.css declares the light values on
+// `:root` at equal specificity and is imported after this file, so a bare
+// `.dark-mode` lost and every bridged var stayed light in dark mode.
+:root.dark-mode {
   // Neutral surfaces / borders / muted text
   --om-grey-26: var(--color-bg-secondary_subtle);
   --om-grey-25: var(--color-bg-secondary_subtle);
@@ -873,40 +876,41 @@ a[href].link-text-grey,
   --om-warning-400: var(--tw-color-utility-warning-400);
 }
 
-// AI dark-mode brand ACCENTS -> blue-300 (#84caff).
+// AI dark-mode brand ACCENTS -> blue-400 (#53b1fd), the devrel dark palette:
+// #1570ef carries fills/borders, #53b1fd labels/icons/links (~5.4:1 on dark).
 // UntitledUIThemeProvider + AntDConfigProvider inject the configured brand
 // primary (#1570ef) as theme-agnostic inline custom properties on <html> — the
 // same element that carries `.dark-mode` — so the token layer's dark flip can't
 // override them (inline wins on that element). Re-point the brand *accent* vars
-// (text / fg / icon / border / outline / ring) to brand-300 on `body`, a
+// (text / fg / icon / border / outline / ring) to brand-400 on `body`, a
 // descendant of <html>, which wins over the html-inline value for the whole app
 // subtree (incl. antd portals). Solid-fill vars (*-solid, bg-brand-*, the raw
 // ramp) are intentionally left so buttons/badges keep the brand-600 fill. Light
 // is untouched, so a white-label custom brand still tints accents in light.
 .dark-mode body {
-  --tw-color-text-brand-secondary: var(--om-color-brand-300);
-  --tw-text-color-brand-secondary: var(--om-color-brand-300);
-  --tw-color-text-brand-tertiary: var(--om-color-brand-300);
-  --tw-text-color-brand-tertiary: var(--om-color-brand-300);
-  --tw-color-text-brand-tertiary_alt: var(--om-color-brand-300);
-  --tw-text-color-brand-tertiary_alt: var(--om-color-brand-300);
-  --tw-color-fg-brand-primary: var(--om-color-brand-300);
-  --tw-color-fg-brand-primary_alt: var(--om-color-brand-300);
-  --tw-color-fg-brand-secondary: var(--om-color-brand-300);
-  --tw-color-fg-brand-secondary_alt: var(--om-color-brand-300);
-  --tw-color-fg-brand-secondary_hover: var(--om-color-brand-300);
-  --tw-color-icon-fg-brand: var(--om-color-brand-300);
-  --tw-color-featured-icon-light-fg-brand: var(--om-color-brand-300);
-  --tw-color-border-brand: var(--om-color-brand-300);
-  --tw-color-border-brand_alt: var(--om-color-brand-300);
-  --tw-border-color-brand: var(--om-color-brand-300);
-  --tw-border-color-brand_alt: var(--om-color-brand-300);
-  --tw-background-color-border-brand: var(--om-color-brand-300);
-  --tw-background-color-border-brand_alt: var(--om-color-brand-300);
-  --tw-outline-color-brand: var(--om-color-brand-300);
-  --tw-outline-color-brand_alt: var(--om-color-brand-300);
-  --tw-ring-color-brand: var(--om-color-brand-300);
-  --tw-ring-color-brand_alt: var(--om-color-brand-300);
+  --tw-color-text-brand-secondary: var(--tw-color-brand-400);
+  --tw-text-color-brand-secondary: var(--tw-color-brand-400);
+  --tw-color-text-brand-tertiary: var(--tw-color-brand-400);
+  --tw-text-color-brand-tertiary: var(--tw-color-brand-400);
+  --tw-color-text-brand-tertiary_alt: var(--tw-color-brand-400);
+  --tw-text-color-brand-tertiary_alt: var(--tw-color-brand-400);
+  --tw-color-fg-brand-primary: var(--tw-color-brand-400);
+  --tw-color-fg-brand-primary_alt: var(--tw-color-brand-400);
+  --tw-color-fg-brand-secondary: var(--tw-color-brand-400);
+  --tw-color-fg-brand-secondary_alt: var(--tw-color-brand-400);
+  --tw-color-fg-brand-secondary_hover: var(--tw-color-brand-400);
+  --tw-color-icon-fg-brand: var(--tw-color-brand-400);
+  --tw-color-featured-icon-light-fg-brand: var(--tw-color-brand-400);
+  --tw-color-border-brand: var(--tw-color-brand-400);
+  --tw-color-border-brand_alt: var(--tw-color-brand-400);
+  --tw-border-color-brand: var(--tw-color-brand-400);
+  --tw-border-color-brand_alt: var(--tw-color-brand-400);
+  --tw-background-color-border-brand: var(--tw-color-brand-400);
+  --tw-background-color-border-brand_alt: var(--tw-color-brand-400);
+  --tw-outline-color-brand: var(--tw-color-brand-400);
+  --tw-outline-color-brand_alt: var(--tw-color-brand-400);
+  --tw-ring-color-brand: var(--tw-color-brand-400);
+  --tw-ring-color-brand_alt: var(--tw-color-brand-400);
   // Status text: the configured error / warning / success colours are injected
   // the same way, as light -600 shades, and stayed below AA on dark surfaces.
   // Text only; the solid fills keep the configured colour.
@@ -954,7 +958,7 @@ a[href].link-text-grey,
 // Carousel active dot draws with --ant-primary-color (#1570ef) via a `!important`
 // rule in temp.css; match !important to win and re-tint in dark.
 .dark-mode .slick-dots li.slick-active button:before {
-  color: var(--om-color-brand-300) !important;
+  color: var(--tw-color-brand-400) !important;
 }
 
 // Dark-mode canvas chrome for every reactflow surface (lineage, workflow,
diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/modal.less b/openmetadata-ui/src/main/resources/ui/src/styles/modal.less
index 2229317af3dc..7119eb8e9386 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/modal.less
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/modal.less
@@ -21,12 +21,12 @@
 .ant-modal-header {
   border-top-left-radius: var(--om-radius-md);
   border-top-right-radius: var(--om-radius-md);
-  border-bottom: 1px solid var(--om-legacy-color-dde3ea);
+  border-bottom: 1px solid var(--tw-border-color-secondary);
 }
 
 .ant-modal-footer {
   padding: var(--om-space-16) var(--om-space-23);
-  border-top: 1px solid var(--om-legacy-color-dde3ea);
+  border-top: 1px solid var(--tw-border-color-secondary);
 }
 
 // The legacy #dde3ea edge is a bright line on the dark overlay surface.
diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/tailwind.css b/openmetadata-ui/src/main/resources/ui/src/styles/tailwind.css
index d3b17b55f63a..341d2d3b330d 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/tailwind.css
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/tailwind.css
@@ -74,10 +74,10 @@ a {
 :where(.dark-mode) .tw\:text-brand-600,
 :where(.dark-mode) .tw\:text-brand-700,
 :where(.dark-mode) .tw\:text-blue-700 {
-  color: var(--om-color-brand-300);
+  color: var(--tw-color-brand-400);
 }
 
-/* Dark: brand-tint surfaces darken so the flipped brand-300 text stays readable
+/* Dark: brand-tint surfaces darken so the flipped brand-400 text stays readable
  * on them. Dark-scoped, so the utility token (which flips to brand-950/900 under
  * .dark-mode) is safe to reference directly here. */
 :where(.dark-mode) .tw\:bg-brand-50 {
diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/variables.less b/openmetadata-ui/src/main/resources/ui/src/styles/variables.less
index 221672a6e997..fc47ac22cb01 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/variables.less
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/variables.less
@@ -254,7 +254,7 @@
 @border-color-2: @grey-300;
 @border-color-3: #d4d4d8;
 @border-color-4: #e4e4e7;
-@border-color-5: #dde3ea;
+@border-color-5: var(--tw-border-color-secondary);
 @border-color-6: #dfdfdf;
 @border-color-7: #faf9fc;
 @border-color-8: #e9e8eb;

From 7bc3d67fafb9ec8c8f95b8cbf7a26d6119658b99 Mon Sep 17 00:00:00 2001
From: Harshit Shah <dinkushah169@gmail.com>
Date: Mon, 12 Oct 2026 21:54:59 +0530
Subject: [PATCH 2/3] revert(ui): drop antd-only border swaps from dark-mode
 fix

Antd is being removed and classic mode won't support dark, so keep the
fix to non-antd surfaces.
---
 .../main/resources/ui/src/components/Glossary/glossaryV1.less | 2 +-
 .../resources/ui/src/components/Settings/Users/users.less     | 2 +-
 .../common/EntityPageInfos/ManageButton/ManageButton.less     | 2 +-
 openmetadata-ui/src/main/resources/ui/src/styles/modal.less   | 4 ++--
 .../src/main/resources/ui/src/styles/variables.less           | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/glossaryV1.less b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/glossaryV1.less
index 18a2ad65a1e0..bfa1e1b6db13 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/glossaryV1.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/glossaryV1.less
@@ -51,7 +51,7 @@
   .ant-dropdown-menu {
     padding: var(--om-space-8) 0;
     background: var(--tw-color-bg-primary);
-    border: 1px solid var(--tw-border-color-secondary);
+    border: 1px solid var(--om-legacy-color-dde3ea);
     box-shadow: 1px 1px 3px var(--om-legacy-color-0-0-0-0-12);
     border-radius: var(--om-radius-sm);
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/users.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/users.less
index fd2eb957b2a5..d1c0e0ab2b1b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/users.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/users.less
@@ -283,7 +283,7 @@
 
 .custom-domain-edit-select {
   .ant-select-selector {
-    border: 1px solid var(--tw-border-color-secondary) !important;
+    border: 1px solid var(--om-legacy-color-dde3ea) !important;
   }
 
   width: 339px;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/ManageButton/ManageButton.less b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/ManageButton/ManageButton.less
index 2b37654b82fe..8510407cb4b3 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/ManageButton/ManageButton.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/ManageButton/ManageButton.less
@@ -52,7 +52,7 @@
   .ant-dropdown-menu {
     padding: var(--om-space-8) 0;
     background: var(--tw-color-bg-primary);
-    border: 1px solid var(--tw-border-color-secondary);
+    border: 1px solid var(--om-legacy-color-dde3ea);
     box-shadow: 1px 1px 3px var(--om-legacy-color-0-0-0-0-12);
     border-radius: var(--om-radius-sm);
     .ant-dropdown-menu-item {
diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/modal.less b/openmetadata-ui/src/main/resources/ui/src/styles/modal.less
index 7119eb8e9386..2229317af3dc 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/modal.less
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/modal.less
@@ -21,12 +21,12 @@
 .ant-modal-header {
   border-top-left-radius: var(--om-radius-md);
   border-top-right-radius: var(--om-radius-md);
-  border-bottom: 1px solid var(--tw-border-color-secondary);
+  border-bottom: 1px solid var(--om-legacy-color-dde3ea);
 }
 
 .ant-modal-footer {
   padding: var(--om-space-16) var(--om-space-23);
-  border-top: 1px solid var(--tw-border-color-secondary);
+  border-top: 1px solid var(--om-legacy-color-dde3ea);
 }
 
 // The legacy #dde3ea edge is a bright line on the dark overlay surface.
diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/variables.less b/openmetadata-ui/src/main/resources/ui/src/styles/variables.less
index fc47ac22cb01..221672a6e997 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/variables.less
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/variables.less
@@ -254,7 +254,7 @@
 @border-color-2: @grey-300;
 @border-color-3: #d4d4d8;
 @border-color-4: #e4e4e7;
-@border-color-5: var(--tw-border-color-secondary);
+@border-color-5: #dde3ea;
 @border-color-6: #dfdfdf;
 @border-color-7: #faf9fc;
 @border-color-8: #e9e8eb;

From 90661675898051070f424c814838e531f8175f17 Mon Sep 17 00:00:00 2001
From: Harshit Shah <dinkushah169@gmail.com>
Date: Mon, 12 Oct 2026 22:07:16 +0530
Subject: [PATCH 3/3] docs: record that dark mode targets AI mode and core
 surfaces only

Classic mode gets no dark theme and antd-only surfaces are not themed
for dark; add the decision record and point the styling rule at it.
---
 .claude/rules/frontend-styling.md             |  3 ++
 ...mode-targets-ai-mode-core-surfaces-only.md | 31 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 docs/decisions/2026-10-12-dark-mode-targets-ai-mode-core-surfaces-only.md

diff --git a/.claude/rules/frontend-styling.md b/.claude/rules/frontend-styling.md
index a66aaf1bf15f..f48069a35e88 100644
--- a/.claude/rules/frontend-styling.md
+++ b/.claude/rules/frontend-styling.md
@@ -57,6 +57,9 @@ Light mode is frozen: reach dark with tokens that adapt, never by changing light
 [`docs/colors.md`](../../openmetadata-ui/src/main/resources/ui/docs/colors.md); dark values live under
 `.dark-mode` in `globals.css`.
 
+- **Scope:** dark mode is AI mode on core/Tailwind surfaces only. Classic mode gets no dark theme
+  and antd-only surfaces (`.ant-*`) are not themed for dark — migrate them to core instead
+  (ADR:2026-10-12-dark-mode-targets-ai-mode-core-surfaces-only).
 - **Surfaces:** page → `tw:bg-page`; card/panel → core `<Card>` or `tw:bg-surface`; popover, dropdown,
   select, modal, drawer → `tw:bg-overlay-surface`. `tw:bg-primary` is the page colour in dark
   (invisible card); `Box` is layout only — give it no background. Wrappers/grid frames stay transparent
diff --git a/docs/decisions/2026-10-12-dark-mode-targets-ai-mode-core-surfaces-only.md b/docs/decisions/2026-10-12-dark-mode-targets-ai-mode-core-surfaces-only.md
new file mode 100644
index 000000000000..1fe23199cab9
--- /dev/null
+++ b/docs/decisions/2026-10-12-dark-mode-targets-ai-mode-core-surfaces-only.md
@@ -0,0 +1,31 @@
+# Dark mode targets AI mode and core/Tailwind surfaces only
+
+- **Status:** Accepted
+- **Revisions:** v1 2026-10-12 (initial)
+- **Deciders:** Harshit Shah
+- **Guard:** reviewer
+- **Related:** ADR:2026-10-11-migrated-antd-components-adopt-core-styling, open-metadata/openmetadata-collate#7317, open-metadata/OpenMetadata#35271
+
+## Context
+Dark-mode sweeps keep finding light edges and fills on antd components (`.ant-modal-header`,
+`.ant-dropdown-menu`, `.ant-select-selector`, `.ant-collapse-item`) and on classic-mode chrome
+such as the classic navbar search. Antd is being removed from the codebase component by component,
+and classic (non-AI) mode is not going to ship a dark theme. Dark-mode work spent on either is
+deleted by the migration that follows it.
+
+## Decision
+Classic (non-AI) mode does not support dark mode, and antd-only surfaces are not themed for dark.
+Dark-mode fixes target AI mode, rendered through `@openmetadata/ui-core-components` and Tailwind
+(`tw:`) surfaces, plus non-antd legacy markup that AI mode renders.
+
+- Do not add `.dark-mode` overrides, dark token swaps or `tw:dark:*` variants whose only effect is
+  on an `.ant-*` selector or an antd component.
+- Do not fix classic-only chrome for dark mode.
+- A shared legacy LESS variable (for example `@grey-15`) may be bridged for dark when non-antd
+  surfaces in AI mode use it, even though antd consumers pick the change up too.
+- An antd surface that looks wrong in dark is fixed by migrating it to its core equivalent.
+
+## Consequences
+Antd screens and classic mode can look unfinished in dark until they migrate; that is accepted.
+Dark-mode PRs stay small and their fixes survive the antd removal. Revisit if classic mode is
+kept and given a dark theme, or if the antd removal stops before the remaining surfaces are migrated.