Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

style(*): use `!` to increase the priority of dark mode classes (#5209)

白熱bc85cd7a2f55
diff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/dark-mode-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/dark-mode-ci-chromium-linux.png
index 2114ff10bd..ce7337ca80 100644
Binary files a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/dark-mode-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/dark-mode-ci-chromium-linux.png differ
diff --git a/packages-experimental/uni-formula-ui/src/views/components/DocFormulaPopup.tsx b/packages-experimental/uni-formula-ui/src/views/components/DocFormulaPopup.tsx
index 9b6d1e5e8c..eb79f6e491 100644
--- a/packages-experimental/uni-formula-ui/src/views/components/DocFormulaPopup.tsx
+++ b/packages-experimental/uni-formula-ui/src/views/components/DocFormulaPopup.tsx
@@ -136,7 +136,7 @@ function DocFormula(props: { popupInfo: IUniFormulaPopupInfo }) {
univer-box-border univer-flex univer-h-12 univer-w-[482px] univer-items-center univer-gap-x-2
univer-overflow-hidden univer-rounded-lg u univer-border-gray-200 univer-bg-white univer-p-2
univer-shadow-lg
- dark:univer-bg-gray-900
+ dark:!univer-bg-gray-900
`, borderClassName)}
onMouseEnter={() => onHovered(true)}
onMouseLeave={() => onHovered(false)}
diff --git a/packages-experimental/uniui/src/views/uni-controls/UniControls.tsx b/packages-experimental/uniui/src/views/uni-controls/UniControls.tsx
index 516098446a..48c5d1aa25 100644
--- a/packages-experimental/uniui/src/views/uni-controls/UniControls.tsx
+++ b/packages-experimental/uniui/src/views/uni-controls/UniControls.tsx
@@ -151,7 +151,7 @@ export const UniControls = ({ zoom, onItemClick }: { zoom: number; onItemClick?:
`
univer-relative univer-box-border univer-cursor-pointer univer-py-1 univer-pl-9
univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`,
`
univer-rounded univer-no-underline univer-transition-colors univer-duration-200
diff --git a/packages-experimental/uniui/src/views/uni-toolbar/UniFloatToolbar.tsx b/packages-experimental/uniui/src/views/uni-toolbar/UniFloatToolbar.tsx
index 10ed2a0ce0..16a1ad79f5 100644
--- a/packages-experimental/uniui/src/views/uni-toolbar/UniFloatToolbar.tsx
+++ b/packages-experimental/uniui/src/views/uni-toolbar/UniFloatToolbar.tsx
@@ -88,7 +88,7 @@ export const UniFloatingToolbar = React.forwardRef<IFloatingToolbarRef, { node:
className={`
univer-flex univer-items-center univer-gap-2 univer-rounded-md univer-bg-white univer-text-sm
univer-text-primary-600
- dark:univer-bg-gray-900
+ dark:!univer-bg-gray-900
`}
ref={setFloating}
style={{ position: strategy, top: y ?? 0, left: x ?? 0 }}
@@ -123,7 +123,7 @@ export function UnitName({ unitId }: { unitId: string }) {
className={`
univer-flex univer-h-6 univer-items-center univer-gap-1 univer-rounded-md univer-bg-white univer-px-1
univer-py-0 univer-text-sm univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
>
{name}
diff --git a/packages-experimental/uniui/src/views/uni-toolbar/UniFormulaBar.tsx b/packages-experimental/uniui/src/views/uni-toolbar/UniFormulaBar.tsx
index e1f58c499f..a03cbc6048 100644
--- a/packages-experimental/uniui/src/views/uni-toolbar/UniFormulaBar.tsx
+++ b/packages-experimental/uniui/src/views/uni-toolbar/UniFormulaBar.tsx
@@ -81,7 +81,7 @@ export const UniFormulaBar = () => {
<div
className={clsx(`
univer-absolute univer-left-0 univer-top-0 univer-z-10 univer-h-full univer-w-full univer-bg-white
- dark:univer-bg-dark
+ dark:!univer-bg-dark
`, {
'univer-hidden': !visible,
})}
diff --git a/packages-experimental/uniui/src/views/workbench/UniWorkbench.tsx b/packages-experimental/uniui/src/views/workbench/UniWorkbench.tsx
index 5f462d769e..30c34600ca 100644
--- a/packages-experimental/uniui/src/views/workbench/UniWorkbench.tsx
+++ b/packages-experimental/uniui/src/views/workbench/UniWorkbench.tsx
@@ -321,8 +321,7 @@ function UnitNode({ data }: IUnitNodeProps) {
<div
className={`
- univer-absolute -univer-top-6 univer-left-0 univer-text-sm univer-text-gray-600
- dark:univer-text-gray-200
+ univer-absolute -univer-top-6 univer-left-0 univer-text-sm univer-text-gray-600 !univer-text-gray-200
`}
>
{title}
diff --git a/packages/design/src/components/accordion/Accordion.tsx b/packages/design/src/components/accordion/Accordion.tsx
index fb3580e0ff..961ec9e1d3 100644
--- a/packages/design/src/components/accordion/Accordion.tsx
+++ b/packages/design/src/components/accordion/Accordion.tsx
@@ -42,7 +42,7 @@ export function Accordion(props: IAccordionProps) {
data-u-comp="accordion"
className={clsx(`
univer-divide-x-0 univer-divide-y univer-divide-solid univer-divide-gray-200
- dark:univer-divide-gray-600
+ dark:!univer-divide-gray-600
`, className)}
>
{items.map((item, index) => (
@@ -52,7 +52,7 @@ export function Accordion(props: IAccordionProps) {
univer-box-border univer-flex univer-w-full univer-cursor-pointer univer-items-center
univer-gap-1.5 univer-border-none univer-bg-transparent univer-p-4 univer-text-left
univer-text-gray-700
- dark:univer-text-gray-200 dark:hover:univer-text-white
+ dark:!univer-text-gray-200 dark:hover:!univer-text-white
focus:univer-outline-none
hover:univer-text-gray-900
`}
diff --git a/packages/design/src/components/badge/Badge.tsx b/packages/design/src/components/badge/Badge.tsx
index f6b900d6e6..5ec5fc8eb1 100644
--- a/packages/design/src/components/badge/Badge.tsx
+++ b/packages/design/src/components/badge/Badge.tsx
@@ -36,7 +36,7 @@ export function Badge(props: IBadgeProps) {
univer-box-border univer-inline-flex univer-items-center univer-gap-1 univer-truncate
univer-rounded-md univer-border univer-border-solid univer-border-gray-100 univer-bg-gray-100
univer-px-2.5 univer-py-0.5 univer-text-xs univer-font-medium univer-text-gray-900
- dark:univer-border-gray-500 dark:univer-bg-gray-700 dark:univer-text-gray-300
+ dark:!univer-border-gray-500 dark:!univer-bg-gray-700 dark:!univer-text-gray-300
`,
className
)}
diff --git a/packages/design/src/components/button/Button.tsx b/packages/design/src/components/button/Button.tsx
index c8173e5d78..1725a3d537 100644
--- a/packages/design/src/components/button/Button.tsx
+++ b/packages/design/src/components/button/Button.tsx
@@ -35,8 +35,8 @@ export const buttonVariants = cva(
default: `
univer-border-gray-200 univer-bg-white univer-text-gray-700
active:univer-bg-gray-200
- dark:univer-border-gray-600 dark:univer-bg-gray-700 dark:univer-text-white
- dark:hover:univer-bg-gray-600 dark:active:univer-bg-gray-700
+ dark:!univer-border-gray-600 dark:!univer-bg-gray-700 dark:!univer-text-white
+ dark:hover:!univer-bg-gray-600 dark:active:!univer-bg-gray-700
hover:univer-bg-gray-100
`,
primary: `
@@ -52,7 +52,7 @@ export const buttonVariants = cva(
text: `
univer-border-transparent univer-bg-transparent univer-text-gray-900
active:univer-bg-gray-200
- dark:univer-text-white dark:hover:univer-bg-gray-700 dark:active:univer-bg-gray-600
+ dark:!univer-text-white dark:hover:!univer-bg-gray-700 dark:active:!univer-bg-gray-600
hover:univer-bg-gray-100
`,
link: `
diff --git a/packages/design/src/components/cascader-list/CascaderList.tsx b/packages/design/src/components/cascader-list/CascaderList.tsx
index f16a38fa64..2e658f97bc 100644
--- a/packages/design/src/components/cascader-list/CascaderList.tsx
+++ b/packages/design/src/components/cascader-list/CascaderList.tsx
@@ -60,7 +60,7 @@ function Empty({ emptyText }: { emptyText?: string }) {
<section
className={`
univer-h-8 univer-px-2 univer-pr-32 univer-text-sm/8 univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{emptyText}
@@ -113,7 +113,7 @@ export function CascaderList(props: ICascaderListProps) {
univer-py-2 univer-text-gray-900
[&>ul:not(:last-child)]:univer-border-0 [&>ul:not(:last-child)]:univer-border-r
[&>ul:not(:last-child)]:univer-border-solid [&>ul:not(:last-child)]:univer-border-r-gray-200
- dark:univer-text-white
+ dark:!univer-text-white
`, borderClassName, scrollbarClassName, wrapperClassName)}
>
{activeOptions.map((options, index) =>
@@ -135,7 +135,7 @@ export function CascaderList(props: ICascaderListProps) {
`, {
'univer-px-7': index > 0,
'univer-px-1.5': index === 0,
- 'univer-bg-gray-200 dark:univer-bg-gray-600': option.value === value[index],
+ 'univer-bg-gray-200 dark:!univer-bg-gray-600': option.value === value[index],
})}
onClick={() => handleChange(index, option.value)}
>
diff --git a/packages/design/src/components/checkbox/Checkbox.tsx b/packages/design/src/components/checkbox/Checkbox.tsx
index 8df0e460e8..dc5904aed6 100644
--- a/packages/design/src/components/checkbox/Checkbox.tsx
+++ b/packages/design/src/components/checkbox/Checkbox.tsx
@@ -89,7 +89,7 @@ export function Checkbox(props: ICheckboxProps) {
<label
data-u-comp="checkbox"
className={clsx('univer-box-border univer-inline-flex univer-items-center univer-gap-2 univer-text-sm', {
- 'univer-cursor-pointer univer-text-gray-900 dark:univer-text-white': !disabled,
+ 'univer-cursor-pointer univer-text-gray-900 dark:!univer-text-white': !disabled,
'univer-text-gray-400': disabled,
}, className)}
style={style}
@@ -108,7 +108,7 @@ export function Checkbox(props: ICheckboxProps) {
univer-relative univer-box-border univer-flex univer-size-4 univer-items-center
univer-justify-center univer-overflow-hidden univer-rounded univer-border univer-border-solid
univer-border-gray-300 univer-bg-gray-50 univer-transition-colors
- dark:univer-border-gray-500 dark:univer-bg-gray-600
+ dark:!univer-border-gray-500 dark:!univer-bg-gray-600
`, {
'univer-opacity-50': disabled,
'univer-border-primary-600 univer-bg-primary-600': checked || indeterminate,
diff --git a/packages/design/src/components/color-picker/ColorInput.tsx b/packages/design/src/components/color-picker/ColorInput.tsx
index 5ae439aff0..218c609bce 100644
--- a/packages/design/src/components/color-picker/ColorInput.tsx
+++ b/packages/design/src/components/color-picker/ColorInput.tsx
@@ -336,7 +336,7 @@ export function ColorInput({ hsv, alpha, showAlpha, onChangeColor, onChangeAlpha
[&_input]:univer-rounded [&_input]:univer-border [&_input]:univer-border-solid
[&_input]:univer-border-gray-200 [&_input]:univer-bg-transparent [&_input]:univer-px-1.5
[&_input]:univer-text-sm [&_input]:univer-text-gray-700 [&_input]:univer-outline-none
- dark:[&_input]:univer-border-gray-600 dark:[&_input]:univer-text-white
+ dark:![&_input]:univer-border-gray-600 dark:![&_input]:univer-text-white
`}
>
<Dropdown
@@ -346,7 +346,7 @@ export function ColorInput({ hsv, alpha, showAlpha, onChangeColor, onChangeAlpha
className={`
univer-grid univer-w-32
[&>a]:univer-cursor-pointer [&>a]:univer-px-2 [&>a]:univer-py-1 [&>a]:univer-text-sm
- dark:univer-text-white
+ dark:!univer-text-white
focus-visible:univer-outline-none
`}
>
@@ -363,7 +363,7 @@ export function ColorInput({ hsv, alpha, showAlpha, onChangeColor, onChangeAlpha
univer-box-border univer-flex univer-h-8 univer-w-32 univer-cursor-pointer univer-items-center
univer-justify-between univer-gap-1 univer-rounded univer-border univer-border-solid
univer-border-gray-200 univer-px-1.5 univer-text-sm univer-text-gray-700
- dark:univer-border-gray-600 dark:univer-text-white
+ dark:!univer-border-gray-600 dark:!univer-text-white
`}
>
<span>{format.toUpperCase()}</span>
diff --git a/packages/design/src/components/color-picker/ColorPicker.tsx b/packages/design/src/components/color-picker/ColorPicker.tsx
index f2f86b58a0..dc642f92e6 100644
--- a/packages/design/src/components/color-picker/ColorPicker.tsx
+++ b/packages/design/src/components/color-picker/ColorPicker.tsx
@@ -85,7 +85,7 @@ export function ColorPicker({ format = 'hex', value = '#000000', showAlpha = fal
<div
className={`
univer-w-[292px] univer-cursor-default univer-space-y-4 univer-rounded-lg univer-bg-white
- dark:univer-bg-gray-700
+ dark:!univer-bg-gray-700
`}
onClick={(e) => e.stopPropagation()}
>
diff --git a/packages/design/src/components/color-picker/ColorPresets.tsx b/packages/design/src/components/color-picker/ColorPresets.tsx
index dc9e20f8ca..16b592e1ce 100644
--- a/packages/design/src/components/color-picker/ColorPresets.tsx
+++ b/packages/design/src/components/color-picker/ColorPresets.tsx
@@ -48,7 +48,7 @@ export function ColorPresets({ hsv, onChange }: IColorPresetsProps) {
univer-border univer-border-solid univer-border-transparent univer-bg-gray-300
univer-transition-shadow
`, {
- 'univer-ring-2 univer-ring-offset-2 univer-ring-offset-white dark:univer-ring-primary-600 dark:univer-ring-offset-gray-600': color.toUpperCase() === currentColor.toUpperCase(),
+ 'univer-ring-2 univer-ring-offset-2 univer-ring-offset-white dark:!univer-ring-primary-600 dark:!univer-ring-offset-gray-600': color.toUpperCase() === currentColor.toUpperCase(),
'!univer-border-gray-200': i === 0 && j === 0,
})}
style={{ backgroundColor: color }}
diff --git a/packages/design/src/components/color-picker/__tests__/__snapshots__/index.spec.tsx.snap b/packages/design/src/components/color-picker/__tests__/__snapshots__/index.spec.tsx.snap
index 5debbb9f64..466c2ffa2d 100644
--- a/packages/design/src/components/color-picker/__tests__/__snapshots__/index.spec.tsx.snap
+++ b/packages/design/src/components/color-picker/__tests__/__snapshots__/index.spec.tsx.snap
@@ -5,7 +5,7 @@ exports[`ColorPicker > should render correctly 1`] = `
<div
class="
univer-w-[292px] univer-cursor-default univer-space-y-4 univer-rounded-lg univer-bg-white
- dark:univer-bg-gray-700
+ dark:!univer-bg-gray-700
"
>
<div
@@ -48,7 +48,7 @@ exports[`ColorPicker > should render correctly 1`] = `
[&_input]:univer-rounded [&_input]:univer-border [&_input]:univer-border-solid
[&_input]:univer-border-gray-200 [&_input]:univer-bg-transparent [&_input]:univer-px-1.5
[&_input]:univer-text-sm [&_input]:univer-text-gray-700 [&_input]:univer-outline-none
- dark:[&_input]:univer-border-gray-600 dark:[&_input]:univer-text-white
+ dark:![&_input]:univer-border-gray-600 dark:![&_input]:univer-text-white
"
>
<a
@@ -59,7 +59,7 @@ exports[`ColorPicker > should render correctly 1`] = `
univer-box-border univer-flex univer-h-8 univer-w-32 univer-cursor-pointer univer-items-center
univer-justify-between univer-gap-1 univer-rounded univer-border univer-border-solid
univer-border-gray-200 univer-px-1.5 univer-text-sm univer-text-gray-700
- dark:univer-border-gray-600 dark:univer-text-white
+ dark:!univer-border-gray-600 dark:!univer-text-white
"
data-slot="popover-trigger"
data-state="closed"
@@ -308,7 +308,7 @@ exports[`ColorPicker > should render correctly 1`] = `
class="univer-grid univer-grid-flow-col univer-items-center univer-justify-between univer-gap-2"
>
<button
- class="univer-box-border univer-h-5 univer-w-5 univer-cursor-pointer univer-rounded-full univer-border univer-border-solid univer-border-transparent univer-bg-gray-300 univer-transition-shadow univer-ring-2 univer-ring-offset-2 univer-ring-offset-white dark:univer-ring-primary-600 dark:univer-ring-offset-gray-600"
+ class="univer-box-border univer-h-5 univer-w-5 univer-cursor-pointer univer-rounded-full univer-border univer-border-solid univer-border-transparent univer-bg-gray-300 univer-transition-shadow univer-ring-2 univer-ring-offset-2 univer-ring-offset-white dark:!univer-ring-primary-600 dark:!univer-ring-offset-gray-600"
style="background-color: #000000;"
type="button"
/>
@@ -363,7 +363,7 @@ exports[`ColorPicker > should render with showAlpha 1`] = `
<div
class="
univer-w-[292px] univer-cursor-default univer-space-y-4 univer-rounded-lg univer-bg-white
- dark:univer-bg-gray-700
+ dark:!univer-bg-gray-700
"
>
<div
@@ -428,7 +428,7 @@ exports[`ColorPicker > should render with showAlpha 1`] = `
[&_input]:univer-rounded [&_input]:univer-border [&_input]:univer-border-solid
[&_input]:univer-border-gray-200 [&_input]:univer-bg-transparent [&_input]:univer-px-1.5
[&_input]:univer-text-sm [&_input]:univer-text-gray-700 [&_input]:univer-outline-none
- dark:[&_input]:univer-border-gray-600 dark:[&_input]:univer-text-white
+ dark:![&_input]:univer-border-gray-600 dark:![&_input]:univer-text-white
"
>
<a
@@ -439,7 +439,7 @@ exports[`ColorPicker > should render with showAlpha 1`] = `
univer-box-border univer-flex univer-h-8 univer-w-32 univer-cursor-pointer univer-items-center
univer-justify-between univer-gap-1 univer-rounded univer-border univer-border-solid
univer-border-gray-200 univer-px-1.5 univer-text-sm univer-text-gray-700
- dark:univer-border-gray-600 dark:univer-text-white
+ dark:!univer-border-gray-600 dark:!univer-text-white
"
data-slot="popover-trigger"
data-state="closed"
@@ -707,7 +707,7 @@ exports[`ColorPicker > should render with showAlpha 1`] = `
class="univer-grid univer-grid-flow-col univer-items-center univer-justify-between univer-gap-2"
>
<button
- class="univer-box-border univer-h-5 univer-w-5 univer-cursor-pointer univer-rounded-full univer-border univer-border-solid univer-border-transparent univer-bg-gray-300 univer-transition-shadow univer-ring-2 univer-ring-offset-2 univer-ring-offset-white dark:univer-ring-primary-600 dark:univer-ring-offset-gray-600"
+ class="univer-box-border univer-h-5 univer-w-5 univer-cursor-pointer univer-rounded-full univer-border univer-border-solid univer-border-transparent univer-bg-gray-300 univer-transition-shadow univer-ring-2 univer-ring-offset-2 univer-ring-offset-white dark:!univer-ring-primary-600 dark:!univer-ring-offset-gray-600"
style="background-color: #000000;"
type="button"
/>
@@ -762,7 +762,7 @@ exports[`ColorPicker > should render with value 1`] = `
<div
class="
univer-w-[292px] univer-cursor-default univer-space-y-4 univer-rounded-lg univer-bg-white
- dark:univer-bg-gray-700
+ dark:!univer-bg-gray-700
"
>
<div
@@ -805,7 +805,7 @@ exports[`ColorPicker > should render with value 1`] = `
[&_input]:univer-rounded [&_input]:univer-border [&_input]:univer-border-solid
[&_input]:univer-border-gray-200 [&_input]:univer-bg-transparent [&_input]:univer-px-1.5
[&_input]:univer-text-sm [&_input]:univer-text-gray-700 [&_input]:univer-outline-none
- dark:[&_input]:univer-border-gray-600 dark:[&_input]:univer-text-white
+ dark:![&_input]:univer-border-gray-600 dark:![&_input]:univer-text-white
"
>
<a
@@ -816,7 +816,7 @@ exports[`ColorPicker > should render with value 1`] = `
univer-box-border univer-flex univer-h-8 univer-w-32 univer-cursor-pointer univer-items-center
univer-justify-between univer-gap-1 univer-rounded univer-border univer-border-solid
univer-border-gray-200 univer-px-1.5 univer-text-sm univer-text-gray-700
- dark:univer-border-gray-600 dark:univer-text-white
+ dark:!univer-border-gray-600 dark:!univer-text-white
"
data-slot="popover-trigger"
data-state="closed"
diff --git a/packages/design/src/components/dialog/DialogPrimitive.tsx b/packages/design/src/components/dialog/DialogPrimitive.tsx
index ba1242cc35..8ef83a128a 100644
--- a/packages/design/src/components/dialog/DialogPrimitive.tsx
+++ b/packages/design/src/components/dialog/DialogPrimitive.tsx
@@ -65,7 +65,7 @@ const DialogContent = forwardRef<
univer-fixed univer-left-1/2 univer-top-1/2 univer-z-[1050] univer-box-border univer-grid
univer-w-full univer-max-w-lg -univer-translate-x-1/2 -univer-translate-y-1/2 univer-gap-4
univer-bg-white univer-px-6 univer-py-4 univer-text-gray-500 univer-shadow-md univer-duration-200
- dark:univer-bg-gray-700 dark:univer-text-gray-400
+ dark:!univer-bg-gray-700 dark:!univer-text-gray-400
data-[state=closed]:univer-animate-out data-[state=closed]:univer-fade-out-0
data-[state=closed]:univer-zoom-out-95 data-[state=closed]:univer-slide-out-to-left-1/2
data-[state=closed]:univer-slide-out-to-top-[48%]
@@ -143,7 +143,7 @@ const DialogTitle = forwardRef<
`
univer-my-0 univer-text-lg univer-font-semibold univer-leading-none univer-tracking-tight
univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`,
className
)}
diff --git a/packages/design/src/components/dropdown-menu/DropdownMenuPrimitive.tsx b/packages/design/src/components/dropdown-menu/DropdownMenuPrimitive.tsx
index 59de6ecd9d..ed630d7bdc 100644
--- a/packages/design/src/components/dropdown-menu/DropdownMenuPrimitive.tsx
+++ b/packages/design/src/components/dropdown-menu/DropdownMenuPrimitive.tsx
@@ -103,7 +103,7 @@ function DropdownMenuSubTrigger({
univer-flex univer-cursor-default univer-select-none univer-items-center univer-justify-between
univer-gap-2 univer-rounded univer-px-2 univer-py-1.5 univer-text-sm univer-outline-none
[&_svg]:univer-pointer-events-none [&_svg]:univer-size-4 [&_svg]:univer-shrink-0
- dark:focus:univer-bg-gray-600
+ dark:focus:!univer-bg-gray-600
data-[state=open]:univer-bg-gray-100
focus:univer-bg-gray-100
`,
@@ -129,7 +129,7 @@ function DropdownMenuSubContent({
univer-z-[1080] univer-box-border univer-max-h-[var(--radix-popper-available-height)]
univer-overflow-y-auto univer-rounded-md univer-bg-white univer-p-1.5 univer-text-gray-900
univer-shadow-md
- dark:univer-bg-gray-700 dark:univer-text-white
+ dark:!univer-bg-gray-700 dark:!univer-text-white
data-[side=bottom]:univer-slide-in-from-top-2
data-[side=left]:univer-slide-in-from-right-2
data-[side=right]:univer-slide-in-from-left-2
@@ -163,7 +163,7 @@ function DropdownMenuContent({
univer-z-[1080] univer-box-border univer-max-h-[var(--radix-popper-available-height)]
univer-overflow-y-auto univer-rounded-md univer-bg-white univer-p-1.5 univer-text-gray-900
univer-shadow-md
- dark:univer-bg-gray-700 dark:univer-text-white
+ dark:!univer-bg-gray-700 dark:!univer-text-white
data-[side=bottom]:univer-slide-in-from-top-2
data-[side=left]:univer-slide-in-from-right-2
data-[side=right]:univer-slide-in-from-left-2
@@ -202,7 +202,7 @@ function DropdownMenuItem({
univer-relative univer-flex univer-cursor-default univer-select-none univer-items-center univer-gap-2
univer-rounded univer-px-2 univer-py-1.5 univer-text-sm univer-outline-none univer-transition-colors
[&>svg]:univer-size-4 [&>svg]:univer-shrink-0
- dark:focus:univer-bg-gray-600
+ dark:focus:!univer-bg-gray-600
data-[disabled]:univer-pointer-events-none data-[disabled]:univer-opacity-50
focus:univer-bg-gray-100
`,
@@ -227,7 +227,7 @@ function DropdownMenuCheckboxItem({
`
univer-relative univer-flex univer-cursor-default univer-select-none univer-items-center
univer-rounded univer-py-1.5 univer-pr-2 univer-text-sm univer-outline-none univer-transition-colors
- dark:focus:univer-bg-gray-600
+ dark:focus:!univer-bg-gray-600
data-[disabled]:univer-pointer-events-none data-[disabled]:univer-opacity-50
focus:univer-bg-gray-100
`,
@@ -272,7 +272,7 @@ function DropdownMenuRadioItem({
`
univer-relative univer-flex univer-cursor-default univer-select-none univer-items-center
univer-rounded univer-py-1.5 univer-pr-2 univer-text-sm univer-outline-none univer-transition-colors
- dark:focus:univer-bg-gray-600
+ dark:focus:!univer-bg-gray-600
data-[disabled]:univer-pointer-events-none data-[disabled]:univer-opacity-50
focus:univer-bg-gray-100
`,
diff --git a/packages/design/src/components/dropdown/PopoverPrimitive.tsx b/packages/design/src/components/dropdown/PopoverPrimitive.tsx
index ff469799a0..da2f77275d 100644
--- a/packages/design/src/components/dropdown/PopoverPrimitive.tsx
+++ b/packages/design/src/components/dropdown/PopoverPrimitive.tsx
@@ -47,7 +47,7 @@ function PopoverContent({
`
univer-z-[1080] univer-max-h-[var(--radix-popper-available-height)] univer-overflow-y-auto
univer-rounded-md univer-bg-white univer-text-gray-900 univer-shadow-md univer-outline-hidden
- dark:univer-bg-gray-900 dark:univer-text-white
+ dark:!univer-bg-gray-900 dark:!univer-text-white
data-[side=bottom]:univer-slide-in-from-top-2
data-[side=left]:univer-slide-in-from-right-2
data-[side=right]:univer-slide-in-from-left-2
diff --git a/packages/design/src/components/form-layout/FormLayout.tsx b/packages/design/src/components/form-layout/FormLayout.tsx
index 102f9a1903..88258eb8a3 100644
--- a/packages/design/src/components/form-layout/FormLayout.tsx
+++ b/packages/design/src/components/form-layout/FormLayout.tsx
@@ -46,7 +46,7 @@ export const FormLayout = (props: IFormLayoutProps) => {
className={clsx(`
univer-mb-2 univer-flex univer-min-h-3.5 univer-items-center univer-text-sm
univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`, {
'univer-cursor-pointer': collapsable,
})}
@@ -72,7 +72,7 @@ export const FormLayout = (props: IFormLayoutProps) => {
<div
className={`
univer-mt-1 univer-text-sm univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{desc}
diff --git a/packages/design/src/components/input-number/InputNumber.tsx b/packages/design/src/components/input-number/InputNumber.tsx
index ee921312b8..9df3409687 100644
--- a/packages/design/src/components/input-number/InputNumber.tsx
+++ b/packages/design/src/components/input-number/InputNumber.tsx
@@ -331,7 +331,7 @@ export const InputNumber = forwardRef<HTMLInputElement, IInputNumberProps>(
univer-h-[calc(100%-2px)] univer-w-6 univer-flex-col univer-border univer-border-y-0
univer-border-l univer-border-r-0 univer-border-solid univer-border-gray-200
univer-border-l-gray-200
- dark:univer-border-gray-600
+ dark:!univer-border-gray-600
`,
controlsClassName
)}
@@ -342,7 +342,7 @@ export const InputNumber = forwardRef<HTMLInputElement, IInputNumberProps>(
univer-border-none !univer-bg-transparent univer-text-xs
after:univer-absolute after:-univer-bottom-px after:univer-block after:univer-h-px
after:univer-w-full after:univer-bg-gray-200 after:univer-content-['']
- dark:after:univer-bg-gray-600
+ dark:after:!univer-bg-gray-600
`}
tabIndex={-1}
disabled={disabled || (max !== undefined && internalValue !== null && internalValue >= max)}
diff --git a/packages/design/src/components/input/Input.tsx b/packages/design/src/components/input/Input.tsx
index efa9a701c4..9c3889378d 100644
--- a/packages/design/src/components/input/Input.tsx
+++ b/packages/design/src/components/input/Input.tsx
@@ -26,7 +26,7 @@ type InputProps = React.InputHTMLAttributes<HTMLInputElement>;
export const inputVariants = cva(
`
univer-box-border univer-w-full univer-rounded-md univer-bg-white univer-transition-colors univer-duration-200
- dark:univer-bg-gray-700 dark:univer-text-white dark:focus:univer-ring-primary-900
+ dark:!univer-bg-gray-700 dark:!univer-text-white dark:focus:!univer-ring-primary-900
focus:univer-border-primary-600 focus:univer-outline-none focus:univer-ring-2 focus:univer-ring-primary-50
placeholder:univer-text-gray-400
`,
@@ -134,7 +134,7 @@ export const Input = forwardRef<HTMLInputElement, IInputProps>(
borderClassName,
disabled && `
univer-cursor-not-allowed univer-bg-gray-50 univer-text-gray-400
- dark:univer-text-gray-500
+ dark:!univer-text-gray-500
`,
(allowClear && !slot) && 'univer-pr-8',
inputClass
diff --git a/packages/design/src/components/kbd/Kbd.tsx b/packages/design/src/components/kbd/Kbd.tsx
index 0e57fe3459..49ae7278ec 100644
--- a/packages/design/src/components/kbd/Kbd.tsx
+++ b/packages/design/src/components/kbd/Kbd.tsx
@@ -33,7 +33,7 @@ export function KBD(props: IKBDProps) {
className={clsx(`
univer-inline-block univer-h-6 univer-select-none univer-rounded-md univer-bg-gray-50 univer-px-2
univer-font-mono univer-text-xs/6 univer-font-medium univer-text-gray-700
- dark:univer-bg-gray-700 dark:univer-text-white
+ dark:!univer-bg-gray-700 dark:!univer-text-white
`, borderClassName, className)}
>
{keys.map((text, index) => (
diff --git a/packages/design/src/components/menu/Menu.tsx b/packages/design/src/components/menu/Menu.tsx
index 75c6661ad2..f7ee3c17e5 100644
--- a/packages/design/src/components/menu/Menu.tsx
+++ b/packages/design/src/components/menu/Menu.tsx
@@ -79,17 +79,17 @@ export function TinyMenuGroup({ items }: ITinyMenuGroupProps) {
className={clsx(`
univer-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center
univer-rounded-md
- dark:hover:univer-bg-gray-900
+ dark:hover:!univer-bg-gray-900
hover:univer-bg-gray-50
`, {
- 'univer-bg-gray-50 dark:univer-bg-gray-900': item.active,
+ 'univer-bg-gray-50 dark:!univer-bg-gray-900': item.active,
}, item.className)}
onClick={() => item.onClick()}
>
<item.Icon
className={`
univer-size-4 univer-text-gray-900
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
/>
</div>
diff --git a/packages/design/src/components/message/Message.tsx b/packages/design/src/components/message/Message.tsx
index 049ca07029..b01e7ff041 100644
--- a/packages/design/src/components/message/Message.tsx
+++ b/packages/design/src/components/message/Message.tsx
@@ -42,7 +42,7 @@ const iconMap = {
<InfoSingle
className={`
univer-text-indigo-600
- dark:univer-text-primary-500
+ dark:!univer-text-primary-500
`}
/>
),
@@ -61,7 +61,7 @@ const Message = ({ content, type = MessageType.Info }: IMessageProps) => {
univer-min-w-[320px] univer-max-w-[480px] univer-rounded-xl univer-border univer-border-solid
univer-border-gray-200 univer-bg-white univer-p-4 univer-font-sans univer-shadow-md
univer-transition-all univer-duration-300 univer-animate-in univer-fade-in univer-slide-in-from-top-4
- dark:univer-border-gray-600 dark:univer-bg-gray-700
+ dark:!univer-border-gray-600 dark:!univer-bg-gray-700
`
)}
>
@@ -72,7 +72,7 @@ const Message = ({ content, type = MessageType.Info }: IMessageProps) => {
<p
className={`
univer-m-0 univer-text-sm univer-text-gray-500 univer-opacity-90
- dark:univer-text-gray-400
+ dark:!univer-text-gray-400
`}
>
{content}
diff --git a/packages/design/src/components/pager/Pager.tsx b/packages/design/src/components/pager/Pager.tsx
index dd3dc18935..e7fc543908 100644
--- a/packages/design/src/components/pager/Pager.tsx
+++ b/packages/design/src/components/pager/Pager.tsx
@@ -61,7 +61,7 @@ export function Pager(props: IPagerProps) {
data-u-comp="pager"
className={clsx(`
univer-flex univer-flex-shrink-0 univer-items-center univer-text-sm univer-text-gray-700
- dark:univer-text-gray-400
+ dark:!univer-text-gray-400
`, className)}
>
{hasValue
@@ -71,7 +71,7 @@ export function Pager(props: IPagerProps) {
data-u-comp="pager-left-arrow"
className={`
univer-inline-flex univer-size-4 univer-cursor-pointer univer-items-center univer-rounded
- dark:hover:univer-bg-gray-600
+ dark:hover:!univer-bg-gray-600
hover:univer-bg-gray-50
`}
role="button"
@@ -84,7 +84,7 @@ export function Pager(props: IPagerProps) {
data-u-comp="pager-right-arrow"
className={`
univer-inline-flex univer-size-4 univer-cursor-pointer univer-items-center univer-rounded
- dark:hover:univer-bg-gray-600
+ dark:hover:!univer-bg-gray-600
hover:univer-bg-gray-50
`}
role="button"
diff --git a/packages/design/src/components/radio/Radio.tsx b/packages/design/src/components/radio/Radio.tsx
index 09c6d6c585..bcb376afdf 100644
--- a/packages/design/src/components/radio/Radio.tsx
+++ b/packages/design/src/components/radio/Radio.tsx
@@ -68,7 +68,7 @@ export function Radio(props: IRadioProps) {
<label
data-u-comp="radio"
className={clsx('univer-box-border univer-inline-flex univer-items-center univer-gap-2 univer-text-sm', {
- 'univer-cursor-pointer univer-text-gray-900 dark:univer-text-white': !disabled,
+ 'univer-cursor-pointer univer-text-gray-900 dark:!univer-text-white': !disabled,
'univer-text-gray-400': disabled,
})}
>
@@ -86,10 +86,10 @@ export function Radio(props: IRadioProps) {
univer-relative univer-box-border univer-flex univer-size-4 univer-items-center
univer-justify-center univer-overflow-hidden univer-rounded-full univer-border univer-border-solid
univer-border-gray-300 univer-bg-gray-50 univer-transition-colors
- dark:univer-border-gray-500 dark:univer-bg-gray-600
+ dark:!univer-border-gray-500 dark:!univer-bg-gray-600
`, {
'univer-opacity-50': disabled,
- 'univer-border-primary-600 univer-bg-primary-600 dark:univer-bg-primary-600': checked,
+ 'univer-border-primary-600 univer-bg-primary-600 dark:!univer-bg-primary-600': checked,
})}
>
{checked && (
diff --git a/packages/design/src/components/segmented/Segmented.tsx b/packages/design/src/components/segmented/Segmented.tsx
index 8136e063bc..72aee8d89c 100644
--- a/packages/design/src/components/segmented/Segmented.tsx
+++ b/packages/design/src/components/segmented/Segmented.tsx
@@ -101,14 +101,14 @@ export function Segmented<T extends ItemValue = ItemValue>({
ref={containerRef}
className={clsx(`
univer-relative univer-box-border univer-flex univer-gap-4 univer-rounded-lg univer-bg-gray-100 univer-p-1
- dark:univer-bg-gray-800
+ dark:!univer-bg-gray-800
`, className)}
>
<div
className={`
univer-absolute univer-h-6 univer-rounded-md univer-bg-white univer-shadow-sm univer-transition-all
univer-duration-200 univer-animate-univer-slide
- dark:univer-bg-gray-700 dark:univer-text-gray-400
+ dark:!univer-bg-gray-700 dark:!univer-text-gray-400
`}
style={slideStyle}
/>
@@ -124,8 +124,8 @@ export function Segmented<T extends ItemValue = ItemValue>({
univer-bg-transparent univer-px-3 univer-py-1 univer-text-xs univer-font-medium
univer-transition-colors
`, {
- 'univer-text-gray-900 dark:univer-text-white': selectedItem === item.value,
- 'univer-text-gray-500 dark:hover:univer-text-white hover:univer-text-gray-900': selectedItem !== item.value,
+ 'univer-text-gray-900 dark:!univer-text-white': selectedItem === item.value,
+ 'univer-text-gray-500 dark:hover:!univer-text-white hover:univer-text-gray-900': selectedItem !== item.value,
})}
type="button"
onClick={() => handleClick(item.value)}
diff --git a/packages/design/src/components/select-list/SelectList.tsx b/packages/design/src/components/select-list/SelectList.tsx
index f12859187f..9333c117d3 100644
--- a/packages/design/src/components/select-list/SelectList.tsx
+++ b/packages/design/src/components/select-list/SelectList.tsx
@@ -97,10 +97,10 @@ export function SelectList(props: ISelectListProps) {
univer-relative univer-block univer-cursor-pointer univer-select-none univer-rounded
univer-py-1.5 univer-pl-8 univer-pr-2 univer-text-sm univer-text-gray-900
univer-transition-colors
- dark:univer-text-white dark:hover:univer-bg-gray-600
+ dark:!univer-text-white dark:hover:!univer-bg-gray-600
hover:univer-bg-gray-100
`, optionClassName, {
- 'univer-bg-gray-200 dark:univer-bg-gray-500': checked,
+ 'univer-bg-gray-200 dark:!univer-bg-gray-500': checked,
})}
onClick={() => handleSelect(option.value)}
>
diff --git a/packages/design/src/components/select/MultipleSelect.tsx b/packages/design/src/components/select/MultipleSelect.tsx
index 5bdf78066c..f4981ff9ef 100644
--- a/packages/design/src/components/select/MultipleSelect.tsx
+++ b/packages/design/src/components/select/MultipleSelect.tsx
@@ -129,9 +129,9 @@ export function MultipleSelect(props: IMultipleSelectProps) {
univer-box-border univer-inline-flex univer-h-8 univer-min-w-36 univer-items-center
univer-justify-between univer-rounded-lg univer-bg-white univer-px-2.5 univer-transition-colors
univer-duration-200
- dark:univer-bg-gray-700 dark:univer-text-white
+ dark:!univer-bg-gray-700 dark:!univer-text-white
`, borderClassName, {
- 'univer-border-primary-600 univer-outline-none univer-ring-2 univer-ring-primary-50 dark:univer-ring-primary-900': open && !borderless,
+ 'univer-border-primary-600 univer-outline-none univer-ring-2 univer-ring-primary-50 dark:!univer-ring-primary-900': open && !borderless,
'univer-border-transparent univer-bg-transparent hover:univer-border-transparent': borderless,
'univer-cursor-not-allowed': disabled,
'hover:univer-border-primary-600': !disabled && !borderless,
@@ -146,7 +146,7 @@ export function MultipleSelect(props: IMultipleSelectProps) {
<MoreDownSingle
className={`
univer-flex-shrink-0
- dark:univer-text-white
+ dark:!univer-text-white
`}
/>
</div>
diff --git a/packages/design/src/components/select/Select.tsx b/packages/design/src/components/select/Select.tsx
index b8246255fd..65008eb8b0 100644
--- a/packages/design/src/components/select/Select.tsx
+++ b/packages/design/src/components/select/Select.tsx
@@ -153,9 +153,9 @@ export function Select(props: ISelectProps) {
univer-box-border univer-inline-flex univer-h-8 univer-min-w-36 univer-items-center
univer-justify-between univer-gap-2 univer-rounded-lg univer-bg-white univer-px-2.5
univer-transition-colors univer-duration-200
- dark:univer-bg-gray-700 dark:univer-text-white
+ dark:!univer-bg-gray-700 dark:!univer-text-white
`, borderClassName, {
- 'univer-border-primary-600 univer-outline-none univer-ring-2 univer-ring-primary-50 dark:univer-ring-primary-900': open && !borderless,
+ 'univer-border-primary-600 univer-outline-none univer-ring-2 univer-ring-primary-50 dark:!univer-ring-primary-900': open && !borderless,
'univer-border-transparent univer-bg-transparent hover:univer-border-transparent': borderless,
'univer-cursor-not-allowed': disabled,
'hover:univer-border-primary-600': !disabled && !borderless,
@@ -165,7 +165,7 @@ export function Select(props: ISelectProps) {
<div
className={`
univer-flex-1 univer-truncate univer-text-sm univer-text-gray-500
- dark:univer-text-white
+ dark:!univer-text-white
`}
>
{displayValue}
@@ -173,7 +173,7 @@ export function Select(props: ISelectProps) {
<MoreDownSingle
className={`
univer-flex-shrink-0
- dark:univer-text-white
+ dark:!univer-text-white
`}
/>
</div>
diff --git a/packages/design/src/components/separator/Separator.tsx b/packages/design/src/components/separator/Separator.tsx
index b9beac539a..93c625b795 100644
--- a/packages/design/src/components/separator/Separator.tsx
+++ b/packages/design/src/components/separator/Separator.tsx
@@ -32,7 +32,7 @@ function Separator({
className={clsx(
`
univer-shrink-0 univer-bg-gray-200
- dark:univer-bg-gray-600
+ dark:!univer-bg-gray-600
data-[orientation=horizontal]:univer-h-px data-[orientation=horizontal]:univer-w-full
data-[orientation=vertical]:univer-h-full data-[orientation=vertical]:univer-w-px
`,
diff --git a/packages/design/src/components/toaster/Toaster.tsx b/packages/design/src/components/toaster/Toaster.tsx
index 5a29f04a84..5bc4262ed9 100644
--- a/packages/design/src/components/toaster/Toaster.tsx
+++ b/packages/design/src/components/toaster/Toaster.tsx
@@ -28,7 +28,7 @@ const Toaster = ({ visibleToasts, ...props }: IToasterProps) => {
[&_[data-icon]>svg]:univer-relative [&_[data-icon]>svg]:univer-top-1
[&_[data-sonner-toast]]:univer-shadow-md
[&_[data-title]]:univer-text-sm [&_[data-title]]:univer-text-gray-900
- dark:[&_[data-description]]:univer-text-gray-200
+ dark:![&_[data-description]]:univer-text-gray-200
`}
toastOptions={{
classNames: {
diff --git a/packages/design/src/helper/class-utilities.ts b/packages/design/src/helper/class-utilities.ts
index 1b78b104ad..28a2835b0a 100644
--- a/packages/design/src/helper/class-utilities.ts
+++ b/packages/design/src/helper/class-utilities.ts
@@ -16,14 +16,14 @@
import { clsx } from './clsx';
-export const scrollbarClassName = 'univer-scrollbar-thin univer-scrollbar-track-gray-50 univer-scrollbar-thumb-gray-300 dark:univer-scrollbar-track-gray-900 dark:univer-scrollbar-thumb-gray-700';
+export const scrollbarClassName = 'univer-scrollbar-thin univer-scrollbar-track-gray-50 univer-scrollbar-thumb-gray-300 dark:!univer-scrollbar-track-gray-900 dark:!univer-scrollbar-thumb-gray-700';
-const borderBasicClassName = 'univer-border-gray-200 dark:univer-border-gray-600 univer-border-solid';
+const borderBasicClassName = 'univer-border-gray-200 dark:!univer-border-gray-600 univer-border-solid';
export const borderClassName = clsx(borderBasicClassName, 'univer-border');
export const borderLeftBottomClassName = clsx(borderBasicClassName, 'univer-border-l univer-border-b univer-border-0');
export const borderLeftClassName = clsx(borderBasicClassName, 'univer-border-l univer-border-0');
export const borderTopClassName = clsx(borderBasicClassName, 'univer-border-t univer-border-0');
export const borderBottomClassName = clsx(borderBasicClassName, 'univer-border-b univer-border-0');
export const borderRightClassName = clsx(borderBasicClassName, 'univer-border-r univer-border-0');
-export const divideYClassName = 'univer-divide-gray-200 dark:univer-divide-gray-600 univer-divide-y univer-divide-x-0 univer-divide-solid';
-export const divideXClassName = 'univer-divide-gray-200 dark:univer-divide-gray-600 univer-divide-x univer-divide-y-0 univer-divide-solid';
+export const divideYClassName = 'univer-divide-gray-200 dark:!univer-divide-gray-600 univer-divide-y univer-divide-x-0 univer-divide-solid';
+export const divideXClassName = 'univer-divide-gray-200 dark:!univer-divide-gray-600 univer-divide-x univer-divide-y-0 univer-divide-solid';
diff --git a/packages/docs-drawing-ui/src/views/doc-image-panel/DocDrawingPosition.tsx b/packages/docs-drawing-ui/src/views/doc-image-panel/DocDrawingPosition.tsx
index e3dd752d5e..c1b1ac7deb 100644
--- a/packages/docs-drawing-ui/src/views/doc-image-panel/DocDrawingPosition.tsx
+++ b/packages/docs-drawing-ui/src/views/doc-image-panel/DocDrawingPosition.tsx
@@ -375,7 +375,7 @@ export const DocDrawingPosition = (props: IDocDrawingPositionProps) => {
<header
className={`
univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
<div>{localeService.t('image-position.title')}</div>
@@ -384,7 +384,7 @@ export const DocDrawingPosition = (props: IDocDrawingPositionProps) => {
<div
className={`
univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
<div>{localeService.t('image-position.horizontal')}</div>
@@ -426,7 +426,7 @@ export const DocDrawingPosition = (props: IDocDrawingPositionProps) => {
<div
className={`
univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
<div>{localeService.t('image-position.vertical')}</div>
@@ -468,7 +468,7 @@ export const DocDrawingPosition = (props: IDocDrawingPositionProps) => {
<div
className={`
univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
<div>{localeService.t('image-position.options')}</div>
diff --git a/packages/docs-drawing-ui/src/views/doc-image-panel/DocDrawingTextWrap.tsx b/packages/docs-drawing-ui/src/views/doc-image-panel/DocDrawingTextWrap.tsx
index d16d8dfee0..983df37d51 100644
--- a/packages/docs-drawing-ui/src/views/doc-image-panel/DocDrawingTextWrap.tsx
+++ b/packages/docs-drawing-ui/src/views/doc-image-panel/DocDrawingTextWrap.tsx
@@ -282,7 +282,7 @@ export const DocDrawingTextWrap = (props: IDocDrawingTextWrapProps) => {
<header
className={`
univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
<div>{localeService.t('image-text-wrap.title')}</div>
@@ -291,7 +291,7 @@ export const DocDrawingTextWrap = (props: IDocDrawingTextWrapProps) => {
<div
className={`
univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
<div>{localeService.t('image-text-wrap.wrappingStyle')}</div>
@@ -310,7 +310,7 @@ export const DocDrawingTextWrap = (props: IDocDrawingTextWrapProps) => {
<div
className={`
univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
<div>{localeService.t('image-text-wrap.wrapText')}</div>
@@ -327,7 +327,7 @@ export const DocDrawingTextWrap = (props: IDocDrawingTextWrapProps) => {
<div
className={`
univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
<div>{localeService.t('image-text-wrap.distanceFromText')}</div>
diff --git a/packages/docs-hyper-link-ui/src/views/hyper-link-edit/index.tsx b/packages/docs-hyper-link-ui/src/views/hyper-link-edit/index.tsx
index 5ac91baeac..6948733301 100644
--- a/packages/docs-hyper-link-ui/src/views/hyper-link-edit/index.tsx
+++ b/packages/docs-hyper-link-ui/src/views/hyper-link-edit/index.tsx
@@ -117,7 +117,7 @@ export const DocHyperLinkEdit = () => {
<div
className={clsx(`
univer-box-border univer-w-[328px] univer-rounded-xl univer-bg-white univer-px-6 univer-py-5 univer-shadow
- dark:univer-bg-gray-900
+ dark:!univer-bg-gray-900
`, borderClassName)}
>
<div>
diff --git a/packages/docs-hyper-link-ui/src/views/hyper-link-popup/index.tsx b/packages/docs-hyper-link-ui/src/views/hyper-link-popup/index.tsx
index 7ddb053673..eebc73d3e5 100644
--- a/packages/docs-hyper-link-ui/src/views/hyper-link-popup/index.tsx
+++ b/packages/docs-hyper-link-ui/src/views/hyper-link-popup/index.tsx
@@ -50,7 +50,7 @@ export const DocLinkPopup = () => {
className={clsx(`
univer-box-border univer-flex univer-max-w-80 univer-items-center univer-justify-between
univer-overflow-hidden univer-rounded-lg univer-bg-white univer-p-3 univer-shadow
- dark:univer-bg-gray-900
+ dark:!univer-bg-gray-900
`, borderClassName)}
onClick={() => {
hyperLinkService.hideInfoPopup();
@@ -67,7 +67,7 @@ export const DocLinkPopup = () => {
className={`
univer-mr-2 univer-flex univer-size-5 univer-flex-[0_0_auto] univer-items-center
univer-justify-center univer-text-base univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
>
<LinkSingle />
diff --git a/packages/docs-ui/src/components/float-toolbar/FloatToolbar.tsx b/packages/docs-ui/src/components/float-toolbar/FloatToolbar.tsx
index 6810e36c10..945183858b 100644
--- a/packages/docs-ui/src/components/float-toolbar/FloatToolbar.tsx
+++ b/packages/docs-ui/src/components/float-toolbar/FloatToolbar.tsx
@@ -80,7 +80,7 @@ export function FloatToolbar(props: IFloatToolbarProps) {
<div
className={clsx(`
univer-box-border univer-flex univer-rounded univer-bg-white univer-py-1.5 univer-shadow-sm
- dark:univer-border-gray-700 dark:univer-bg-gray-900
+ dark:!univer-border-gray-700 dark:!univer-bg-gray-900
`, borderClassName)}
>
{menus.map((groupItem) => groupItem.item && (
diff --git a/packages/docs-ui/src/components/paragraph-menu/index.tsx b/packages/docs-ui/src/components/paragraph-menu/index.tsx
index 8b44e811ce..4b0aba49e1 100644
--- a/packages/docs-ui/src/components/paragraph-menu/index.tsx
+++ b/packages/docs-ui/src/components/paragraph-menu/index.tsx
@@ -66,11 +66,11 @@ export const ParagraphMenu = ({ popup }: { popup: IPopup }) => {
className={clsx(`
univer-mr-1 univer-inline-flex univer-h-7 univer-cursor-pointer univer-items-center univer-gap-1
univer-rounded-full univer-px-2.5 univer-py-0
- dark:hover:univer-bg-gray-600
+ dark:hover:!univer-bg-gray-600
hover:univer-bg-gray-100
`, borderClassName, {
- 'univer-bg-gray-100 dark:univer-bg-gray-700': visible,
- 'univer-bg-white dark:univer-bg-gray-700': !visible,
+ 'univer-bg-gray-100 dark:!univer-bg-gray-700': visible,
+ 'univer-bg-white dark:!univer-bg-gray-700': !visible,
})}
onMouseEnter={(e) => {
popup.onPointerEnter?.(e);
@@ -94,13 +94,13 @@ export const ParagraphMenu = ({ popup }: { popup: IPopup }) => {
<icon.component
className={`
univer-size-4 univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
/>
<DownSingle
className={`
univer-size-3 univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
/>
</div>
diff --git a/packages/docs-ui/src/components/side-menu/index.tsx b/packages/docs-ui/src/components/side-menu/index.tsx
index 2b2b26394b..8cbf39de34 100644
--- a/packages/docs-ui/src/components/side-menu/index.tsx
+++ b/packages/docs-ui/src/components/side-menu/index.tsx
@@ -100,7 +100,7 @@ export const SideMenu = forwardRef<ISideMenuInstance, ISideMenuProps>((props, re
univer-absolute univer-left-5 univer-top-4 univer-z-[100] univer-flex univer-h-8 univer-w-8
univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-full univer-bg-white
univer-text-gray-800 univer-shadow-sm
- dark:univer-bg-gray-600 dark:univer-text-gray-200
+ dark:!univer-bg-gray-600 dark:!univer-text-gray-200
`, iconClass)}
style={iconStyle}
>
@@ -114,7 +114,7 @@ export const SideMenu = forwardRef<ISideMenuInstance, ISideMenuProps>((props, re
univer-flex-col univer-px-4 univer-pb-4 univer-pt-14 univer-transition-all univer-duration-300
`,
{
- 'univer-rounded-r-2xl univer-bg-white univer-shadow univer-backdrop-blur-[10px] dark:univer-bg-gray-900': isSideBar,
+ 'univer-rounded-r-2xl univer-bg-white univer-shadow univer-backdrop-blur-[10px] dark:!univer-bg-gray-900': isSideBar,
}
)}
style={{
@@ -140,8 +140,8 @@ export const SideMenu = forwardRef<ISideMenuInstance, ISideMenuProps>((props, re
[titleClass]: menu.isTitle,
[h1Class]: menu.level === 1,
[textClass]: menu.level > 1,
- 'univer-text-gray-500 dark:univer-text-gray-400': menu.id !== activeId,
- 'univer-text-gray-800 dark:univer-text-gray-200': menu.id === activeId,
+ 'univer-text-gray-500 dark:!univer-text-gray-400': menu.id !== activeId,
+ 'univer-text-gray-800 dark:!univer-text-gray-200': menu.id === activeId,
}
)}
style={{
diff --git a/packages/docs-ui/src/views/page-settings/index.tsx b/packages/docs-ui/src/views/page-settings/index.tsx
index 35cfc87c9b..73857f672b 100644
--- a/packages/docs-ui/src/views/page-settings/index.tsx
+++ b/packages/docs-ui/src/views/page-settings/index.tsx
@@ -103,7 +103,7 @@ export function PageSettings(props: IConfirmChildrenProps) {
<label
className={`
univer-text-sm univer-font-medium univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
>
{localeService.t('page-settings.paper-size')}
@@ -122,7 +122,7 @@ export function PageSettings(props: IConfirmChildrenProps) {
<label
className={`
univer-text-sm univer-font-medium univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
>
{localeService.t('page-settings.custom-paper-size')}
diff --git a/packages/drawing-ui/src/views/image-popup-menu/ImagePopupMenu.tsx b/packages/drawing-ui/src/views/image-popup-menu/ImagePopupMenu.tsx
index dfbb4d436c..4eb3692409 100644
--- a/packages/drawing-ui/src/views/image-popup-menu/ImagePopupMenu.tsx
+++ b/packages/drawing-ui/src/views/image-popup-menu/ImagePopupMenu.tsx
@@ -91,20 +91,20 @@ export const ImagePopupMenu: React.FC<IImagePopupMenuProps> = (props: IImagePopu
<div
className={clsx(`
univer-flex univer-items-center univer-gap-2 univer-rounded univer-p-1
- dark:hover:univer-bg-gray-800
+ dark:hover:!univer-bg-gray-800
hover:univer-bg-gray-100
`, borderClassName, {
- 'univer-bg-gray-100 dark:univer-bg-gray-800': visible,
- 'univer-bg-white dark:univer-bg-gray-900': !visible,
+ 'univer-bg-gray-100 dark:!univer-bg-gray-800': visible,
+ 'univer-bg-white dark:!univer-bg-gray-900': !visible,
})}
>
<Autofill
className={`
univer-fill-primary-600 univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
/>
- {showMore && <MoreDownSingle className="dark:univer-text-white" />}
+ {showMore && <MoreDownSingle className="dark:!univer-text-white" />}
</div>
</DropdownMenu>
</div>
diff --git a/packages/drawing-ui/src/views/panel/DrawingAlign.tsx b/packages/drawing-ui/src/views/panel/DrawingAlign.tsx
index 45419f22b9..bcf8b9915b 100644
--- a/packages/drawing-ui/src/views/panel/DrawingAlign.tsx
+++ b/packages/drawing-ui/src/views/panel/DrawingAlign.tsx
@@ -100,7 +100,7 @@ export const DrawingAlign = (props: IDrawingAlignProps) => {
<header
className={`
univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
<div>{localeService.t('image-panel.align.title')}</div>
@@ -110,7 +110,7 @@ export const DrawingAlign = (props: IDrawingAlignProps) => {
<div
className={`
univer-w-full univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
>
<Select value={alignValue} options={alignOptions} onChange={handleAlignChange} />
diff --git a/packages/drawing-ui/src/views/panel/DrawingArrange.tsx b/packages/drawing-ui/src/views/panel/DrawingArrange.tsx
index 18fb51879b..57aa6ee3e0 100644
--- a/packages/drawing-ui/src/views/panel/DrawingArrange.tsx
+++ b/packages/drawing-ui/src/views/panel/DrawingArrange.tsx
@@ -62,7 +62,7 @@ export const DrawingArrange = (props: IDrawingArrangeProps) => {
<header
className={`
univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
<div>{localeService.t('image-panel.arrange.title')}</div>
diff --git a/packages/drawing-ui/src/views/panel/DrawingGroup.tsx b/packages/drawing-ui/src/views/panel/DrawingGroup.tsx
index a64404ab34..365d0b5af1 100644
--- a/packages/drawing-ui/src/views/panel/DrawingGroup.tsx
+++ b/packages/drawing-ui/src/views/panel/DrawingGroup.tsx
@@ -189,7 +189,7 @@ export const DrawingGroup = (props: IDrawingGroupProps) => {
<header
className={`
univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
<div>{localeService.t('image-panel.group.title')}</div>
diff --git a/packages/drawing-ui/src/views/panel/DrawingTransform.tsx b/packages/drawing-ui/src/views/panel/DrawingTransform.tsx
index a9c47a0424..9b701fe2d0 100644
--- a/packages/drawing-ui/src/views/panel/DrawingTransform.tsx
+++ b/packages/drawing-ui/src/views/panel/DrawingTransform.tsx
@@ -370,7 +370,7 @@ export const DrawingTransform = (props: IDrawingTransformProps) => {
<header
className={`
univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
<div>{localeService.t('image-panel.transform.title')}</div>
diff --git a/packages/drawing-ui/src/views/panel/ImageCropper.tsx b/packages/drawing-ui/src/views/panel/ImageCropper.tsx
index 849a662d3c..221ce2d111 100644
--- a/packages/drawing-ui/src/views/panel/ImageCropper.tsx
+++ b/packages/drawing-ui/src/views/panel/ImageCropper.tsx
@@ -126,7 +126,7 @@ export const ImageCropper = (props: IImageCropperProps) => {
<header
className={`
univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
<div>{localeService.t('image-panel.crop.title')}</div>
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/ColorScale.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/ColorScale.tsx
index 385060bbd7..7906e5e592 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/ColorScale.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/ColorScale.tsx
@@ -73,7 +73,7 @@ const TextInput = (props: { id: string; type: CFValueType | 'none'; value: numbe
univer-rounded-lg univer-bg-white univer-pt-2 univer-transition-colors
[&>div:first-child]:univer-px-2.5
[&>div]:univer-h-5 [&>div]:univer-ring-transparent
- dark:univer-bg-gray-700 dark:univer-text-white
+ dark:!univer-bg-gray-700 dark:!univer-text-white
hover:univer-border-primary-600
`, borderClassName)}
initValue={formulaInitValue as any}
@@ -227,7 +227,7 @@ export const ColorScaleStyleEditor = (props: IStyleEditorProps) => {
<div
className={`
univer-mt-4 univer-text-sm univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{localeService.t('sheet.cf.panel.styleRule')}
@@ -238,7 +238,7 @@ export const ColorScaleStyleEditor = (props: IStyleEditorProps) => {
<div
className={`
univer-mt-3 univer-text-xs univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{localeService.t('sheet.cf.valueType.min')}
@@ -307,7 +307,7 @@ export const ColorScaleStyleEditor = (props: IStyleEditorProps) => {
<div
className={`
univer-mt-3 univer-text-xs
- univer-text-gray-600dark:univer-text-gray-200
+ univer-text-gray-600dark:!univer-text-gray-200
`}
>
{localeService.t('sheet.cf.panel.medianValue')}
@@ -380,7 +380,7 @@ export const ColorScaleStyleEditor = (props: IStyleEditorProps) => {
<div
className={`
univer-mt-3 univer-text-xs univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{localeService.t('sheet.cf.valueType.max')}
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/DataBar.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/DataBar.tsx
index 9bcaf6f14c..b78da41a52 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/DataBar.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/DataBar.tsx
@@ -69,7 +69,7 @@ const InputText = (props: { disabled?: boolean; id: string; className: string; t
univer-rounded-lg univer-bg-white univer-pt-2 univer-transition-colors
[&>div:first-child]:univer-px-2.5
[&>div]:univer-h-5 [&>div]:univer-ring-transparent
- dark:univer-bg-gray-700 dark:univer-text-white
+ dark:!univer-bg-gray-700 dark:!univer-text-white
hover:univer-border-primary-600
`, borderClassName)}
initValue={v as any}
@@ -253,7 +253,7 @@ export const DataBarStyleEditor = (props: IStyleEditorProps) => {
<div
className={`
univer-mt-4 univer-text-sm univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{localeService.t('sheet.cf.panel.styleRule')}
@@ -276,7 +276,7 @@ export const DataBarStyleEditor = (props: IStyleEditorProps) => {
<div
className={`
univer-mt-3 univer-text-sm univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{localeService.t('sheet.cf.panel.fillType')}
@@ -331,7 +331,7 @@ export const DataBarStyleEditor = (props: IStyleEditorProps) => {
<div
className={`
univer-mt-3 univer-text-sm univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{localeService.t('sheet.cf.panel.colorSet')}
@@ -362,7 +362,7 @@ export const DataBarStyleEditor = (props: IStyleEditorProps) => {
<div
className={`
univer-mt-3 univer-text-sm univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{localeService.t('sheet.cf.valueType.min')}
@@ -413,7 +413,7 @@ export const DataBarStyleEditor = (props: IStyleEditorProps) => {
<div
className={`
univer-mt-3 univer-text-sm univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{localeService.t('sheet.cf.valueType.max')}
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Formula.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Formula.tsx
index b42c91436e..b9d2464d43 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Formula.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Formula.tsx
@@ -99,7 +99,7 @@ export const FormulaStyleEditor = (props: IStyleEditorProps) => {
<div
className={`
univer-mt-4 univer-text-sm univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{localeService.t('sheet.cf.panel.styleRule')}
@@ -112,7 +112,7 @@ export const FormulaStyleEditor = (props: IStyleEditorProps) => {
univer-rounded-lg univer-bg-white univer-pt-2 univer-transition-colors
[&>div:first-child]:univer-px-2.5
[&>div]:univer-h-5 [&>div]:univer-ring-transparent
- dark:univer-bg-gray-700 dark:univer-text-white
+ dark:!univer-bg-gray-700 dark:!univer-text-white
hover:univer-border-primary-600
`, borderClassName)}
errorText={formulaError}
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/HighlightCell.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/HighlightCell.tsx
index 97d328d8a5..6866b339e6 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/HighlightCell.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/HighlightCell.tsx
@@ -370,7 +370,7 @@ export const HighlightCellStyleEditor = (props: IStyleEditorProps<any, ITextHigh
<div
className={`
univer-mt-4 univer-text-sm univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{localeService.t('sheet.cf.panel.styleRule')}
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/IconSet.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/IconSet.tsx
index bc1ebebf8f..6ccb67899d 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/IconSet.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/IconSet.tsx
@@ -262,7 +262,7 @@ const IconSetRuleEdit = (props: {
className={`
univer-mt-3 univer-flex univer-items-center univer-justify-between univer-text-sm
univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
<div
@@ -279,7 +279,7 @@ const IconSetRuleEdit = (props: {
<span
className={`
univer-font-medium univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
(
@@ -308,7 +308,7 @@ const IconSetRuleEdit = (props: {
univer-box-border univer-flex univer-h-8 univer-w-full univer-items-center
univer-justify-between univer-rounded-md univer-bg-white univer-px-4 univer-py-2
univer-text-xs univer-text-gray-600 univer-transition-all
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
hover:univer-border-primary-600
`, borderClassName)}
>
@@ -335,7 +335,7 @@ const IconSetRuleEdit = (props: {
<div
className={`
univer-mt-0 univer-w-[45%] univer-text-sm univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{localeService.t('sheet.cf.iconSet.rule')}
@@ -355,7 +355,7 @@ const IconSetRuleEdit = (props: {
className={`
univer-mt-3 univer-flex univer-items-center univer-justify-between univer-gap-4
univer-text-sm univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
<div>
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Rank.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Rank.tsx
index f9bb7b0fd5..90d43cb4b3 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Rank.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Rank.tsx
@@ -144,7 +144,7 @@ export const RankStyleEditor = (props: IStyleEditorProps) => {
<div
className={`
univer-mt-4 univer-text-sm univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{localeService.t('sheet.cf.panel.styleRule')}
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/index.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/index.tsx
index baed53b370..3bb0d6d124 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/index.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/index.tsx
@@ -233,7 +233,7 @@ export const RuleEdit = (props: IRuleEditProps) => {
<div
className={`
univer-mt-4 univer-text-sm univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{localeService.t('sheet.cf.panel.range')}
@@ -251,7 +251,7 @@ export const RuleEdit = (props: IRuleEditProps) => {
<div
className={`
univer-mt-4 univer-text-sm univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{localeService.t('sheet.cf.panel.styleType')}
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.tsx
index 1b0d5f76d2..9096e21857 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.tsx
@@ -412,7 +412,7 @@ export const RuleList = (props: IRuleListProps) => {
<div
className={`
univer-text-sm univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
>
{getRuleDescribe(rule, localeService)}
diff --git a/packages/sheets-data-validation-ui/src/views/components/formula-input/CustomFormulaInput.tsx b/packages/sheets-data-validation-ui/src/views/components/formula-input/CustomFormulaInput.tsx
index 00477dd7fb..3e90f05253 100644
--- a/packages/sheets-data-validation-ui/src/views/components/formula-input/CustomFormulaInput.tsx
+++ b/packages/sheets-data-validation-ui/src/views/components/formula-input/CustomFormulaInput.tsx
@@ -41,7 +41,7 @@ export function CustomFormulaInput(props: IFormulaInputProps) {
univer-bg-white univer-pt-2 univer-transition-colors
[&>div:first-child]:univer-px-2.5
[&>div]:univer-h-5 [&>div]:univer-ring-transparent
- dark:univer-bg-gray-700 dark:univer-text-white
+ dark:!univer-bg-gray-700 dark:!univer-text-white
hover:univer-border-primary-600
`, borderClassName)}
initValue={value?.formula1 ?? '=' as any}
diff --git a/packages/sheets-data-validation-ui/src/views/components/formula-input/ListFormulaInput.tsx b/packages/sheets-data-validation-ui/src/views/components/formula-input/ListFormulaInput.tsx
index 338a65de7c..e8ce6887d3 100644
--- a/packages/sheets-data-validation-ui/src/views/components/formula-input/ListFormulaInput.tsx
+++ b/packages/sheets-data-validation-ui/src/views/components/formula-input/ListFormulaInput.tsx
@@ -107,7 +107,7 @@ const ColorSelect = (props: IColorSelectProps) => {
univer-box-border univer-inline-flex univer-h-8 univer-w-16 univer-cursor-pointer univer-items-center
univer-justify-between univer-gap-2 univer-rounded-lg univer-bg-white univer-px-2.5
univer-transition-colors univer-duration-200
- dark:univer-bg-gray-700 dark:univer-text-white
+ dark:!univer-bg-gray-700 dark:!univer-text-white
hover:univer-border-primary-600
`, borderClassName)}
>
@@ -361,7 +361,7 @@ export function ListFormulaInput(props: IFormulaInputProps) {
univer-rounded-lg univer-bg-white univer-pt-2 univer-transition-colors
[&>div:first-child]:univer-px-2.5
[&>div]:univer-h-5 [&>div]:univer-ring-transparent
- dark:univer-bg-gray-700 dark:univer-text-white
+ dark:!univer-bg-gray-700 dark:!univer-text-white
hover:univer-border-primary-600
`, borderClassName)}
initValue={formulaStr as any}
diff --git a/packages/sheets-data-validation-ui/src/views/components/item/index.tsx b/packages/sheets-data-validation-ui/src/views/components/item/index.tsx
index c36680573c..5ff4f2a8c9 100644
--- a/packages/sheets-data-validation-ui/src/views/components/item/index.tsx
+++ b/packages/sheets-data-validation-ui/src/views/components/item/index.tsx
@@ -82,7 +82,7 @@ export const DataValidationItem = (props: IDataValidationDetailProps) => {
univer-overflow-hidden univer-p-2 univer-pr-9
`,
{
- 'dark:hover:univer-bg-gray-700 hover:univer-bg-gray-50': !disable,
+ 'dark:hover:!univer-bg-gray-700 hover:univer-bg-gray-50': !disable,
'univer-opacity-50': disable,
}
)}
@@ -107,7 +107,7 @@ export const DataValidationItem = (props: IDataValidationDetailProps) => {
<div
className={`
univer-truncate univer-text-sm univer-font-medium univer-leading-[22px] univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
>
{validator?.generateRuleName(rule)}
@@ -115,7 +115,7 @@ export const DataValidationItem = (props: IDataValidationDetailProps) => {
<div
className={`
univer-text-secondary univer-truncate univer-text-xs univer-leading-[18px]
- dark:univer-text-gray-300
+ dark:!univer-text-gray-300
`}
>
{rule.ranges.map((range) => serializeRange(range)).join(',')}
@@ -126,7 +126,7 @@ export const DataValidationItem = (props: IDataValidationDetailProps) => {
className={`
univer-absolute univer-right-2 univer-top-[19px] univer-flex univer-h-5 univer-w-5
univer-items-center univer-justify-center univer-rounded
- dark:univer-text-gray-300 dark:hover:univer-bg-gray-700
+ dark:!univer-text-gray-300 dark:hover:!univer-bg-gray-700
hover:univer-bg-gray-200
`}
onClick={handleDelete}
diff --git a/packages/sheets-data-validation-ui/src/views/components/options/index.tsx b/packages/sheets-data-validation-ui/src/views/components/options/index.tsx
index bced44c879..52529a45bb 100644
--- a/packages/sheets-data-validation-ui/src/views/components/options/index.tsx
+++ b/packages/sheets-data-validation-ui/src/views/components/options/index.tsx
@@ -40,7 +40,7 @@ export function DataValidationOptions(props: IDataValidationOptionsParams) {
<div
className={`
univer-mb-3 univer-flex univer-cursor-pointer univer-items-center univer-text-sm univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
onClick={() => setShow(!show)}
>
diff --git a/packages/sheets-drawing-ui/src/views/sheet-image-panel/SheetDrawingAnchor.tsx b/packages/sheets-drawing-ui/src/views/sheet-image-panel/SheetDrawingAnchor.tsx
index 4102f3a71c..247d254d7c 100644
--- a/packages/sheets-drawing-ui/src/views/sheet-image-panel/SheetDrawingAnchor.tsx
+++ b/packages/sheets-drawing-ui/src/views/sheet-image-panel/SheetDrawingAnchor.tsx
@@ -143,7 +143,7 @@ export const SheetDrawingAnchor = (props: ISheetDrawingAnchorProps) => {
<header
className={`
univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
<div>{localeService.t('drawing-anchor.title')}</div>
diff --git a/packages/sheets-filter-ui/src/views/components/SheetsFilterByValuesPanel.tsx b/packages/sheets-filter-ui/src/views/components/SheetsFilterByValuesPanel.tsx
index 17417bffa1..118ee0bcb8 100644
--- a/packages/sheets-filter-ui/src/views/components/SheetsFilterByValuesPanel.tsx
+++ b/packages/sheets-filter-ui/src/views/components/SheetsFilterByValuesPanel.tsx
@@ -101,7 +101,7 @@ export function FilterByValue(props: { model: ByValuesModel }) {
className={`
univer-mx-1 univer-inline-block univer-flex-shrink univer-overflow-hidden
univer-text-ellipsis univer-whitespace-nowrap univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
>
{`${localeService.t('sheets-filter.panel.select-all')}`}
@@ -110,7 +110,7 @@ export function FilterByValue(props: { model: ByValuesModel }) {
data-u-comp="sheets-filter-panel-values-item-count"
className={`
univer-text-gray-400
- dark:univer-text-gray-500
+ dark:!univer-text-gray-500
`}
>
{`(${stat.checked}/${stat.checked + stat.unchecked})`}
@@ -132,8 +132,8 @@ export function FilterByValue(props: { model: ByValuesModel }) {
univer-pr-2 univer-border-box univer-max-w-[245px] univer-rounded-md
[&:hover_a]:univer-inline-block
hover:univer-bg-gray-50 univer-h-full
- univer-text-gray-900 dark:hover:univer-bg-gray-900
- dark:univer-text-white
+ univer-text-gray-900 dark:hover:!univer-bg-gray-900
+ dark:!univer-text-white
`}
attachRender={(item) => (
<div
@@ -146,7 +146,7 @@ export function FilterByValue(props: { model: ByValuesModel }) {
data-u-comp="sheets-filter-panel-values-item-count"
className={`
univer-text-gray-400
- dark:univer-text-gray-500
+ dark:!univer-text-gray-500
`}
>
{`(${item.count})`}
diff --git a/packages/sheets-filter-ui/src/views/components/SheetsFilterPanel.tsx b/packages/sheets-filter-ui/src/views/components/SheetsFilterPanel.tsx
index 852712c895..6935fd0f40 100644
--- a/packages/sheets-filter-ui/src/views/components/SheetsFilterPanel.tsx
+++ b/packages/sheets-filter-ui/src/views/components/SheetsFilterPanel.tsx
@@ -74,7 +74,7 @@ export function FilterPanel() {
className={`
univer-box-border univer-flex univer-h-[432px] univer-w-[312px] univer-flex-col univer-rounded-lg
univer-bg-white univer-p-4 univer-shadow-lg
- dark:univer-border-gray-600 dark:univer-bg-gray-700
+ dark:!univer-border-gray-600 dark:!univer-bg-gray-700
`}
>
<ComponentContainer
diff --git a/packages/sheets-formula-ui/src/views/formula-editor/help-function/HelpFunction.tsx b/packages/sheets-formula-ui/src/views/formula-editor/help-function/HelpFunction.tsx
index 04341468ee..ceac10cc5d 100644
--- a/packages/sheets-formula-ui/src/views/formula-editor/help-function/HelpFunction.tsx
+++ b/packages/sheets-formula-ui/src/views/formula-editor/help-function/HelpFunction.tsx
@@ -38,7 +38,7 @@ const Params = ({ className, title, value }: IParamsProps) => (
<div
className={clsx(`
univer-mb-2 univer-text-sm univer-font-medium univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`, className)}
>
{title}
@@ -136,7 +136,7 @@ export function HelpFunction(props: IHelpFunctionProps) {
className={clsx(`
univer-box-border univer-flex univer-items-center univer-justify-between univer-px-4
univer-py-3 univer-text-xs univer-font-medium univer-text-gray-900 univer-wrap-anywhere
- dark:univer-text-white
+ dark:!univer-text-white
`, borderTopClassName)}
>
<Help
@@ -165,7 +165,7 @@ export function HelpFunction(props: IHelpFunctionProps) {
univer-items-center univer-justify-center univer-rounded univer-bg-transparent
univer-p-0 univer-text-xs univer-text-gray-600 univer-outline-none
univer-transition-colors
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
hover:univer-bg-gray-300
`}
onClick={onClose}
diff --git a/packages/sheets-formula-ui/src/views/formula-editor/search-function/SearchFunction.tsx b/packages/sheets-formula-ui/src/views/formula-editor/search-function/SearchFunction.tsx
index 1ce4e10019..fd77bd2995 100644
--- a/packages/sheets-formula-ui/src/views/formula-editor/search-function/SearchFunction.tsx
+++ b/packages/sheets-formula-ui/src/views/formula-editor/search-function/SearchFunction.tsx
@@ -208,9 +208,9 @@ function SearchFunctionFactory(props: ISearchFunctionProps, ref: any) {
className={clsx(`
univer-box-border univer-cursor-pointer univer-rounded univer-px-2 univer-py-1
univer-text-gray-900 univer-transition-colors
- dark:univer-text-white
+ dark:!univer-text-white
`, {
- 'univer-bg-gray-200 dark:univer-bg-gray-600': active === index,
+ 'univer-bg-gray-200 dark:!univer-bg-gray-600': active === index,
})}
onMouseEnter={() => handleLiMouseEnter(index)}
onMouseLeave={handleLiMouseLeave}
diff --git a/packages/sheets-formula-ui/src/views/more-functions/function-params/FunctionParams.tsx b/packages/sheets-formula-ui/src/views/more-functions/function-params/FunctionParams.tsx
index 3c28024bb7..652d1168b3 100644
--- a/packages/sheets-formula-ui/src/views/more-functions/function-params/FunctionParams.tsx
+++ b/packages/sheets-formula-ui/src/views/more-functions/function-params/FunctionParams.tsx
@@ -37,7 +37,7 @@ export function FunctionParams(props: IParamsProps) {
<div
className={`
univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
>
{value}
diff --git a/packages/sheets-formula-ui/src/views/more-functions/select-function/SelectFunction.tsx b/packages/sheets-formula-ui/src/views/more-functions/select-function/SelectFunction.tsx
index 24381d965d..c50ad38765 100644
--- a/packages/sheets-formula-ui/src/views/more-functions/select-function/SelectFunction.tsx
+++ b/packages/sheets-formula-ui/src/views/more-functions/select-function/SelectFunction.tsx
@@ -175,7 +175,7 @@ export function SelectFunction(props: ISelectFunctionProps) {
className={clsx(`
univer-relative univer-box-border univer-cursor-pointer univer-rounded univer-px-7 univer-py-1
univer-text-sm univer-text-gray-900 univer-transition-colors
- dark:univer-text-white
+ dark:!univer-text-white
`, {
'univer-bg-gray-200': active === index,
})}
diff --git a/packages/sheets-formula-ui/src/views/range-selector/index.tsx b/packages/sheets-formula-ui/src/views/range-selector/index.tsx
index 040aaf0e92..815256682a 100644
--- a/packages/sheets-formula-ui/src/views/range-selector/index.tsx
+++ b/packages/sheets-formula-ui/src/views/range-selector/index.tsx
@@ -333,7 +333,7 @@ export function RangeSelector(props: IRangeSelectorProps) {
<SelectRangeSingle
className={`
univer-cursor-pointer
- dark:univer-text-gray-300
+ dark:!univer-text-gray-300
`}
onClick={handleOpenModal}
/>
diff --git a/packages/sheets-hyper-link-ui/src/views/CellLinkEdit/index.tsx b/packages/sheets-hyper-link-ui/src/views/CellLinkEdit/index.tsx
index 9e144dbedc..3c77a43e83 100644
--- a/packages/sheets-hyper-link-ui/src/views/CellLinkEdit/index.tsx
+++ b/packages/sheets-hyper-link-ui/src/views/CellLinkEdit/index.tsx
@@ -435,7 +435,7 @@ export const CellLinkEdit = () => {
<div
className={clsx(`
univer-box-border univer-w-[296px] univer-rounded-xl univer-bg-white univer-p-4 univer-shadow-md
- dark:univer-bg-gray-900
+ dark:!univer-bg-gray-900
`, borderClassName)}
>
{showLabel
diff --git a/packages/sheets-hyper-link-ui/src/views/CellLinkPopup/index.tsx b/packages/sheets-hyper-link-ui/src/views/CellLinkPopup/index.tsx
index 4d399676a3..bc391f3122 100644
--- a/packages/sheets-hyper-link-ui/src/views/CellLinkPopup/index.tsx
+++ b/packages/sheets-hyper-link-ui/src/views/CellLinkPopup/index.tsx
@@ -69,7 +69,7 @@ export const CellLinkPopupPure = (props: ICellLinkPopupPureProps) => {
className={clsx(`
univer-mb-1 univer-flex univer-max-w-80 univer-flex-row univer-items-center univer-justify-between
univer-overflow-hidden univer-rounded-lg univer-bg-white univer-p-3 univer-shadow-md
- dark:univer-bg-gray-900
+ dark:!univer-bg-gray-900
`, borderClassName)}
onClick={() => popupService.hideCurrentPopup()}
>
@@ -94,7 +94,7 @@ export const CellLinkPopupPure = (props: ICellLinkPopupPureProps) => {
className={`
univer-mr-2 univer-flex univer-h-5 univer-w-5 univer-flex-none univer-items-center
univer-justify-center univer-text-base univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
>
{iconsMap[linkObj.type]}
@@ -113,7 +113,7 @@ export const CellLinkPopupPure = (props: ICellLinkPopupPureProps) => {
className={clsx(`
univer-ml-2 univer-flex univer-size-6 univer-cursor-pointer univer-flex-row
univer-items-center univer-justify-center univer-rounded univer-text-base
- dark:hover:univer-bg-gray-700
+ dark:hover:!univer-bg-gray-700
hover:univer-bg-gray-100
`, { 'univer-text-red-500': isError })}
onClick={() => {
@@ -134,7 +134,7 @@ export const CellLinkPopupPure = (props: ICellLinkPopupPureProps) => {
}}
>
<Tooltip placement="bottom" title={localeService.t('hyperLink.popup.copy')}>
- <CopySingle className="dark:univer-text-white" />
+ <CopySingle className="dark:!univer-text-white" />
</Tooltip>
</div>
)}
@@ -144,7 +144,7 @@ export const CellLinkPopupPure = (props: ICellLinkPopupPureProps) => {
className={`
univer-ml-2 univer-flex univer-size-6 univer-cursor-pointer univer-flex-row
univer-items-center univer-justify-center univer-rounded univer-text-base
- dark:hover:univer-bg-gray-700
+ dark:hover:!univer-bg-gray-700
hover:univer-bg-gray-100
`}
onClick={() => {
@@ -159,14 +159,14 @@ export const CellLinkPopupPure = (props: ICellLinkPopupPureProps) => {
}}
>
<Tooltip placement="bottom" title={localeService.t('hyperLink.popup.edit')}>
- <WriteSingle className="dark:univer-text-white" />
+ <WriteSingle className="dark:!univer-text-white" />
</Tooltip>
</div>
<div
className={`
univer-ml-2 univer-flex univer-size-6 univer-cursor-pointer univer-flex-row
univer-items-center univer-justify-center univer-rounded univer-text-base
- dark:hover:univer-bg-gray-700
+ dark:hover:!univer-bg-gray-700
hover:univer-bg-gray-100
`}
onClick={() => {
@@ -186,7 +186,7 @@ export const CellLinkPopupPure = (props: ICellLinkPopupPureProps) => {
}}
>
<Tooltip placement="bottom" title={localeService.t('hyperLink.popup.cancel')}>
- <UnlinkSingle className="dark:univer-text-white" />
+ <UnlinkSingle className="dark:!univer-text-white" />
</Tooltip>
</div>
</>
diff --git a/packages/sheets-note-ui/src/views/note.tsx b/packages/sheets-note-ui/src/views/note.tsx
index e4605e8db6..e97dbd0ee4 100644
--- a/packages/sheets-note-ui/src/views/note.tsx
+++ b/packages/sheets-note-ui/src/views/note.tsx
@@ -123,7 +123,7 @@ export const SheetsNote = (props: { popup: IPopup<{ location: ISheetLocationBase
className={clsx(`
univer-resize-both univer-ml-px univer-rounded-md univer-bg-white univer-p-2 univer-text-gray-900
univer-shadow
- dark:univer-bg-gray-800 dark:univer-text-white
+ dark:!univer-bg-gray-800 dark:!univer-text-white
focus:univer-outline-none
`, borderClassName, scrollbarClassName)}
style={{ width: note.width, height: note.height }}
diff --git a/packages/sheets-numfmt-ui/src/views/components/CustomFormat.tsx b/packages/sheets-numfmt-ui/src/views/components/CustomFormat.tsx
index a945253940..3496d0813e 100644
--- a/packages/sheets-numfmt-ui/src/views/components/CustomFormat.tsx
+++ b/packages/sheets-numfmt-ui/src/views/components/CustomFormat.tsx
@@ -102,7 +102,7 @@ export function CustomFormat(props: IBusinessComponentProps) {
<div
className={`
univer-mt-3 univer-text-sm univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{localeService.t('sheet.numfmt.customFormatDes')}
diff --git a/packages/sheets-numfmt-ui/src/views/components/Date.tsx b/packages/sheets-numfmt-ui/src/views/components/Date.tsx
index e8319da4bc..e4e9459ab5 100644
--- a/packages/sheets-numfmt-ui/src/views/components/Date.tsx
+++ b/packages/sheets-numfmt-ui/src/views/components/Date.tsx
@@ -64,7 +64,7 @@ export const DatePanel: FC<IBusinessComponentProps> = (props) => {
<div
className={`
univer-mt-3.5 univer-text-sm/5 univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{t('sheet.numfmt.dateDes')}
diff --git a/packages/sheets-numfmt-ui/src/views/components/General.tsx b/packages/sheets-numfmt-ui/src/views/components/General.tsx
index c3862809f5..15fcc0421e 100644
--- a/packages/sheets-numfmt-ui/src/views/components/General.tsx
+++ b/packages/sheets-numfmt-ui/src/views/components/General.tsx
@@ -33,7 +33,7 @@ export const GeneralPanel: FC<IBusinessComponentProps> = (props) => {
<div
className={`
univer-mt-3.5 univer-text-sm/5 univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{t('sheet.numfmt.generalDes')}
diff --git a/packages/sheets-numfmt-ui/src/views/components/MoreNumfmtType.tsx b/packages/sheets-numfmt-ui/src/views/components/MoreNumfmtType.tsx
index 8dbf6dc0a1..922d580084 100644
--- a/packages/sheets-numfmt-ui/src/views/components/MoreNumfmtType.tsx
+++ b/packages/sheets-numfmt-ui/src/views/components/MoreNumfmtType.tsx
@@ -87,7 +87,7 @@ export const Options = () => {
className={`
univer-flex univer-h-7 univer-items-center univer-justify-between univer-gap-6 univer-rounded
univer-px-2 univer-text-sm
- dark:hover:univer-bg-gray-700
+ dark:hover:!univer-bg-gray-700
hover:univer-bg-gray-100
`}
onClick={() => {
diff --git a/packages/sheets-numfmt-ui/src/views/components/ThousandthPercentile.tsx b/packages/sheets-numfmt-ui/src/views/components/ThousandthPercentile.tsx
index 9615e101f5..8bd93b9f8f 100644
--- a/packages/sheets-numfmt-ui/src/views/components/ThousandthPercentile.tsx
+++ b/packages/sheets-numfmt-ui/src/views/components/ThousandthPercentile.tsx
@@ -77,7 +77,7 @@ export const ThousandthPercentilePanel: FC<IBusinessComponentProps> = (props) =>
<div
className={`
univer-mt-3.5 univer-text-sm/5 univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{localeService.t('sheet.numfmt.thousandthPercentileDes')}
diff --git a/packages/sheets-sort-ui/src/views/CustomSortPanel.tsx b/packages/sheets-sort-ui/src/views/CustomSortPanel.tsx
index f079062b4c..11b46fd717 100644
--- a/packages/sheets-sort-ui/src/views/CustomSortPanel.tsx
+++ b/packages/sheets-sort-ui/src/views/CustomSortPanel.tsx
@@ -281,7 +281,7 @@ export function SortOptionItem(props: ISortOptionItemProps) {
univer-ml-2 univer-flex univer-w-[236px] univer-items-center univer-justify-between
univer-overflow-hidden univer-rounded-md univer-border univer-border-gray-200
univer-px-2.5 univer-py-1.5 univer-text-sm univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
>
<span
diff --git a/packages/sheets-table-ui/src/views/components/SheetTableConditionPanel.tsx b/packages/sheets-table-ui/src/views/components/SheetTableConditionPanel.tsx
index a2113cc0b8..dc9831170a 100644
--- a/packages/sheets-table-ui/src/views/components/SheetTableConditionPanel.tsx
+++ b/packages/sheets-table-ui/src/views/components/SheetTableConditionPanel.tsx
@@ -110,7 +110,7 @@ export const SheetTableConditionPanel = (props: IConditionFilterProps) => {
univer-box-border univer-flex univer-h-8 univer-w-full univer-items-center univer-justify-between
univer-rounded-md univer-bg-white univer-px-2 univer-text-sm univer-transition-colors
univer-duration-200
- dark:univer-bg-gray-700 dark:univer-text-white
+ dark:!univer-bg-gray-700 dark:!univer-text-white
focus:univer-border-primary-600 focus:univer-outline-none focus:univer-ring-2
hover:univer-border-primary-600
`, borderClassName)}
diff --git a/packages/sheets-table-ui/src/views/components/SheetTableFilterPanel.tsx b/packages/sheets-table-ui/src/views/components/SheetTableFilterPanel.tsx
index a360a14375..4b13a750ed 100644
--- a/packages/sheets-table-ui/src/views/components/SheetTableFilterPanel.tsx
+++ b/packages/sheets-table-ui/src/views/components/SheetTableFilterPanel.tsx
@@ -148,7 +148,7 @@ export function SheetTableFilterPanel() {
className={`
univer-box-border univer-flex univer-w-[312px] univer-flex-col univer-rounded-[10px] univer-bg-white
univer-p-4 univer-shadow-lg
- dark:univer-border-gray-600 dark:univer-bg-gray-700
+ dark:!univer-border-gray-600 dark:!univer-bg-gray-700
`}
>
{editable && (
diff --git a/packages/sheets-ui/src/components/border-panel/BorderPanel.tsx b/packages/sheets-ui/src/components/border-panel/BorderPanel.tsx
index 9a25d9a02a..b63be58703 100644
--- a/packages/sheets-ui/src/components/border-panel/BorderPanel.tsx
+++ b/packages/sheets-ui/src/components/border-panel/BorderPanel.tsx
@@ -95,7 +95,7 @@ export function BorderPanel(props: IBorderPanelProps) {
<div
className={`
univer-box-border univer-grid univer-grid-cols-5 univer-gap-2 univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{BORDER_LINE_CHILDREN.map((item) => (
@@ -104,10 +104,10 @@ export function BorderPanel(props: IBorderPanelProps) {
className={clsx(`
univer-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center
univer-justify-self-center univer-rounded
- dark:hover:univer-bg-gray-700
+ dark:hover:!univer-bg-gray-700
hover:univer-bg-gray-100
`, {
- 'univer-bg-gray-200 dark:univer-bg-gray-600': borderStyleManagerService.getBorderInfo().type === item.value,
+ 'univer-bg-gray-200 dark:!univer-bg-gray-600': borderStyleManagerService.getBorderInfo().type === item.value,
})}
onClick={(e) => {
e.stopPropagation();
@@ -134,7 +134,7 @@ export function BorderPanel(props: IBorderPanelProps) {
className={`
univer-flex univer-cursor-pointer univer-items-center univer-gap-2 univer-rounded
univer-border-none univer-bg-transparent univer-p-1
- dark:hover:univer-bg-gray-700
+ dark:hover:!univer-bg-gray-700
hover:univer-bg-gray-100
`}
type="button"
@@ -142,7 +142,7 @@ export function BorderPanel(props: IBorderPanelProps) {
<PaintBucket
className={`
univer-fill-primary-600
- dark:univer-text-white
+ dark:!univer-text-white
`}
extend={{ colorChannel1: value?.color ?? '' }}
/>
@@ -162,7 +162,7 @@ export function BorderPanel(props: IBorderPanelProps) {
className={`
univer-flex univer-cursor-pointer univer-items-center
univer-justify-center univer-rounded univer-px-1 univer-py-2
- dark:hover:univer-bg-gray-700
+ dark:hover:!univer-bg-gray-700
hover:univer-bg-gray-100
`}
onClick={() => handleClick(item.value, 'style')}
@@ -170,7 +170,7 @@ export function BorderPanel(props: IBorderPanelProps) {
<BorderLine
className={`
univer-fill-gray-900
- dark:univer-fill-white
+ dark:!univer-fill-white
`}
type={item.value}
/>
@@ -184,7 +184,7 @@ export function BorderPanel(props: IBorderPanelProps) {
className={`
univer-flex univer-cursor-pointer univer-items-center univer-gap-2 univer-rounded
univer-border-none univer-bg-transparent univer-p-1
- dark:hover:univer-bg-gray-700
+ dark:hover:!univer-bg-gray-700
hover:univer-bg-gray-100
`}
type="button"
@@ -192,7 +192,7 @@ export function BorderPanel(props: IBorderPanelProps) {
<BorderLine
className={`
univer-fill-gray-900
- dark:univer-fill-white
+ dark:!univer-fill-white
`}
type={BorderStyleTypes.THIN}
/>
diff --git a/packages/sheets-ui/src/views/auto-fill-popup-menu/AutoFillPopupMenu.tsx b/packages/sheets-ui/src/views/auto-fill-popup-menu/AutoFillPopupMenu.tsx
index 77916ee8d4..68ba1fb1b9 100644
--- a/packages/sheets-ui/src/views/auto-fill-popup-menu/AutoFillPopupMenu.tsx
+++ b/packages/sheets-ui/src/views/auto-fill-popup-menu/AutoFillPopupMenu.tsx
@@ -201,20 +201,20 @@ export const AutoFillPopupMenu: React.FC<{}> = () => {
<div
className={clsx(`
univer-flex univer-items-center univer-gap-2 univer-rounded univer-p-1
- dark:hover:univer-bg-gray-800
+ dark:hover:!univer-bg-gray-800
hover:univer-bg-gray-100
`, borderClassName, {
- 'univer-bg-gray-100 dark:univer-bg-gray-800': visible,
- 'univer-bg-white dark:univer-bg-gray-900': !visible,
+ 'univer-bg-gray-100 dark:!univer-bg-gray-800': visible,
+ 'univer-bg-white dark:!univer-bg-gray-900': !visible,
})}
>
<Autofill
className={`
univer-fill-primary-600 univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
/>
- {showMore && <MoreDownSingle className="dark:univer-text-white" />}
+ {showMore && <MoreDownSingle className="dark:!univer-text-white" />}
</div>
</DropdownMenu>
</div>
diff --git a/packages/sheets-ui/src/views/cell-alert/CellAlertPopup.tsx b/packages/sheets-ui/src/views/cell-alert/CellAlertPopup.tsx
index 23007406ca..54f5cae2fc 100644
--- a/packages/sheets-ui/src/views/cell-alert/CellAlertPopup.tsx
+++ b/packages/sheets-ui/src/views/cell-alert/CellAlertPopup.tsx
@@ -43,7 +43,7 @@ export function CellAlert({ popup }: { popup: ICanvasPopup }) {
className={`
univer-z-[100] univer-box-border univer-w-[156px] univer-rounded-lg univer-bg-white univer-px-2
univer-py-1 univer-text-gray-900 univer-shadow
- dark:univer-bg-black dark:univer-text-white
+ dark:!univer-bg-black dark:!univer-text-white
`}
>
<div
diff --git a/packages/sheets-ui/src/views/clipboard/ClipboardPopupMenu.tsx b/packages/sheets-ui/src/views/clipboard/ClipboardPopupMenu.tsx
index f14ccfd020..8e012c420f 100644
--- a/packages/sheets-ui/src/views/clipboard/ClipboardPopupMenu.tsx
+++ b/packages/sheets-ui/src/views/clipboard/ClipboardPopupMenu.tsx
@@ -160,20 +160,20 @@ export const ClipboardPopupMenu = () => {
<div
className={clsx(`
univer-flex univer-items-center univer-gap-2 univer-rounded univer-p-1
- dark:hover:univer-bg-gray-800
+ dark:hover:!univer-bg-gray-800
hover:univer-bg-gray-100
`, borderClassName, {
- 'univer-bg-gray-100 dark:univer-bg-gray-800': visible,
- 'univer-bg-white dark:univer-bg-gray-900': !visible,
+ 'univer-bg-gray-100 dark:!univer-bg-gray-800': visible,
+ 'univer-bg-white dark:!univer-bg-gray-900': !visible,
})}
>
<PasteSpecial
className={`
univer-fill-primary-600 univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
/>
- {showMore && <MoreDownSingle className="dark:univer-text-white" />}
+ {showMore && <MoreDownSingle className="dark:!univer-text-white" />}
</div>
</DropdownMenu>
</div>
diff --git a/packages/sheets-ui/src/views/defined-name/DefinedName.tsx b/packages/sheets-ui/src/views/defined-name/DefinedName.tsx
index d9bf237fe9..4e9be562f2 100644
--- a/packages/sheets-ui/src/views/defined-name/DefinedName.tsx
+++ b/packages/sheets-ui/src/views/defined-name/DefinedName.tsx
@@ -52,7 +52,7 @@ export function DefinedName({ disable }: { disable: boolean }) {
className={clsx(`
univer-box-border univer-h-full univer-w-full univer-appearance-none univer-px-1.5
univer-text-gray-900
- dark:univer-border-r-gray-700 dark:univer-bg-gray-900 dark:univer-text-white
+ dark:!univer-border-r-gray-700 dark:!univer-bg-gray-900 dark:!univer-text-white
focus:univer-outline-none
`, borderRightClassName, {
'univer-cursor-not-allowed': disable,
@@ -74,10 +74,10 @@ export function DefinedName({ disable }: { disable: boolean }) {
className={clsx(`
univer-absolute univer-right-0 univer-top-0 univer-flex univer-h-full univer-cursor-pointer
univer-items-center univer-justify-center univer-px-1 univer-transition-colors univer-duration-200
- dark:univer-text-white dark:hover:univer-bg-gray-800
+ dark:!univer-text-white dark:hover:!univer-bg-gray-800
hover:univer-bg-gray-100
`, {
- 'univer-cursor-not-allowed univer-text-gray-300 dark:univer-text-gray-700 hover:univer-bg-transparent': disable,
+ 'univer-cursor-not-allowed univer-text-gray-300 dark:!univer-text-gray-700 hover:univer-bg-transparent': disable,
})}
>
<MoreDownSingle />
diff --git a/packages/sheets-ui/src/views/defined-name/DefinedNameContainer.tsx b/packages/sheets-ui/src/views/defined-name/DefinedNameContainer.tsx
index 1d07d40236..03f079cf77 100644
--- a/packages/sheets-ui/src/views/defined-name/DefinedNameContainer.tsx
+++ b/packages/sheets-ui/src/views/defined-name/DefinedNameContainer.tsx
@@ -211,7 +211,7 @@ export const DefinedNameContainer = () => {
key={index}
className={`
univer-divide-x-0 univer-divide-y univer-divide-solid univer-divide-gray-200
- dark:univer-divide-gray-600
+ dark:!univer-divide-gray-600
`}
>
<div
@@ -220,7 +220,7 @@ export const DefinedNameContainer = () => {
`
univer-relative univer-flex univer-cursor-default univer-select-none
univer-items-center univer-justify-between univer-rounded-md univer-p-2
- dark:hover:univer-bg-gray-700
+ dark:hover:!univer-bg-gray-700
hover:univer-bg-gray-50
`,
{ 'univer-hidden': definedName.id === editorKey }
@@ -231,7 +231,7 @@ export const DefinedNameContainer = () => {
className={`
univer-my-1 univer-max-h-[100px] univer-max-w-[190px] univer-overflow-hidden
univer-text-sm univer-font-medium univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
>
{definedName.name}
diff --git a/packages/sheets-ui/src/views/defined-name/DefinedNameInput.tsx b/packages/sheets-ui/src/views/defined-name/DefinedNameInput.tsx
index e931415698..6a8f2e0e45 100644
--- a/packages/sheets-ui/src/views/defined-name/DefinedNameInput.tsx
+++ b/packages/sheets-ui/src/views/defined-name/DefinedNameInput.tsx
@@ -252,7 +252,7 @@ export const DefinedNameInput = (props: IDefinedNameInputProps) => {
univer-rounded-lg univer-bg-white univer-pt-2 univer-transition-colors
[&>div:first-child]:univer-px-2.5
[&>div]:univer-h-5 [&>div]:univer-ring-transparent
- dark:univer-bg-gray-700 dark:univer-text-white
+ dark:!univer-bg-gray-700 dark:!univer-text-white
hover:univer-border-primary-600
`, borderClassName)}
initValue={formulaOrRefStringValue as any}
diff --git a/packages/sheets-ui/src/views/defined-name/DefinedNameOverlay.tsx b/packages/sheets-ui/src/views/defined-name/DefinedNameOverlay.tsx
index b1735257e7..0bc7cd98e5 100644
--- a/packages/sheets-ui/src/views/defined-name/DefinedNameOverlay.tsx
+++ b/packages/sheets-ui/src/views/defined-name/DefinedNameOverlay.tsx
@@ -103,7 +103,7 @@ export function DefinedNameOverlay() {
key={index}
className={`
univer-cursor-pointer univer-px-2 univer-transition-colors univer-duration-200
- dark:hover:univer-bg-gray-600
+ dark:hover:!univer-bg-gray-600
hover:univer-bg-gray-100
`}
onClick={() => { focusDefinedName(definedName); }}
@@ -117,7 +117,7 @@ export function DefinedNameOverlay() {
className={`
univer-w-[50%] univer-flex-shrink-0 univer-overflow-hidden univer-text-ellipsis
univer-whitespace-nowrap univer-text-sm univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
title={definedName.name}
>
@@ -141,7 +141,7 @@ export function DefinedNameOverlay() {
<div
className={`
univer-cursor-pointer univer-p-2 univer-transition-colors univer-duration-200
- dark:hover:univer-bg-gray-600
+ dark:hover:!univer-bg-gray-600
hover:univer-bg-gray-100
`}
onClick={openSlider}
@@ -149,7 +149,7 @@ export function DefinedNameOverlay() {
<div
className={`
univer-mb-2 univer-text-sm univer-font-semibold univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{localeService.t('definedName.managerTitle')}
diff --git a/packages/sheets-ui/src/views/dropdown/date-dropdown/index.tsx b/packages/sheets-ui/src/views/dropdown/date-dropdown/index.tsx
index 2a3258887e..17b2c38cd9 100644
--- a/packages/sheets-ui/src/views/dropdown/date-dropdown/index.tsx
+++ b/packages/sheets-ui/src/views/dropdown/date-dropdown/index.tsx
@@ -49,7 +49,7 @@ export function DateDropdown(props: { popup: IPopup<IDateDropdownProps & IBaseDr
<div
className={`
univer-rounded univer-bg-white univer-p-2 univer-shadow-lg
- dark:univer-bg-black
+ dark:!univer-bg-black
`}
>
<DatePanel
diff --git a/packages/sheets-ui/src/views/dropdown/list-dropdown/index.tsx b/packages/sheets-ui/src/views/dropdown/list-dropdown/index.tsx
index f093d2c51c..1080056a70 100644
--- a/packages/sheets-ui/src/views/dropdown/list-dropdown/index.tsx
+++ b/packages/sheets-ui/src/views/dropdown/list-dropdown/index.tsx
@@ -72,7 +72,7 @@ const SelectList = (props: ISelectListProps) => {
data-u-comp="sheets-dropdown-list"
className={clsx(`
univer-box-border univer-rounded-lg univer-bg-white univer-pb-1 univer-text-gray-900 univer-shadow
- dark:univer-bg-black dark:univer-text-white
+ dark:!univer-bg-black dark:!univer-text-white
`, borderClassName)}
style={style}
>
@@ -111,7 +111,7 @@ const SelectList = (props: ISelectListProps) => {
className={`
univer-mt-1 univer-flex univer-cursor-pointer univer-flex-row univer-items-center
univer-justify-between univer-rounded-md univer-px-1.5 univer-py-1
- dark:hover:univer-bg-gray-700
+ dark:hover:!univer-bg-gray-700
hover:univer-bg-gray-50
`}
onClick={handleClick}
@@ -151,7 +151,7 @@ const SelectList = (props: ISelectListProps) => {
<div
className={`
univer-my-1 univer-h-[1px] univer-flex-shrink-0 univer-flex-grow-0 univer-bg-gray-200
- dark:univer-bg-gray-700
+ dark:!univer-bg-gray-700
`}
/>
<div
@@ -161,7 +161,7 @@ const SelectList = (props: ISelectListProps) => {
className={`
univer-block univer-cursor-pointer univer-rounded univer-px-1.5 univer-py-1
univer-text-xs
- dark:hover:univer-bg-gray-700
+ dark:hover:!univer-bg-gray-700
hover:univer-bg-gray-200
`}
onClick={onEdit}
diff --git a/packages/sheets-ui/src/views/editor-container/EditorContainer.tsx b/packages/sheets-ui/src/views/editor-container/EditorContainer.tsx
index 94993eadf6..4745e55e4f 100644
--- a/packages/sheets-ui/src/views/editor-container/EditorContainer.tsx
+++ b/packages/sheets-ui/src/views/editor-container/EditorContainer.tsx
@@ -141,7 +141,7 @@ export const EditorContainer: React.FC<ICellIEditorProps> = () => {
className={clsx(`
univer-absolute univer-left-[100px] univer-top-[200px] univer-z-10 univer-flex univer-h-[50px]
univer-w-[100px]
- dark:univer-bg-gray-700
+ dark:!univer-bg-gray-700
`, borderClassName)}
style={{
left: state.left,
diff --git a/packages/sheets-ui/src/views/formula-bar/FormulaBar.tsx b/packages/sheets-ui/src/views/formula-bar/FormulaBar.tsx
index f8d49ffec3..7b68420476 100644
--- a/packages/sheets-ui/src/views/formula-bar/FormulaBar.tsx
+++ b/packages/sheets-ui/src/views/formula-bar/FormulaBar.tsx
@@ -256,7 +256,7 @@ export function FormulaBar(props: IProps) {
data-u-comp="formula-bar"
className={clsx(`
univer-box-border univer-flex univer-h-7 univer-bg-white univer-transition-[height] univer-ease-linear
- dark:univer-bg-gray-900
+ dark:!univer-bg-gray-900
`, borderBottomClassName, className)}
style={{
height: ArrowDirection.Down === arrowDirection ? '28px' : '82px',
@@ -280,9 +280,9 @@ export function FormulaBar(props: IProps) {
className={clsx(`
univer-flex univer-items-center univer-justify-center univer-rounded univer-p-1
univer-text-base
- dark:univer-text-white
+ dark:!univer-text-white
`, {
- 'univer-cursor-pointer univer-text-green-600 dark:univer-text-green-400 dark:hover:univer-bg-gray-700 hover:univer-bg-gray-100': iconActivated,
+ 'univer-cursor-pointer univer-text-green-600 dark:!univer-text-green-400 dark:hover:!univer-bg-gray-700 hover:univer-bg-gray-100': iconActivated,
})}
onClick={handleCloseBtnClick}
>
@@ -292,9 +292,9 @@ export function FormulaBar(props: IProps) {
className={clsx(`
univer-flex univer-items-center univer-justify-center univer-rounded univer-p-1
univer-text-base
- dark:univer-text-white
+ dark:!univer-text-white
`, {
- 'univer-cursor-pointer univer-text-red-600 dark:univer-text-red-400 dark:hover:univer-bg-gray-700 hover:univer-bg-gray-100': iconActivated,
+ 'univer-cursor-pointer univer-text-red-600 dark:!univer-text-red-400 dark:hover:!univer-bg-gray-700 hover:univer-bg-gray-100': iconActivated,
})}
onClick={handleConfirmBtnClick}
>
@@ -304,7 +304,7 @@ export function FormulaBar(props: IProps) {
className={clsx(`
univer-flex univer-cursor-pointer univer-items-center univer-justify-center univer-rounded
univer-p-1 univer-text-base
- dark:univer-text-white dark:hover:univer-bg-gray-700
+ dark:!univer-text-white dark:hover:!univer-bg-gray-700
hover:univer-bg-gray-100
`)}
onClick={handlerFxBtnClick}
@@ -370,8 +370,8 @@ export function FormulaBar(props: IProps) {
className={clsx(`
univer-flex univer-h-full univer-w-5 univer-cursor-pointer univer-items-center
univer-justify-center univer-text-xs univer-text-gray-700
- dark:univer-text-gray-200
- `, { 'univer-cursor-not-allowed univer-text-gray-200 dark:univer-text-gray-700': editDisable })}
+ dark:!univer-text-gray-200
+ `, { 'univer-cursor-not-allowed univer-text-gray-200 dark:!univer-text-gray-700': editDisable })}
onClick={handleArrowClick}
>
{arrowDirection === ArrowDirection.Down
diff --git a/packages/sheets-ui/src/views/mobile/sheet-bar/MobileSheetBar.tsx b/packages/sheets-ui/src/views/mobile/sheet-bar/MobileSheetBar.tsx
index 0f7c4460b5..db1a78938d 100644
--- a/packages/sheets-ui/src/views/mobile/sheet-bar/MobileSheetBar.tsx
+++ b/packages/sheets-ui/src/views/mobile/sheet-bar/MobileSheetBar.tsx
@@ -109,7 +109,7 @@ function MobileSheetBarImpl(props: { workbook: Workbook }) {
<div
className={`
univer-h-8 univer-w-full univer-overflow-x-scroll univer-bg-gray-100
- dark:univer-bg-gray-900
+ dark:!univer-bg-gray-900
`}
>
<div className="univer-flex univer-h-8 univer-flex-nowrap univer-items-center">
@@ -127,7 +127,7 @@ function MobileSheetBarImpl(props: { workbook: Workbook }) {
`,
borderRightClassName,
{
- 'univer-bg-white univer-text-primary-600 dark:univer-bg-slate-600': sheet.sheetId === activeKey,
+ 'univer-bg-white univer-text-primary-600 dark:!univer-bg-slate-600': sheet.sheetId === activeKey,
}
)}
key={sheet.sheetId}
diff --git a/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailUserPart.tsx b/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailUserPart.tsx
index 1743f16fff..f4e32e30f4 100644
--- a/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailUserPart.tsx
+++ b/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailUserPart.tsx
@@ -136,7 +136,7 @@ export const PermissionDetailUserPart = (props: IPermissionDetailUserPartProps)
<span
className={`
univer-ml-1.5 univer-w-[130px] univer-truncate univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
>
{item.subject?.name}
diff --git a/packages/sheets-ui/src/views/permission/panel-list/index.tsx b/packages/sheets-ui/src/views/permission/panel-list/index.tsx
index a56407b301..e2257cd5cf 100644
--- a/packages/sheets-ui/src/views/permission/panel-list/index.tsx
+++ b/packages/sheets-ui/src/views/permission/panel-list/index.tsx
@@ -340,7 +340,7 @@ export const SheetPermissionPanelList = () => {
<span
className={`
univer-h-4 univer-flex-grow univer-text-xs univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
>
{localeService.t('permission.panel.created')}
@@ -348,7 +348,7 @@ export const SheetPermissionPanelList = () => {
<span
className={`
univer-h-4 univer-text-xs univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
>
{editPermission ? `${localeService.t('permission.panel.iCanEdit')}` : `${localeService.t('permission.panel.iCanNotEdit')}`}
@@ -359,7 +359,7 @@ export const SheetPermissionPanelList = () => {
<span
className={`
univer-h-4 univer-flex-grow univer-text-xs univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
>
{localeService.t('permission.panel.viewPermission')}
@@ -367,7 +367,7 @@ export const SheetPermissionPanelList = () => {
<span
className={`
univer-h-4 univer-text-xs univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
>
{viewPermission ? `${localeService.t('permission.panel.iCanView')}` : `${localeService.t('permission.panel.iCanNotView')}`}
diff --git a/packages/sheets-ui/src/views/permission/spin/index.tsx b/packages/sheets-ui/src/views/permission/spin/index.tsx
index 0c03a27c5d..a2f8b546aa 100644
--- a/packages/sheets-ui/src/views/permission/spin/index.tsx
+++ b/packages/sheets-ui/src/views/permission/spin/index.tsx
@@ -32,7 +32,7 @@ const Spin = ({ loading, children }: ISpinProps) => {
className={`
univer-absolute -univer-bottom-0.5 -univer-left-0.5 -univer-right-0.5 -univer-top-0.5 univer-z-10
univer-flex univer-items-center univer-justify-center univer-bg-white univer-backdrop-blur
- dark:univer-bg-black
+ dark:!univer-bg-black
`}
>
<div
diff --git a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/SheetBarItem.tsx b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/SheetBarItem.tsx
index d584a63223..b1a1ce4c85 100644
--- a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/SheetBarItem.tsx
+++ b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/SheetBarItem.tsx
@@ -58,16 +58,16 @@ export function SheetBarItem(props: IBaseSheetBarProps) {
univer-mx-1 univer-box-border univer-flex univer-flex-grow univer-cursor-pointer univer-select-none
univer-flex-row univer-items-center univer-rounded univer-text-xs univer-text-gray-900
univer-transition-colors
- dark:univer-text-white
+ dark:!univer-text-white
`, currentSelected
? `
univer-flex univer-justify-center univer-bg-white univer-font-bold univer-text-primary-700
univer-shadow-sm univer-transition-shadow
- dark:univer-bg-gray-900
+ dark:!univer-bg-gray-900
`
: `
univer-font-medium
- dark:hover:univer-bg-gray-700
+ dark:hover:!univer-bg-gray-700
hover:univer-bg-gray-100
`)}
style={{
diff --git a/packages/sheets-ui/src/views/sheet-container/SheetContainer.tsx b/packages/sheets-ui/src/views/sheet-container/SheetContainer.tsx
index 75360d7e54..508ee79fe3 100644
--- a/packages/sheets-ui/src/views/sheet-container/SheetContainer.tsx
+++ b/packages/sheets-ui/src/views/sheet-container/SheetContainer.tsx
@@ -46,7 +46,7 @@ export function RenderSheetFooter() {
className={`
univer-box-border univer-flex univer-items-center univer-justify-between univer-bg-white univer-px-5
univer-text-gray-900
- dark:univer-bg-gray-900 dark:univer-text-gray-200
+ dark:!univer-bg-gray-900 dark:!univer-text-gray-200
`}
style={{
height: SHEET_FOOTER_BAR_HEIGHT,
diff --git a/packages/slides-ui/src/components/image-popup-menu/ImagePopupMenu.tsx b/packages/slides-ui/src/components/image-popup-menu/ImagePopupMenu.tsx
index a7bc654a52..45d7d7b568 100644
--- a/packages/slides-ui/src/components/image-popup-menu/ImagePopupMenu.tsx
+++ b/packages/slides-ui/src/components/image-popup-menu/ImagePopupMenu.tsx
@@ -110,20 +110,20 @@ export function SlideImagePopupMenu(props: IImagePopupMenuProps) {
<div
className={clsx(`
univer-flex univer-items-center univer-gap-2 univer-rounded univer-p-1
- dark:hover:univer-bg-gray-800
+ dark:hover:!univer-bg-gray-800
hover:univer-bg-gray-100
`, borderClassName, {
- 'univer-bg-gray-100 dark:univer-bg-gray-800': visible,
- 'univer-bg-white dark:univer-bg-gray-900': !visible,
+ 'univer-bg-gray-100 dark:!univer-bg-gray-800': visible,
+ 'univer-bg-white dark:!univer-bg-gray-900': !visible,
})}
>
<Autofill
className={`
univer-fill-primary-600 univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
/>
- {showMore && <MoreDownSingle className="dark:univer-text-white" />}
+ {showMore && <MoreDownSingle className="dark:!univer-text-white" />}
</div>
</Dropdown>
</div>
diff --git a/packages/slides-ui/src/components/panels/ArrangePanel.tsx b/packages/slides-ui/src/components/panels/ArrangePanel.tsx
index 89de15ba2f..73e047eb37 100644
--- a/packages/slides-ui/src/components/panels/ArrangePanel.tsx
+++ b/packages/slides-ui/src/components/panels/ArrangePanel.tsx
@@ -94,7 +94,7 @@ export default function ArrangePanel(props: IProps) {
<div
className={`
univer-w-full univer-text-left univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
<div>{localeService.t('image-panel.arrange.title')}</div>
diff --git a/packages/slides-ui/src/components/panels/FillPanel.tsx b/packages/slides-ui/src/components/panels/FillPanel.tsx
index 7f003fe988..add97b735c 100644
--- a/packages/slides-ui/src/components/panels/FillPanel.tsx
+++ b/packages/slides-ui/src/components/panels/FillPanel.tsx
@@ -88,7 +88,7 @@ export default function ArrangePanel(props: IProps) {
<div
className={`
univer-w-full univer-text-left univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
<div>{localeService.t('slide.panel.fill.title')}</div>
diff --git a/packages/slides-ui/src/components/panels/TransformPanel.tsx b/packages/slides-ui/src/components/panels/TransformPanel.tsx
index 4429307884..0bf81e05ea 100644
--- a/packages/slides-ui/src/components/panels/TransformPanel.tsx
+++ b/packages/slides-ui/src/components/panels/TransformPanel.tsx
@@ -187,7 +187,7 @@ export default function TransformPanel(props: IProps) {
<div
className={`
univer-w-full univer-text-left univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
<div>{localeService.t('image-panel.transform.title')}</div>
diff --git a/packages/thread-comment-ui/src/views/thread-comment-editor/index.tsx b/packages/thread-comment-ui/src/views/thread-comment-editor/index.tsx
index 64174288bc..f4c5d2a8e1 100644
--- a/packages/thread-comment-ui/src/views/thread-comment-editor/index.tsx
+++ b/packages/thread-comment-ui/src/views/thread-comment-editor/index.tsx
@@ -161,9 +161,9 @@ export const ThreadCommentSuggestion = ({ active, user }: { active: boolean; use
className={clsx(
`
univer-flex univer-items-center univer-text-sm univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`,
- { 'univer-bg-gray-50 dark:univer-bg-gray-900': active }
+ { 'univer-bg-gray-50 dark:!univer-bg-gray-900': active }
)}
>
<img
diff --git a/packages/thread-comment-ui/src/views/thread-comment-panel/index.tsx b/packages/thread-comment-ui/src/views/thread-comment-panel/index.tsx
index e3962a56eb..f2a3284338 100644
--- a/packages/thread-comment-ui/src/views/thread-comment-panel/index.tsx
+++ b/packages/thread-comment-ui/src/views/thread-comment-panel/index.tsx
@@ -247,7 +247,7 @@ export const ThreadCommentPanel = (props: IThreadCommentPanelProps) => {
className={`
univer-flex univer-flex-1 univer-flex-col univer-items-center univer-justify-center
univer-text-sm univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{localeService.t('threadCommentUI.panel.empty')}
diff --git a/packages/thread-comment-ui/src/views/thread-comment-tree/index.tsx b/packages/thread-comment-ui/src/views/thread-comment-tree/index.tsx
index 39ee3719dc..7cbc120e93 100644
--- a/packages/thread-comment-ui/src/views/thread-comment-tree/index.tsx
+++ b/packages/thread-comment-ui/src/views/thread-comment-tree/index.tsx
@@ -191,7 +191,7 @@ const ThreadCommentItem = (props: IThreadCommentItemProps) => {
<time
className={`
univer-mb-1 univer-text-xs/normal univer-text-gray-600
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{item.dT}
@@ -227,7 +227,7 @@ const ThreadCommentItem = (props: IThreadCommentItemProps) => {
<div
className={`
univer-text-sm univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
>
{transformDocument2TextNodes(item.text).map((paragraph, i) => (
@@ -359,7 +359,7 @@ export const ThreadCommentTree = (props: IThreadCommentTreeProps) => {
className={clsx(
`
univer-relative univer-box-border univer-rounded-md univer-bg-white univer-p-4
- dark:univer-bg-gray-900 dark:univer-text-white
+ dark:!univer-bg-gray-900 dark:!univer-text-white
`,
borderClassName,
{
@@ -418,7 +418,7 @@ export const ThreadCommentTree = (props: IThreadCommentTreeProps) => {
`
univer-ml-1 univer-inline-flex univer-h-6 univer-w-6 univer-cursor-pointer
univer-items-center univer-justify-center univer-rounded-[3px] univer-text-base
- dark:hover:univer-bg-gray-800
+ dark:hover:!univer-bg-gray-800
hover:univer-bg-gray-50
`,
{
@@ -436,7 +436,7 @@ export const ThreadCommentTree = (props: IThreadCommentTreeProps) => {
univer-ml-1 univer-inline-flex univer-h-6 univer-w-6 univer-cursor-pointer
univer-items-center univer-justify-center univer-rounded-[3px]
univer-text-base
- dark:hover:univer-bg-gray-800
+ dark:hover:!univer-bg-gray-800
hover:univer-bg-gray-50
`}
onClick={handleDeleteRoot}
diff --git a/packages/ui/src/components/menu/desktop/Menu.tsx b/packages/ui/src/components/menu/desktop/Menu.tsx
index 3f58980ced..ca5322380e 100644
--- a/packages/ui/src/components/menu/desktop/Menu.tsx
+++ b/packages/ui/src/components/menu/desktop/Menu.tsx
@@ -44,7 +44,7 @@ import { useScrollYOverContainer } from '../../hooks/layout';
import { UITinyMenuGroup } from './TinyMenuGroup';
const contentClassName = 'univer-inline-flex univer-gap-2 univer-items-center';
-const moreIconClassName = 'univer-size-3.5 univer-text-gray-900 dark:univer-text-white';
+const moreIconClassName = 'univer-size-3.5 univer-text-gray-900 dark:!univer-text-white';
/** @deprecated */
export interface IBaseMenuProps {
diff --git a/packages/ui/src/components/progress-bar/ProgressBar.tsx b/packages/ui/src/components/progress-bar/ProgressBar.tsx
index ed1c3482a5..09876c1ed9 100644
--- a/packages/ui/src/components/progress-bar/ProgressBar.tsx
+++ b/packages/ui/src/components/progress-bar/ProgressBar.tsx
@@ -112,7 +112,7 @@ export function ProgressBar(props: IProgressBarProps) {
<CloseSingle
className={`
univer-size-3.5
- dark:univer-text-white
+ dark:!univer-text-white
`}
/>
</button>
diff --git a/packages/ui/src/views/components/ribbon/Ribbon.tsx b/packages/ui/src/views/components/ribbon/Ribbon.tsx
index 8fb67e52cf..205af1d2b4 100644
--- a/packages/ui/src/views/components/ribbon/Ribbon.tsx
+++ b/packages/ui/src/views/components/ribbon/Ribbon.tsx
@@ -268,7 +268,7 @@ export function Ribbon(props: IRibbonProps) {
className={`
univer-box-border univer-flex univer-cursor-pointer univer-items-center
univer-gap-2.5 univer-rounded-lg univer-px-2 univer-py-1.5
- dark:hover:univer-bg-gray-700
+ dark:hover:!univer-bg-gray-700
hover:univer-bg-gray-100
`}
onClick={() => handleSelectTab(group)}
@@ -282,7 +282,7 @@ export function Ribbon(props: IRibbonProps) {
<Icon
className={`
univer-text-gray-500
- dark:univer-text-gray-300
+ dark:!univer-text-gray-300
`}
/>
</span>
@@ -290,7 +290,7 @@ export function Ribbon(props: IRibbonProps) {
<strong
className={`
univer-text-sm univer-font-semibold univer-text-gray-800
- dark:univer-text-gray-200
+ dark:!univer-text-gray-200
`}
>
{localeService.t(group.key)}
@@ -311,14 +311,14 @@ export function Ribbon(props: IRibbonProps) {
univer-mr-2 univer-flex univer-h-7 univer-cursor-pointer univer-items-center
univer-gap-1.5 univer-whitespace-nowrap !univer-rounded-full univer-bg-gray-700
univer-pl-3 univer-pr-2 univer-text-sm univer-text-white
- dark:univer-bg-gray-200 dark:univer-text-gray-800
+ dark:!univer-bg-gray-200 dark:!univer-text-gray-800
`}
>
{localeService.t(activatedTab)}
<MoreDownSingle
className={`
univer-text-gray-200
- dark:univer-text-gray-500
+ dark:!univer-text-gray-500
`}
/>
</a>
diff --git a/packages/ui/src/views/components/ribbon/ToolbarButton.tsx b/packages/ui/src/views/components/ribbon/ToolbarButton.tsx
index 45270d2a13..dd58f5cd56 100644
--- a/packages/ui/src/views/components/ribbon/ToolbarButton.tsx
+++ b/packages/ui/src/views/components/ribbon/ToolbarButton.tsx
@@ -90,12 +90,12 @@ export function ToolbarButton(props: IBaseToolbarButtonProps) {
univer-box-border univer-flex univer-h-6 univer-min-w-6 univer-cursor-pointer univer-items-center
univer-justify-center univer-rounded univer-border-none univer-bg-transparent univer-p-0
univer-text-gray-900 univer-outline-none univer-transition-colors univer-animate-in univer-fade-in
- dark:univer-text-white dark:hover:univer-bg-gray-700 dark:disabled:univer-text-gray-600
+ dark:!univer-text-white dark:hover:!univer-bg-gray-700 dark:disabled:!univer-text-gray-600
disabled:univer-cursor-not-allowed disabled:univer-text-gray-300 disabled:hover:univer-bg-transparent
hover:univer-bg-gray-100
`, {
'univer-px-2': noIcon,
- '!univer-bg-gray-200 dark:!univer-bg-gray-500': active,
+ '!univer-bg-gray-200 dark:!!univer-bg-gray-500': active,
})}
style={style}
disabled={disabled}
diff --git a/packages/ui/src/views/components/ribbon/ToolbarItem.tsx b/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
index 36c4687a55..3d79ba977b 100644
--- a/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
+++ b/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
@@ -110,21 +110,21 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenu
univer-group univer-relative univer-flex univer-h-6 univer-cursor-pointer univer-items-center
univer-rounded univer-pr-5 univer-text-sm univer-transition-colors univer-animate-in
univer-fade-in
- dark:hover:univer-bg-gray-700
+ dark:hover:!univer-bg-gray-700
hover:univer-bg-gray-100
`, {
- 'univer-text-gray-900 dark:univer-text-white': !disabled,
- 'univer-pointer-events-none univer-cursor-not-allowed univer-text-gray-300 dark:univer-text-gray-600': disabled,
+ 'univer-text-gray-900 dark:!univer-text-white': !disabled,
+ 'univer-pointer-events-none univer-cursor-not-allowed univer-text-gray-300 dark:!univer-text-gray-600': disabled,
})}
>
<div
className={clsx(`
univer-relative univer-z-[1] univer-flex univer-h-full univer-items-center univer-rounded-l
univer-px-1 univer-transition-colors
- dark:hover:univer-bg-gray-600
+ dark:hover:!univer-bg-gray-600
hover:univer-bg-gray-200
`, {
- 'univer-bg-gray-200 dark:univer-bg-gray-500': activated,
+ 'univer-bg-gray-200 dark:!univer-bg-gray-500': activated,
'univer-bg-gray-100': activated && disabled,
})}
onClick={handleClick}
@@ -151,11 +151,11 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenu
univer-absolute univer-right-0 univer-top-0 univer-box-border univer-flex univer-h-6
univer-w-5 univer-items-center univer-justify-center univer-rounded-r
univer-transition-colors
- dark:hover:univer-bg-gray-600
+ dark:hover:!univer-bg-gray-600
hover:univer-bg-gray-200
`, {
- 'univer-pointer-events-none univer-cursor-not-allowed univer-text-gray-300 dark:univer-text-gray-600': disabled,
- 'univer-bg-gray-200 dark:univer-bg-gray-500': activated,
+ 'univer-pointer-events-none univer-cursor-not-allowed univer-text-gray-300 dark:!univer-text-gray-600': disabled,
+ 'univer-bg-gray-200 dark:!univer-bg-gray-500': activated,
'univer-bg-gray-100': activated && disabled,
})}
data-disabled={disabled}
@@ -181,11 +181,11 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenu
univer-relative univer-flex univer-h-6 univer-cursor-pointer univer-items-center univer-gap-2
univer-whitespace-nowrap univer-rounded univer-px-1 univer-transition-colors univer-animate-in
univer-fade-in
- dark:hover:univer-bg-gray-700
+ dark:hover:!univer-bg-gray-700
hover:univer-bg-gray-100
`, {
- 'univer-text-gray-900 dark:univer-text-white': !disabled,
- 'univer-pointer-events-none univer-cursor-not-allowed univer-text-gray-300 dark:univer-text-gray-600': disabled,
+ 'univer-text-gray-900 dark:!univer-text-white': !disabled,
+ 'univer-pointer-events-none univer-cursor-not-allowed univer-text-gray-300 dark:!univer-text-gray-600': disabled,
'univer-bg-gray-200': activated,
'univer-bg-gray-100': activated && disabled,
})}
@@ -199,7 +199,7 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenu
/>
<div
className={clsx('univer-flex univer-h-full univer-items-center', {
- 'univer-pointer-events-none univer-cursor-not-allowed univer-text-gray-300 dark:univer-text-gray-600': disabled,
+ 'univer-pointer-events-none univer-cursor-not-allowed univer-text-gray-300 dark:!univer-text-gray-600': disabled,
})}
>
<MoreDownSingle />
diff --git a/packages/ui/src/views/components/shortcut-panel/ShortcutPanel.tsx b/packages/ui/src/views/components/shortcut-panel/ShortcutPanel.tsx
index 3f8178bc47..bfb86358ef 100644
--- a/packages/ui/src/views/components/shortcut-panel/ShortcutPanel.tsx
+++ b/packages/ui/src/views/components/shortcut-panel/ShortcutPanel.tsx
@@ -92,7 +92,7 @@ export function ShortcutPanel() {
<ul
className={`
univer-m-0 univer-list-none univer-p-0 univer-text-gray-900
- dark:univer-text-white
+ dark:!univer-text-white
`}
>
{shortcutItems.map((group) => (
diff --git a/packages/ui/src/views/components/sidebar/Sidebar.tsx b/packages/ui/src/views/components/sidebar/Sidebar.tsx
index 8907e32b39..90d8c8b66f 100644
--- a/packages/ui/src/views/components/sidebar/Sidebar.tsx
+++ b/packages/ui/src/views/components/sidebar/Sidebar.tsx
@@ -117,7 +117,7 @@ export function Sidebar() {
data-u-comp="sidebar"
className={clsx(`
univer-relative univer-h-full univer-bg-white
- dark:univer-bg-gray-900
+ dark:!univer-bg-gray-900
`, {
'univer-w-96 univer-translate-x-0': options?.visible,
'univer-w-0 univer-translate-x-full': !options?.visible,
@@ -136,7 +136,7 @@ export function Sidebar() {
univer-sticky univer-top-0 univer-z-10 univer-box-border univer-flex univer-items-center
univer-justify-between univer-bg-white univer-p-4 univer-pb-2 univer-text-base univer-font-medium
univer-text-gray-800
- dark:univer-bg-gray-900 dark:univer-text-white
+ dark:!univer-bg-gray-900 dark:!univer-text-white
`}
>
{options?.header}
@@ -154,7 +154,7 @@ export function Sidebar() {
<footer
className={`
univer-sticky univer-bottom-0 univer-box-border univer-bg-white univer-p-4
- dark:univer-bg-gray-900
+ dark:!univer-bg-gray-900
`}
>
{options.footer}
diff --git a/packages/ui/src/views/mobile-workbench/MobileWorkbench.tsx b/packages/ui/src/views/mobile-workbench/MobileWorkbench.tsx
index 4297d248ec..04e6b5f72b 100644
--- a/packages/ui/src/views/mobile-workbench/MobileWorkbench.tsx
+++ b/packages/ui/src/views/mobile-workbench/MobileWorkbench.tsx
@@ -103,7 +103,7 @@ export function MobileWorkbench(props: IUniverAppProps) {
data-u-comp="app-layout"
className={clsx(`
univer-relative univer-flex univer-h-full univer-min-h-0 univer-flex-col univer-bg-white
- dark:univer-bg-gray-800
+ dark:!univer-bg-gray-800
`, {
'univer-dark': darkMode,
})}
diff --git a/packages/ui/src/views/workbench/Workbench.tsx b/packages/ui/src/views/workbench/Workbench.tsx
index 826dd4f97f..c285c26444 100644
--- a/packages/ui/src/views/workbench/Workbench.tsx
+++ b/packages/ui/src/views/workbench/Workbench.tsx
@@ -138,7 +138,7 @@ export function DesktopWorkbenchContent(props: IUniverWorkbenchProps) {
data-u-comp="workbench-layout"
className={clsx(`
univer-flex univer-h-full univer-min-h-0 univer-flex-col univer-bg-white
- dark:univer-bg-gray-800
+ dark:!univer-bg-gray-800
`, {
'univer-dark': darkMode,
})}
@@ -192,7 +192,7 @@ export function DesktopWorkbenchContent(props: IUniverWorkbenchProps) {
<section
className={`
univer-relative univer-overflow-hidden
- dark:univer-bg-gray-900
+ dark:!univer-bg-gray-900
`}
ref={contentRef}
data-range-selector