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.

feat: support theme switcher (#5154)

白熱fdc527c97912
diff --git a/common/shared/package.json b/common/shared/package.json
index 7be2c6cf15..2d13ee3e26 100644
--- a/common/shared/package.json
+++ b/common/shared/package.json
@@ -25,7 +25,6 @@
},
"dependencies": {
"@typescript-eslint/parser": "^8.32.0",
- "@univerjs/themes": "workspace:*",
"@vitejs/plugin-react": "^4.4.1",
"@vitejs/plugin-vue": "^5.2.3",
"@vitest/coverage-istanbul": "^3.1.3",
diff --git a/common/shared/tailwind/tailwind.config.ts b/common/shared/tailwind/tailwind.config.ts
index 3b8a8f9c3f..5aba60402d 100644
--- a/common/shared/tailwind/tailwind.config.ts
+++ b/common/shared/tailwind/tailwind.config.ts
@@ -15,7 +15,6 @@
*/
import type { Config } from 'tailwindcss';
-import { defaultTheme } from '@univerjs/themes';
import scrollbar from 'tailwind-scrollbar';
import remToPx from 'tailwindcss-rem-to-px';
@@ -27,7 +26,142 @@ const config: Omit<Config, 'content'> = {
},
theme: {
extend: {
- colors: defaultTheme,
+ colors: {
+ white: 'var(--univer-white)',
+ black: 'var(--univer-black)',
+ primary: {
+ 50: 'var(--univer-primary-50)',
+ 100: 'var(--univer-primary-100)',
+ 200: 'var(--univer-primary-200)',
+ 300: 'var(--univer-primary-300)',
+ 400: 'var(--univer-primary-400)',
+ 500: 'var(--univer-primary-500)',
+ 600: 'var(--univer-primary-600)',
+ 700: 'var(--univer-primary-700)',
+ 800: 'var(--univer-primary-800)',
+ 900: 'var(--univer-primary-900)',
+ },
+ gray: {
+ 50: 'var(--univer-gray-50)',
+ 100: 'var(--univer-gray-100)',
+ 200: 'var(--univer-gray-200)',
+ 300: 'var(--univer-gray-300)',
+ 400: 'var(--univer-gray-400)',
+ 500: 'var(--univer-gray-500)',
+ 600: 'var(--univer-gray-600)',
+ 700: 'var(--univer-gray-700)',
+ 800: 'var(--univer-gray-800)',
+ 900: 'var(--univer-gray-900)',
+ },
+ blue: {
+ 50: 'var(--univer-blue-50)',
+ 100: 'var(--univer-blue-100)',
+ 200: 'var(--univer-blue-200)',
+ 300: 'var(--univer-blue-300)',
+ 400: 'var(--univer-blue-400)',
+ 500: 'var(--univer-blue-500)',
+ 600: 'var(--univer-blue-600)',
+ 700: 'var(--univer-blue-700)',
+ 800: 'var(--univer-blue-800)',
+ 900: 'var(--univer-blue-900)',
+ },
+ red: {
+ 50: 'var(--univer-red-50)',
+ 100: 'var(--univer-red-100)',
+ 200: 'var(--univer-red-200)',
+ 300: 'var(--univer-red-300)',
+ 400: 'var(--univer-red-400)',
+ 500: 'var(--univer-red-500)',
+ 600: 'var(--univer-red-600)',
+ 700: 'var(--univer-red-700)',
+ 800: 'var(--univer-red-800)',
+ 900: 'var(--univer-red-900)',
+ },
+ orange: {
+ 50: 'var(--univer-orange-50)',
+ 100: 'var(--univer-orange-100)',
+ 200: 'var(--univer-orange-200)',
+ 300: 'var(--univer-orange-300)',
+ 400: 'var(--univer-orange-400)',
+ 500: 'var(--univer-orange-500)',
+ 600: 'var(--univer-orange-600)',
+ 700: 'var(--univer-orange-700)',
+ 800: 'var(--univer-orange-800)',
+ 900: 'var(--univer-orange-900)',
+ },
+ yellow: {
+ 50: 'var(--univer-yellow-50)',
+ 100: 'var(--univer-yellow-100)',
+ 200: 'var(--univer-yellow-200)',
+ 300: 'var(--univer-yellow-300)',
+ 400: 'var(--univer-yellow-400)',
+ 500: 'var(--univer-yellow-500)',
+ 600: 'var(--univer-yellow-600)',
+ 700: 'var(--univer-yellow-700)',
+ 800: 'var(--univer-yellow-800)',
+ 900: 'var(--univer-yellow-900)',
+ },
+ green: {
+ 50: 'var(--univer-green-50)',
+ 100: 'var(--univer-green-100)',
+ 200: 'var(--univer-green-200)',
+ 300: 'var(--univer-green-300)',
+ 400: 'var(--univer-green-400)',
+ 500: 'var(--univer-green-500)',
+ 600: 'var(--univer-green-600)',
+ 700: 'var(--univer-green-700)',
+ 800: 'var(--univer-green-800)',
+ 900: 'var(--univer-green-900)',
+ },
+ jiqing: {
+ 50: 'var(--univer-jiqing-50)',
+ 100: 'var(--univer-jiqing-100)',
+ 200: 'var(--univer-jiqing-200)',
+ 300: 'var(--univer-jiqing-300)',
+ 400: 'var(--univer-jiqing-400)',
+ 500: 'var(--univer-jiqing-500)',
+ 600: 'var(--univer-jiqing-600)',
+ 700: 'var(--univer-jiqing-700)',
+ 800: 'var(--univer-jiqing-800)',
+ 900: 'var(--univer-jiqing-900)',
+ },
+ indigo: {
+ 50: 'var(--univer-indigo-50)',
+ 100: 'var(--univer-indigo-100)',
+ 200: 'var(--univer-indigo-200)',
+ 300: 'var(--univer-indigo-300)',
+ 400: 'var(--univer-indigo-400)',
+ 500: 'var(--univer-indigo-500)',
+ 600: 'var(--univer-indigo-600)',
+ 700: 'var(--univer-indigo-700)',
+ 800: 'var(--univer-indigo-800)',
+ 900: 'var(--univer-indigo-900)',
+ },
+ purple: {
+ 50: 'var(--univer-purple-50)',
+ 100: 'var(--univer-purple-100)',
+ 200: 'var(--univer-purple-200)',
+ 300: 'var(--univer-purple-300)',
+ 400: 'var(--univer-purple-400)',
+ 500: 'var(--univer-purple-500)',
+ 600: 'var(--univer-purple-600)',
+ 700: 'var(--univer-purple-700)',
+ 800: 'var(--univer-purple-800)',
+ 900: 'var(--univer-purple-900)',
+ },
+ pink: {
+ 50: 'var(--univer-pink-50)',
+ 100: 'var(--univer-pink-100)',
+ 200: 'var(--univer-pink-200)',
+ 300: 'var(--univer-pink-300)',
+ 400: 'var(--univer-pink-400)',
+ 500: 'var(--univer-pink-500)',
+ 600: 'var(--univer-pink-600)',
+ 700: 'var(--univer-pink-700)',
+ 800: 'var(--univer-pink-800)',
+ 900: 'var(--univer-pink-900)',
+ },
+ },
boxShadow: {
sm: '0px 1px 2px 0px rgba(30, 40, 77, 0.08)',
md: '0px 1px 6px -2px rgba(30, 40, 77, 0.08), 0px 2px 6px -1px rgba(30, 40, 77, 0.10)',
diff --git a/examples/src/sheets/main.ts b/examples/src/sheets/main.ts
index 396ffd95e1..e709ff214e 100644
--- a/examples/src/sheets/main.ts
+++ b/examples/src/sheets/main.ts
@@ -38,13 +38,13 @@ import { UniverSheetsBindingSourcePlugin } from '@univerjs/sheets-source-binding
import { UniverSheetTablePlugin } from '@univerjs/sheets-table';
import { UniverSheetsThreadCommentPlugin } from '@univerjs/sheets-thread-comment';
import { UniverSheetsUIPlugin } from '@univerjs/sheets-ui';
+
import { UniverSheetsZenEditorPlugin } from '@univerjs/sheets-zen-editor';
import { UniverUIPlugin } from '@univerjs/ui';
-
import { enUS, faIR, frFR, ruRU, viVN, zhCN, zhTW } from '../locales';
-import { UniverSheetsCustomMenuPlugin } from './custom-menu';
+import { UniverSheetsCustomMenuPlugin } from './custom-menu';
import ImportCSVButtonPlugin from './custom-plugin/import-csv-button';
import '@univerjs/sheets/facade';
import '@univerjs/ui/facade';
@@ -88,6 +88,7 @@ export const mockUser = {
function createNewInstance() {
// univer
const univer = new Univer({
+ // theme: greenTheme,
locales: {
[LocaleType.ZH_CN]: zhCN,
[LocaleType.EN_US]: enUS,
diff --git a/mockdata/package.json b/mockdata/package.json
index fe528d0b89..0066d632da 100644
--- a/mockdata/package.json
+++ b/mockdata/package.json
@@ -1,6 +1,6 @@
{
"name": "@univerjs/mockdata",
- "version": "0.6.6",
+ "version": "0.7.0-beta.0",
"private": true,
"description": "",
"author": "DreamNum <[email protected]>",
diff --git a/packages-experimental/debugger/package.json b/packages-experimental/debugger/package.json
index db18fde58a..02f944ffe6 100644
--- a/packages-experimental/debugger/package.json
+++ b/packages-experimental/debugger/package.json
@@ -1,6 +1,6 @@
{
"name": "@univerjs/debugger",
- "version": "0.6.6",
+ "version": "0.7.0-beta.0",
"private": true,
"description": "",
"author": "DreamNum <[email protected]>",
diff --git a/packages-experimental/sheets-source-binding/package.json b/packages-experimental/sheets-source-binding/package.json
index f5b881e162..1b3a9dce5e 100644
--- a/packages-experimental/sheets-source-binding/package.json
+++ b/packages-experimental/sheets-source-binding/package.json
@@ -1,6 +1,6 @@
{
"name": "@univerjs/sheets-source-binding",
- "version": "0.6.6",
+ "version": "0.7.0-beta.0",
"private": false,
"description": "A library for connect and bind data from other sources to Univer Sheets",
"author": "DreamNum <[email protected]>",
diff --git a/packages-experimental/uni-docs-ui/package.json b/packages-experimental/uni-docs-ui/package.json
index 6f92f1851d..24f6ce6d13 100644
--- a/packages-experimental/uni-docs-ui/package.json
+++ b/packages-experimental/uni-docs-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "@univerjs/uni-docs-ui",
- "version": "0.6.6",
+ "version": "0.7.0-beta.0",
"private": true,
"description": "",
"author": "DreamNum <[email protected]>",
diff --git a/packages-experimental/uni-formula-ui/package.json b/packages-experimental/uni-formula-ui/package.json
index 79cc4687c6..7c7f3d748c 100644
--- a/packages-experimental/uni-formula-ui/package.json
+++ b/packages-experimental/uni-formula-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "@univerjs/uni-formula-ui",
- "version": "0.6.6",
+ "version": "0.7.0-beta.0",
"private": true,
"description": "",
"author": "DreamNum <[email protected]>",
diff --git a/packages-experimental/uni-formula/package.json b/packages-experimental/uni-formula/package.json
index 4f28aef93f..3a3ec141e8 100644
--- a/packages-experimental/uni-formula/package.json
+++ b/packages-experimental/uni-formula/package.json
@@ -1,6 +1,6 @@
{
"name": "@univerjs/uni-formula",
- "version": "0.6.6",
+ "version": "0.7.0-beta.0",
"private": true,
"description": "",
"author": "DreamNum <[email protected]>",
diff --git a/packages-experimental/uni-sheets-ui/package.json b/packages-experimental/uni-sheets-ui/package.json
index c3c64176b6..6e55a6231b 100644
--- a/packages-experimental/uni-sheets-ui/package.json
+++ b/packages-experimental/uni-sheets-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "@univerjs/uni-sheets-ui",
- "version": "0.6.6",
+ "version": "0.7.0-beta.0",
"private": true,
"description": "",
"author": "DreamNum <[email protected]>",
diff --git a/packages-experimental/uni-slides-ui/package.json b/packages-experimental/uni-slides-ui/package.json
index 17b9a64b07..a2f353ab88 100644
--- a/packages-experimental/uni-slides-ui/package.json
+++ b/packages-experimental/uni-slides-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "@univerjs/uni-slides-ui",
- "version": "0.6.6",
+ "version": "0.7.0-beta.0",
"private": true,
"description": "",
"author": "DreamNum <[email protected]>",
diff --git a/packages-experimental/uniui/package.json b/packages-experimental/uniui/package.json
index 5555e9c7b4..32754be964 100644
--- a/packages-experimental/uniui/package.json
+++ b/packages-experimental/uniui/package.json
@@ -1,6 +1,6 @@
{
"name": "@univerjs/uniui",
- "version": "0.6.6",
+ "version": "0.7.0-beta.0",
"private": true,
"description": "",
"author": "DreamNum <[email protected]>",
diff --git a/packages/design/src/components/date-picker/index.module.css b/packages/design/src/components/date-picker/index.module.css
index 2654f26d85..a2ee076d8d 100644
--- a/packages/design/src/components/date-picker/index.module.css
+++ b/packages/design/src/components/date-picker/index.module.css
@@ -127,6 +127,7 @@
outline: none;
cursor: pointer;
transition: background 0.3s;
+ @apply univer-px-1.5;
}
.date-picker-cell-in-view {
@@ -138,7 +139,7 @@
}
.date-picker-cell-hover > .date-picker-cell-inner {
- @apply univer-bg-gray-100;
+ @apply hover:univer-bg-gray-100;
}
.date-picker-cell-range-hover-start::after,
@@ -204,6 +205,10 @@
@apply univer-border-0 univer-border-t univer-border-solid univer-border-t-gray-200;
}
+.date-picker-ranges {
+ @apply univer-list-none univer-m-0 univer-p-0 univer-flex univer-items-center univer-justify-center;
+}
+
/* Clear Button */
.date-picker-clear {
position: absolute;
diff --git a/packages/design/src/components/dropdown/PopoverPrimitive.tsx b/packages/design/src/components/dropdown/PopoverPrimitive.tsx
index 6d89b452e4..e76c91dae6 100644
--- a/packages/design/src/components/dropdown/PopoverPrimitive.tsx
+++ b/packages/design/src/components/dropdown/PopoverPrimitive.tsx
@@ -48,7 +48,7 @@ function PopoverContent({
univer-z-[1080] univer-max-h-[var(--radix-popper-available-height)] univer-overflow-y-auto
univer-rounded-md univer-border univer-border-solid univer-border-gray-200 univer-bg-white
univer-text-gray-900 univer-shadow-md univer-outline-hidden
- dark:univer-bg-gray-900
+ dark:univer-border-gray-600 dark:univer-bg-gray-900
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/menu/index.module.css b/packages/design/src/components/menu/index.module.css
index 7e02a211db..2acef6796a 100644
--- a/packages/design/src/components/menu/index.module.css
+++ b/packages/design/src/components/menu/index.module.css
@@ -1,6 +1,9 @@
.menu {
@apply univer-m-0 univer-py-1 univer-px-2 univer-text-sm univer-list-none univer-rounded-md univer-box-border univer-shadow-md univer-border-solid univer-border univer-border-gray-200 univer-min-w-52 univer-max-w-52 univer-bg-white;
}
+.dark .menu {
+ @apply univer-bg-gray-700 univer-border-gray-600;
+}
.menu-vertical {
display: grid;
@@ -18,6 +21,9 @@
.menu-item-group:not(:last-child) {
border-bottom: 1px solid #e3e5ea;
}
+.dark .menu-item-group:not(:last-child) {
+ @apply univer-border-b-gray-600;
+}
.menu-item-group-list {
display: grid;
@@ -33,6 +39,9 @@
padding-top: 6px;
@apply univer-text-gray-600 univer-text-xs univer-px-2;
}
+.dark .menu-item-group-title {
+ @apply univer-text-white;
+}
.menu-item-group-title:empty {
display: none;
@@ -42,15 +51,25 @@
.menu-submenu-active {
@apply univer-bg-gray-50 univer-rounded-md;
}
+.dark .menu-item-active,
+.dark .menu-submenu-active {
+ @apply univer-bg-gray-600;
+}
.menu-item-selected {
transform: translateZ(0);
@apply univer-bg-gray-50 univer-rounded-md;
}
+.dark .menu-item-selected {
+ @apply univer-bg-gray-600;
+}
.menu-submenu-selected {
@apply univer-bg-gray-50 univer-rounded-md;
}
+.dark .menu-submenu-selected {
+ @apply univer-bg-gray-600;
+}
.menu > li.menu-submenu {
padding: 0;
@@ -71,14 +90,23 @@
line-height: 1.5em;
@apply univer-rounded-md univer-text-sm univer-text-gray-900 univer-px-2 univer-gap-3;
}
+.dark .menu-item {
+ @apply univer-text-white;
+}
.menu-item:hover {
@apply univer-bg-gray-50;
}
+.dark .menu-item:hover {
+ @apply univer-bg-gray-600;
+}
.menu-item .icon {
@apply univer-text-gray-600;
}
+.dark .menu-item .icon {
+ @apply univer-text-white;
+}
.menu-item,
.menu-submenu {
@@ -114,6 +142,9 @@
line-height: 1.5em;
@apply univer-text-gray-900 univer-text-sm univer-px-2;
}
+.dark .menu-submenu-title {
+ @apply univer-text-white;
+}
.menu-submenu-title-more-icon,
.menu-item-more-icon {
@@ -124,8 +155,12 @@
overflow: hidden;
white-space: nowrap;
border: none;
- border-bottom: 1px solid #e3e5ea;
+ border-bottom: 1px solid transparent;
box-shadow: none;
+ @apply univer-border-b-gray-200;
+}
+.dark .menu-horizontal {
+ @apply univer-border-b-gray-600;
}
.menu-horizontal > .menu-item,
diff --git a/packages/design/src/components/select/LegacySelect.tsx b/packages/design/src/components/select/LegacySelect.tsx
index a0d1b3a14c..f5c8b79109 100644
--- a/packages/design/src/components/select/LegacySelect.tsx
+++ b/packages/design/src/components/select/LegacySelect.tsx
@@ -117,7 +117,6 @@ export function LegacySelect(props: ILegacySelectProps) {
labelRender={labelRender}
open={open}
dropdownStyle={dropdownStyle}
- dropdownClassName="univer-theme"
onDropdownVisibleChange={onDropdownVisibleChange}
notFoundContent={locale?.Select.empty}
disabled={disabled}
diff --git a/packages/sheets-note-ui/src/views/note.tsx b/packages/sheets-note-ui/src/views/note.tsx
index b9c22f95dc..9681720553 100644
--- a/packages/sheets-note-ui/src/views/note.tsx
+++ b/packages/sheets-note-ui/src/views/note.tsx
@@ -121,7 +121,7 @@ export const SheetsNote = (props: { popup: IPopup<{ location: ISheetLocationBase
className={clsx(`
univer-resize-both univer-ml-px univer-rounded univer-border univer-border-solid univer-border-gray-200
univer-bg-white univer-p-2 univer-text-gray-900 univer-shadow
- dark:univer-bg-gray-800 dark:univer-text-white
+ dark:univer-border-gray-600 dark:univer-bg-gray-800 dark:univer-text-white
focus:univer-outline-none
`, scrollbarClassName)}
style={{ width: note.width, height: note.height }}
diff --git a/packages/sheets-sort-ui/src/views/ExtendConfirm.tsx b/packages/sheets-sort-ui/src/views/ExtendConfirm.tsx
index 1b52fcb1bd..ca40404393 100644
--- a/packages/sheets-sort-ui/src/views/ExtendConfirm.tsx
+++ b/packages/sheets-sort-ui/src/views/ExtendConfirm.tsx
@@ -27,7 +27,7 @@ export const ExtendConfirm = (props: IExtendConfirmProps) => {
const [extend, setExtend] = useState<string>('0');
const localeService = useDependency(LocaleService);
return (
- <div className="univer-text-sm univer-theme">
+ <div className="univer-text-sm">
<div className="extend-confirm-desc">
{localeService.t('sheets-sort.dialog.sort-reminder-desc')}
</div>
diff --git a/packages/themes/package.json b/packages/themes/package.json
index 50e3939417..edc4cc6610 100644
--- a/packages/themes/package.json
+++ b/packages/themes/package.json
@@ -56,6 +56,7 @@
"build": "univer-cli build"
},
"devDependencies": {
+ "@univerjs-infra/shared": "workspace:*",
"vite": "^6.3.5"
}
}
diff --git a/packages/themes/tsconfig.json b/packages/themes/tsconfig.json
index 443143e94f..d4f9172636 100644
--- a/packages/themes/tsconfig.json
+++ b/packages/themes/tsconfig.json
@@ -1,27 +1,8 @@
{
+ "extends": "@univerjs-infra/shared/tsconfigs/base",
"compilerOptions": {
- "target": "ESNext",
- "jsx": "react-jsx",
- "lib": ["ESNext", "DOM", "DOM.Iterable", "WebWorker"],
- "useDefineForClassFields": true,
-
- "experimentalDecorators": true,
"rootDir": "src",
- "module": "ESNext",
-
- "moduleResolution": "bundler",
-
- "resolveJsonModule": true,
- "allowImportingTsExtensions": true,
-
- "strict": true,
- "strictPropertyInitialization": false,
- "noFallthroughCasesInSwitch": true,
- "noImplicitOverride": true,
- "noEmit": true,
- "outDir": "lib/types",
- "isolatedModules": true,
- "skipLibCheck": true
+ "outDir": "lib/types"
},
"include": ["src"]
}
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 90361301fd..78d1ac8e04 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -84,7 +84,6 @@
"@univerjs/design": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.3.24",
- "@univerjs/themes": "workspace:*",
"@wendellhu/redi": "0.18.0",
"localforage": "^1.10.0"
},
@@ -94,6 +93,7 @@
"devDependencies": {
"@testing-library/react": "^16.3.0",
"@univerjs-infra/shared": "workspace:*",
+ "@univerjs/themes": "workspace:*",
"postcss": "^8.5.3",
"react": "18.3.1",
"react-dom": "18.3.1",
diff --git a/packages/ui/src/services/theme-switcher/theme-switcher.service.ts b/packages/ui/src/services/theme-switcher/theme-switcher.service.ts
new file mode 100644
index 0000000000..a3e1f712ed
--- /dev/null
+++ b/packages/ui/src/services/theme-switcher/theme-switcher.service.ts
@@ -0,0 +1,55 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { Theme } from '@univerjs/themes';
+
+export class ThemeSwitcherService {
+ private _styleSheetId = 'univer-theme-css-variables';
+
+ injectThemeToHead(theme: Theme) {
+ function generateCSSVariables(theme: any, prefix = '--univer') {
+ const variables: string[] = [];
+
+ function traverse(obj: any, path = '') {
+ for (const key in obj) {
+ const value = obj[key];
+ const currentPath = path ? `${path}-${key}` : key;
+
+ if (typeof value === 'object' && value !== null) {
+ traverse(value, currentPath);
+ } else {
+ variables.push(`${prefix}-${currentPath}: ${value};`);
+ }
+ }
+ }
+
+ traverse(theme);
+ return variables.join('\n');
+ }
+
+ const cssVariables = generateCSSVariables(theme);
+
+ const existingStyleElement = document.getElementById(this._styleSheetId);
+ if (existingStyleElement) {
+ existingStyleElement.remove();
+ }
+
+ const styleElement = document.createElement('style');
+ styleElement.setAttribute('id', this._styleSheetId);
+ styleElement.innerHTML = `:root {\n${cssVariables}\n}`;
+ document.head.appendChild(styleElement);
+ }
+}
diff --git a/packages/ui/src/ui-plugin.ts b/packages/ui/src/ui-plugin.ts
index 655edbde87..d07a761d06 100644
--- a/packages/ui/src/ui-plugin.ts
+++ b/packages/ui/src/ui-plugin.ts
@@ -17,7 +17,6 @@
import type { Dependency } from '@univerjs/core';
import type { IUniverUIConfig } from './controllers/config.schema';
import { DependentOn, generateRandomId, IConfigService, IContextService, ILocalStorageService, Inject, Injector, merge, mergeOverrideWithDependencies, Plugin } from '@univerjs/core';
-
import { UniverRenderEnginePlugin } from '@univerjs/engine-render';
import { ComponentManager } from './common/component-manager';
import { ZIndexManager } from './common/z-index-manager';
@@ -53,6 +52,7 @@ import { ShortcutPanelService } from './services/shortcut/shortcut-panel.service
import { IShortcutService, ShortcutService } from './services/shortcut/shortcut.service';
import { DesktopSidebarService } from './services/sidebar/desktop-sidebar.service';
import { ISidebarService } from './services/sidebar/sidebar.service';
+import { ThemeSwitcherService } from './services/theme-switcher/theme-switcher.service';
import { DesktopZenZoneService } from './services/zen-zone/desktop-zen-zone.service';
import { IZenZoneService } from './services/zen-zone/zen-zone.service';
@@ -96,6 +96,7 @@ export class UniverUIPlugin extends Plugin {
override onStarting(): void {
const dependencies: Dependency[] = mergeOverrideWithDependencies([
[ComponentManager],
+ [ThemeSwitcherService],
[ZIndexManager],
[ShortcutPanelService],
[IUIPartsService, { useClass: UIPartsService }],
diff --git a/packages/ui/src/views/components/ribbon/Button/ToolbarButton.tsx b/packages/ui/src/views/components/ribbon/Button/ToolbarButton.tsx
index ea600d8c9e..b3e09b212d 100644
--- a/packages/ui/src/views/components/ribbon/Button/ToolbarButton.tsx
+++ b/packages/ui/src/views/components/ribbon/Button/ToolbarButton.tsx
@@ -96,8 +96,7 @@ export function ToolbarButton(props: IBaseToolbarButtonProps) {
hover:univer-bg-gray-100
`, {
'univer-p-4': noIcon,
- 'univer-bg-gray-200 dark:univer-bg-gray-500': active,
- // '!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/Ribbon.tsx b/packages/ui/src/views/components/ribbon/Ribbon.tsx
index 389185b255..dadf842a0c 100644
--- a/packages/ui/src/views/components/ribbon/Ribbon.tsx
+++ b/packages/ui/src/views/components/ribbon/Ribbon.tsx
@@ -56,7 +56,7 @@ export function Ribbon(props: IRibbonProps) {
[&>*:last-child:after]:univer-top-1/2 [&>*:last-child:after]:univer-h-5 [&>*:last-child:after]:univer-translate-x-[3px]
[&>*:last-child:after]:univer-w-px [&>*:last-child:after]:-univer-translate-y-1/2
[&>*:last-child:after]:univer-bg-gray-200 [&>*:last-child:after]:univer-content-['']
- [&>*:last-child]:univer-relative`;
+ [&>*:last-child]:univer-relative dark:[&>*:last-child:after]:univer-bg-gray-600`;
const handleSelectTab = useCallback((group: IMenuSchema) => {
toolbarItemRefs.current = {};
diff --git a/packages/ui/src/views/components/ribbon/TooltipButtonWrapper.tsx b/packages/ui/src/views/components/ribbon/TooltipButtonWrapper.tsx
index 24da206714..8625932577 100644
--- a/packages/ui/src/views/components/ribbon/TooltipButtonWrapper.tsx
+++ b/packages/ui/src/views/components/ribbon/TooltipButtonWrapper.tsx
@@ -91,7 +91,7 @@ export function DropdownWrapper(props: Omit<Partial<IDropdownProps>, 'overlay'>
<Dropdown
align={align}
overlay={(
- <div className="univer-grid univer-gap-2 univer-theme">
+ <div className="univer-grid univer-gap-2">
{overlay}
</div>
)}
diff --git a/packages/ui/src/views/workbench/Workbench.tsx b/packages/ui/src/views/workbench/Workbench.tsx
index acfda4c47b..c3aab68291 100644
--- a/packages/ui/src/views/workbench/Workbench.tsx
+++ b/packages/ui/src/views/workbench/Workbench.tsx
@@ -19,12 +19,12 @@ import type { IUniverUIConfig } from '../../controllers/config.schema';
import type { IWorkbenchOptions } from '../../controllers/ui/ui.controller';
import { IConfigService, LocaleService, ThemeService } from '@univerjs/core';
import { clsx, ConfigContext, ConfigProvider } from '@univerjs/design';
-import { defaultTheme } from '@univerjs/themes';
import { useContext, useEffect, useMemo, useRef, useState } from 'react';
import { createPortal } from 'react-dom';
import { useConfigValue } from '../../components/hooks';
import { UI_PLUGIN_CONFIG_KEY } from '../../controllers/config.schema';
import { BuiltInUIPart } from '../../services/parts/parts.service';
+import { ThemeSwitcherService } from '../../services/theme-switcher/theme-switcher.service';
import { useDependency } from '../../utils/di';
import { ComponentContainer, useComponentsOfPart } from '../components/ComponentContainer';
import { DesktopContextMenu } from '../components/context-menu/ContextMenu';
@@ -56,6 +56,7 @@ export function DesktopWorkbenchContent(props: IUniverWorkbenchProps) {
const localeService = useDependency(LocaleService);
const themeService = useDependency(ThemeService);
+ const themeSwitcherService = useDependency(ThemeSwitcherService);
const contentRef = useRef<HTMLDivElement>(null);
const configService = useDependency(IConfigService);
const uiConfig = configService.getConfig(UI_PLUGIN_CONFIG_KEY) as IUniverUIConfig;
@@ -71,9 +72,13 @@ export function DesktopWorkbenchContent(props: IUniverWorkbenchProps) {
const popupRootId = uiConfig?.popupRootId ?? 'univer-popup-portal';
useEffect(() => {
- if (!themeService.getCurrentTheme()) {
- themeService.setTheme(defaultTheme);
- }
+ const sub = themeService.currentTheme$.subscribe((theme) => {
+ themeSwitcherService.injectThemeToHead(theme);
+ });
+
+ return () => {
+ sub.unsubscribe();
+ };
}, []);
const [darkMode, setDarkMode] = useState<boolean>(false);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 54c5b1d879..877581356a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -128,9 +128,6 @@ importers:
'@typescript-eslint/parser':
specifier: ^8.32.0
- '@univerjs/themes':
- specifier: workspace:*
- version: link:../../packages/themes
'@vitejs/plugin-react':
specifier: ^4.4.1
@@ -142,7 +139,7 @@ importers:
autoprefixer:
specifier: ^10.4.21
- version: 10.4.21([email protected])
+ version: 10.4.21([email protected])
eslint-plugin-readable-tailwind:
specifier: ^1.9.1
@@ -157,7 +154,7 @@ importers:
version: 4.1.1
postcss-preset-env:
specifier: ^10.1.6
- version: 10.1.6([email protected])
+ version: 10.1.6([email protected])
sort-keys:
specifier: ^5.1.0
version: 5.1.0
@@ -3265,6 +3262,9 @@ importers:
packages/themes:
devDependencies:
+ '@univerjs-infra/shared':
+ specifier: workspace:*
+ version: link:../../common/shared
vite:
specifier: ^6.3.5
@@ -3354,9 +3354,6 @@ importers:
'@univerjs/icons':
specifier: ^0.3.24
- '@univerjs/themes':
- specifier: workspace:*
- version: link:../themes
'@wendellhu/redi':
specifier: 0.18.0
version: 0.18.0
@@ -3370,6 +3367,9 @@ importers:
'@univerjs-infra/shared':
specifier: workspace:*
version: link:../../common/shared
+ '@univerjs/themes':
+ specifier: workspace:*
+ version: link:../themes
postcss:
specifier: ^8.5.3
version: 8.5.3
@@ -12326,215 +12326,215 @@ snapshots:
'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])
'@csstools/css-tokenizer': 3.0.3
dependencies:
'@csstools/selector-specificity': 5.0.0([email protected])
- postcss: 8.5.3
+ postcss: 8.4.49
postcss-selector-parser: 7.1.0
dependencies:
'@csstools/css-color-parser': 3.0.9(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])
'@csstools/css-tokenizer': 3.0.3
- '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
- '@csstools/utilities': 2.0.0([email protected])
- postcss: 8.5.3
+ '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
+ '@csstools/utilities': 2.0.0([email protected])
+ postcss: 8.4.49
dependencies:
'@csstools/css-color-parser': 3.0.9(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])
'@csstools/css-tokenizer': 3.0.3
- '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
- '@csstools/utilities': 2.0.0([email protected])
- postcss: 8.5.3
+ '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
+ '@csstools/utilities': 2.0.0([email protected])
+ postcss: 8.4.49
dependencies:
'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])
'@csstools/css-tokenizer': 3.0.3
- '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
- '@csstools/utilities': 2.0.0([email protected])
- postcss: 8.5.3
+ '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
+ '@csstools/utilities': 2.0.0([email protected])
+ postcss: 8.4.49
dependencies:
'@csstools/css-calc': 2.1.3(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])
'@csstools/css-tokenizer': 3.0.3
- postcss: 8.5.3
+ postcss: 8.4.49
dependencies:
- '@csstools/utilities': 2.0.0([email protected])
- postcss: 8.5.3
+ '@csstools/utilities': 2.0.0([email protected])
+ postcss: 8.4.49
postcss-value-parser: 4.2.0
dependencies:
'@csstools/css-color-parser': 3.0.9(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])
'@csstools/css-tokenizer': 3.0.3
- postcss: 8.5.3
+ postcss: 8.4.49
dependencies:
'@csstools/css-color-parser': 3.0.9(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])
'@csstools/css-tokenizer': 3.0.3
- '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
- '@csstools/utilities': 2.0.0([email protected])
- postcss: 8.5.3
+ '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
+ '@csstools/utilities': 2.0.0([email protected])
+ postcss: 8.4.49
dependencies:
'@csstools/css-color-parser': 3.0.9(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])
'@csstools/css-tokenizer': 3.0.3
- '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
- '@csstools/utilities': 2.0.0([email protected])
- postcss: 8.5.3
+ '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
+ '@csstools/utilities': 2.0.0([email protected])
+ postcss: 8.4.49
dependencies:
- '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
- '@csstools/utilities': 2.0.0([email protected])
- postcss: 8.5.3
+ '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
+ '@csstools/utilities': 2.0.0([email protected])
+ postcss: 8.4.49
postcss-value-parser: 4.2.0
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
dependencies:
'@csstools/selector-specificity': 5.0.0([email protected])
- postcss: 8.5.3
+ postcss: 8.4.49
postcss-selector-parser: 7.1.0
dependencies:
'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])
'@csstools/css-tokenizer': 3.0.3
- '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
- '@csstools/utilities': 2.0.0([email protected])
- postcss: 8.5.3
+ '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
+ '@csstools/utilities': 2.0.0([email protected])
+ postcss: 8.4.49
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
postcss-value-parser: 4.2.0
dependencies:
'@csstools/css-tokenizer': 3.0.3
- '@csstools/utilities': 2.0.0([email protected])
- postcss: 8.5.3
+ '@csstools/utilities': 2.0.0([email protected])
+ postcss: 8.4.49
dependencies:
'@csstools/css-calc': 2.1.3(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])
'@csstools/css-tokenizer': 3.0.3
'@csstools/media-query-list-parser': 4.0.2(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
- postcss: 8.5.3
+ postcss: 8.4.49
dependencies:
'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])
'@csstools/css-tokenizer': 3.0.3
'@csstools/media-query-list-parser': 4.0.2(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
- postcss: 8.5.3
+ postcss: 8.4.49
dependencies:
- '@csstools/utilities': 2.0.0([email protected])
- postcss: 8.5.3
+ '@csstools/utilities': 2.0.0([email protected])
+ postcss: 8.4.49
postcss-value-parser: 4.2.0
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
postcss-value-parser: 4.2.0
dependencies:
'@csstools/css-color-parser': 3.0.9(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])
'@csstools/css-tokenizer': 3.0.3
- '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
- '@csstools/utilities': 2.0.0([email protected])
- postcss: 8.5.3
+ '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
+ '@csstools/utilities': 2.0.0([email protected])
+ postcss: 8.4.49
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
postcss-value-parser: 4.2.0
dependencies:
'@csstools/css-calc': 2.1.3(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])
'@csstools/css-tokenizer': 3.0.3
- postcss: 8.5.3
+ postcss: 8.4.49
dependencies:
'@csstools/css-color-parser': 3.0.9(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])
'@csstools/css-tokenizer': 3.0.3
- '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
- '@csstools/utilities': 2.0.0([email protected])
- postcss: 8.5.3
+ '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
+ '@csstools/utilities': 2.0.0([email protected])
+ postcss: 8.4.49
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
postcss-selector-parser: 7.1.0
dependencies:
'@csstools/css-calc': 2.1.3(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])
'@csstools/css-tokenizer': 3.0.3
- postcss: 8.5.3
+ postcss: 8.4.49
dependencies:
'@csstools/css-calc': 2.1.3(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])
'@csstools/css-tokenizer': 3.0.3
- postcss: 8.5.3
+ postcss: 8.4.49
dependencies:
'@csstools/color-helpers': 5.0.2
- postcss: 8.5.3
+ postcss: 8.4.49
postcss-value-parser: 4.2.0
dependencies:
'@csstools/css-calc': 2.1.3(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])
'@csstools/css-tokenizer': 3.0.3
- postcss: 8.5.3
+ postcss: 8.4.49
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
dependencies:
@@ -12544,9 +12544,9 @@ snapshots:
dependencies:
postcss-selector-parser: 7.1.0
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
'@dprint/[email protected]': {}
@@ -14933,14 +14933,14 @@ snapshots:
stubborn-fs: 1.2.5
when-exit: 2.1.3
dependencies:
browserslist: 4.24.4
caniuse-lite: 1.0.30001703
fraction.js: 4.3.7
normalize-range: 0.1.2
picocolors: 1.1.1
- postcss: 8.5.3
+ postcss: 8.4.49
postcss-value-parser: 4.2.0
@@ -15515,15 +15515,15 @@ snapshots:
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
postcss-selector-parser: 7.1.0
dependencies:
'@csstools/selector-specificity': 5.0.0([email protected])
- postcss: 8.5.3
+ postcss: 8.4.49
postcss-selector-parser: 7.1.0
postcss-value-parser: 4.2.0
@@ -15553,9 +15553,9 @@ snapshots:
optionalDependencies:
webpack: 5.98.0(@swc/[email protected])([email protected])
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
dependencies:
@@ -18861,96 +18861,96 @@ snapshots:
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
postcss-selector-parser: 7.1.0
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
postcss-value-parser: 4.2.0
dependencies:
'@csstools/css-color-parser': 3.0.9(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])
'@csstools/css-tokenizer': 3.0.3
- '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
- '@csstools/utilities': 2.0.0([email protected])
- postcss: 8.5.3
+ '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
+ '@csstools/utilities': 2.0.0([email protected])
+ postcss: 8.4.49
dependencies:
- '@csstools/utilities': 2.0.0([email protected])
- postcss: 8.5.3
+ '@csstools/utilities': 2.0.0([email protected])
+ postcss: 8.4.49
postcss-value-parser: 4.2.0
dependencies:
- '@csstools/utilities': 2.0.0([email protected])
- postcss: 8.5.3
+ '@csstools/utilities': 2.0.0([email protected])
+ postcss: 8.4.49
postcss-value-parser: 4.2.0
dependencies:
'@csstools/cascade-layer-name-parser': 2.0.4(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])
'@csstools/css-tokenizer': 3.0.3
'@csstools/media-query-list-parser': 4.0.2(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
- postcss: 8.5.3
+ postcss: 8.4.49
dependencies:
'@csstools/cascade-layer-name-parser': 2.0.4(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])
'@csstools/css-tokenizer': 3.0.3
- '@csstools/utilities': 2.0.0([email protected])
- postcss: 8.5.3
+ '@csstools/utilities': 2.0.0([email protected])
+ postcss: 8.4.49
postcss-value-parser: 4.2.0
dependencies:
'@csstools/cascade-layer-name-parser': 2.0.4(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])
'@csstools/css-tokenizer': 3.0.3
- postcss: 8.5.3
+ postcss: 8.4.49
postcss-selector-parser: 7.1.0
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
postcss-selector-parser: 7.1.0
dependencies:
- '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
- '@csstools/utilities': 2.0.0([email protected])
- postcss: 8.5.3
+ '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
+ '@csstools/utilities': 2.0.0([email protected])
+ postcss: 8.4.49
postcss-value-parser: 4.2.0
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
postcss-selector-parser: 7.1.0
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
postcss-selector-parser: 7.1.0
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
dependencies:
- '@csstools/utilities': 2.0.0([email protected])
- postcss: 8.5.3
+ '@csstools/utilities': 2.0.0([email protected])
+ postcss: 8.4.49
postcss-value-parser: 4.2.0
@@ -18965,14 +18965,14 @@ snapshots:
camelcase-css: 2.0.1
postcss: 8.4.49
dependencies:
'@csstools/css-color-parser': 3.0.9(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])
'@csstools/css-tokenizer': 3.0.3
- '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
- '@csstools/utilities': 2.0.0([email protected])
- postcss: 8.5.3
+ '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
+ '@csstools/utilities': 2.0.0([email protected])
+ postcss: 8.4.49
dependencies:
@@ -18992,9 +18992,9 @@ snapshots:
transitivePeerDependencies:
- typescript
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
postcss-value-parser: 4.2.0
@@ -19047,110 +19047,110 @@ snapshots:
postcss: 8.4.49
postcss-selector-parser: 6.1.2
dependencies:
'@csstools/selector-resolve-nested': 3.0.0([email protected])
'@csstools/selector-specificity': 5.0.0([email protected])
- postcss: 8.5.3
+ postcss: 8.4.49
postcss-selector-parser: 7.1.0
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
postcss-value-parser: 4.2.0
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
postcss-value-parser: 4.2.0
- dependencies:
- '@csstools/postcss-cascade-layers': 5.0.1([email protected])
- '@csstools/postcss-color-function': 4.0.9([email protected])
- '@csstools/postcss-color-mix-function': 3.0.9([email protected])
- '@csstools/postcss-content-alt-text': 2.0.5([email protected])
- '@csstools/postcss-exponential-functions': 2.0.8([email protected])
- '@csstools/postcss-font-format-keywords': 4.0.0([email protected])
- '@csstools/postcss-gamut-mapping': 2.0.9([email protected])
- '@csstools/postcss-gradients-interpolation-method': 5.0.9([email protected])
- '@csstools/postcss-hwb-function': 4.0.9([email protected])
- '@csstools/postcss-ic-unit': 4.0.1([email protected])
- '@csstools/postcss-initial': 2.0.1([email protected])
- '@csstools/postcss-is-pseudo-class': 5.0.1([email protected])
- '@csstools/postcss-light-dark-function': 2.0.8([email protected])
- '@csstools/postcss-logical-float-and-clear': 3.0.0([email protected])
- '@csstools/postcss-logical-overflow': 2.0.0([email protected])
- '@csstools/postcss-logical-overscroll-behavior': 2.0.0([email protected])
- '@csstools/postcss-logical-resize': 3.0.0([email protected])
- '@csstools/postcss-logical-viewport-units': 3.0.3([email protected])
- '@csstools/postcss-media-minmax': 2.0.8([email protected])
- '@csstools/postcss-media-queries-aspect-ratio-number-values': 3.0.4([email protected])
- '@csstools/postcss-nested-calc': 4.0.0([email protected])
- '@csstools/postcss-normalize-display-values': 4.0.0([email protected])
- '@csstools/postcss-oklab-function': 4.0.9([email protected])
- '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
- '@csstools/postcss-random-function': 2.0.0([email protected])
- '@csstools/postcss-relative-color-syntax': 3.0.9([email protected])
- '@csstools/postcss-scope-pseudo-class': 4.0.1([email protected])
- '@csstools/postcss-sign-functions': 1.1.3([email protected])
- '@csstools/postcss-stepped-value-functions': 4.0.8([email protected])
- '@csstools/postcss-text-decoration-shorthand': 4.0.2([email protected])
- '@csstools/postcss-trigonometric-functions': 4.0.8([email protected])
- '@csstools/postcss-unset-value': 4.0.0([email protected])
- autoprefixer: 10.4.21([email protected])
+ dependencies:
+ '@csstools/postcss-cascade-layers': 5.0.1([email protected])
+ '@csstools/postcss-color-function': 4.0.9([email protected])
+ '@csstools/postcss-color-mix-function': 3.0.9([email protected])
+ '@csstools/postcss-content-alt-text': 2.0.5([email protected])
+ '@csstools/postcss-exponential-functions': 2.0.8([email protected])
+ '@csstools/postcss-font-format-keywords': 4.0.0([email protected])
+ '@csstools/postcss-gamut-mapping': 2.0.9([email protected])
+ '@csstools/postcss-gradients-interpolation-method': 5.0.9([email protected])
+ '@csstools/postcss-hwb-function': 4.0.9([email protected])
+ '@csstools/postcss-ic-unit': 4.0.1([email protected])
+ '@csstools/postcss-initial': 2.0.1([email protected])
+ '@csstools/postcss-is-pseudo-class': 5.0.1([email protected])
+ '@csstools/postcss-light-dark-function': 2.0.8([email protected])
+ '@csstools/postcss-logical-float-and-clear': 3.0.0([email protected])
+ '@csstools/postcss-logical-overflow': 2.0.0([email protected])
+ '@csstools/postcss-logical-overscroll-behavior': 2.0.0([email protected])
+ '@csstools/postcss-logical-resize': 3.0.0([email protected])
+ '@csstools/postcss-logical-viewport-units': 3.0.3([email protected])
+ '@csstools/postcss-media-minmax': 2.0.8([email protected])
+ '@csstools/postcss-media-queries-aspect-ratio-number-values': 3.0.4([email protected])
+ '@csstools/postcss-nested-calc': 4.0.0([email protected])
+ '@csstools/postcss-normalize-display-values': 4.0.0([email protected])
+ '@csstools/postcss-oklab-function': 4.0.9([email protected])
+ '@csstools/postcss-progressive-custom-properties': 4.0.1([email protected])
+ '@csstools/postcss-random-function': 2.0.0([email protected])
+ '@csstools/postcss-relative-color-syntax': 3.0.9([email protected])
+ '@csstools/postcss-scope-pseudo-class': 4.0.1([email protected])
+ '@csstools/postcss-sign-functions': 1.1.3([email protected])
+ '@csstools/postcss-stepped-value-functions': 4.0.8([email protected])
+ '@csstools/postcss-text-decoration-shorthand': 4.0.2([email protected])
+ '@csstools/postcss-trigonometric-functions': 4.0.8([email protected])
+ '@csstools/postcss-unset-value': 4.0.0([email protected])
+ autoprefixer: 10.4.21([email protected])
browserslist: 4.24.4
- css-blank-pseudo: 7.0.1([email protected])
- css-has-pseudo: 7.0.2([email protected])
- css-prefers-color-scheme: 10.0.0([email protected])
+ css-blank-pseudo: 7.0.1([email protected])
+ css-has-pseudo: 7.0.2([email protected])
+ css-prefers-color-scheme: 10.0.0([email protected])
cssdb: 8.2.5
- postcss: 8.5.3
- postcss-attribute-case-insensitive: 7.0.1([email protected])
- postcss-clamp: 4.1.0([email protected])
- postcss-color-functional-notation: 7.0.9([email protected])
- postcss-color-hex-alpha: 10.0.0([email protected])
- postcss-color-rebeccapurple: 10.0.0([email protected])
- postcss-custom-media: 11.0.5([email protected])
- postcss-custom-properties: 14.0.4([email protected])
- postcss-custom-selectors: 8.0.4([email protected])
- postcss-dir-pseudo-class: 9.0.1([email protected])
- postcss-double-position-gradients: 6.0.1([email protected])
- postcss-focus-visible: 10.0.1([email protected])
- postcss-focus-within: 9.0.1([email protected])
- postcss-font-variant: 5.0.0([email protected])
- postcss-gap-properties: 6.0.0([email protected])
- postcss-image-set-function: 7.0.0([email protected])
- postcss-lab-function: 7.0.9([email protected])
- postcss-logical: 8.1.0([email protected])
- postcss-nesting: 13.0.1([email protected])
- postcss-opacity-percentage: 3.0.0([email protected])
- postcss-overflow-shorthand: 6.0.0([email protected])
- postcss-page-break: 3.0.4([email protected])
- postcss-place: 10.0.0([email protected])
- postcss-pseudo-class-any-link: 10.0.1([email protected])
- postcss-replace-overflow-wrap: 4.0.0([email protected])
- postcss-selector-not: 8.0.1([email protected])
-
+ postcss: 8.4.49
+ postcss-attribute-case-insensitive: 7.0.1([email protected])
+ postcss-clamp: 4.1.0([email protected])
+ postcss-color-functional-notation: 7.0.9([email protected])
+ postcss-color-hex-alpha: 10.0.0([email protected])
+ postcss-color-rebeccapurple: 10.0.0([email protected])
+ postcss-custom-media: 11.0.5([email protected])
+ postcss-custom-properties: 14.0.4([email protected])
+ postcss-custom-selectors: 8.0.4([email protected])
+ postcss-dir-pseudo-class: 9.0.1([email protected])
+ postcss-double-position-gradients: 6.0.1([email protected])
+ postcss-focus-visible: 10.0.1([email protected])
+ postcss-focus-within: 9.0.1([email protected])
+ postcss-font-variant: 5.0.0([email protected])
+ postcss-gap-properties: 6.0.0([email protected])
+ postcss-image-set-function: 7.0.0([email protected])
+ postcss-lab-function: 7.0.9([email protected])
+ postcss-logical: 8.1.0([email protected])
+ postcss-nesting: 13.0.1([email protected])
+ postcss-opacity-percentage: 3.0.0([email protected])
+ postcss-overflow-shorthand: 6.0.0([email protected])
+ postcss-page-break: 3.0.4([email protected])
+ postcss-place: 10.0.0([email protected])
+ postcss-pseudo-class-any-link: 10.0.1([email protected])
+ postcss-replace-overflow-wrap: 4.0.0([email protected])
+ postcss-selector-not: 8.0.1([email protected])
+
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
postcss-selector-parser: 7.1.0
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
dependencies:
- postcss: 8.5.3
+ postcss: 8.4.49
postcss-selector-parser: 7.1.0