Skip to content

Commit 26b8c6e

Browse files
anncwbanncwb
committed
chore: update css
1 parent 6f0c05d commit 26b8c6e

File tree

49 files changed

+399
-918
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+399
-918
lines changed

‎apps/web-antd/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"@vben-core/preferences": "workspace:*",
3030
"@vben-core/request": "workspace:*",
3131
"@vben-core/stores": "workspace:*",
32+
"@vben/chart-ui": "workspace:*",
3233
"@vben/constants": "workspace:*",
3334
"@vben/hooks": "workspace:*",
3435
"@vben/icons": "workspace:*",
@@ -37,7 +38,6 @@
3738
"@vben/styles": "workspace:*",
3839
"@vben/types": "workspace:*",
3940
"@vben/universal-ui": "workspace:*",
40-
"@vben/chart-ui": "workspace:*",
4141
"@vben/utils": "workspace:*",
4242
"@vueuse/core": "^10.11.0",
4343
"ant-design-vue": "^4.2.3",

‎apps/web-antd/src/views/_essential/vben/about/index.vue

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
<script lang="ts" setup>
2-
import { onMounted } from 'vue';
2+
import { Fallback } from '@vben/universal-ui';
33
4-
defineOptions({ name: 'About' });
5-
onMounted(() => {
6-
// eslint-disable-next-line no-console
7-
console.log('About');
8-
});
4+
defineOptions({ name: 'Menu1' });
95
</script>
106

117
<template>
12-
<div>
13-
about
14-
<input class="bg-background border-border" />
15-
</div>
8+
<Fallback status="hello" />
169
</template>

‎internal/lint-configs/eslint-config/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"eslint-config-prettier": "^9.1.0",
3939
"eslint-plugin-eslint-comments": "^3.2.0",
4040
"eslint-plugin-i": "^2.29.1",
41-
"eslint-plugin-jsdoc": "^48.2.15",
41+
"eslint-plugin-jsdoc": "^48.4.0",
4242
"eslint-plugin-jsonc": "^2.16.0",
4343
"eslint-plugin-n": "^17.9.0",
4444
"eslint-plugin-no-only-tests": "^3.1.0",

‎internal/tailwind-config/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"tailwindcss": "^3.4.3"
4646
},
4747
"dependencies": {
48-
"@iconify/json": "^2.2.221",
48+
"@iconify/json": "^2.2.222",
4949
"@iconify/tailwind": "^1.1.1",
5050
"@tailwindcss/forms": "^0.5.7",
5151
"@tailwindcss/nesting": "0.0.0-insiders.565cd3e",

‎internal/tailwind-config/src/index.ts

Lines changed: 37 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -62,55 +62,62 @@ export default {
6262
'3000': '3000ms',
6363
},
6464
borderRadius: {
65-
lg: 'var(--radius-base)',
66-
md: 'calc(var(--radius-base) - 2px)',
67-
sm: 'calc(var(--radius-base) - 4px)',
68-
xl: 'calc(var(--radius-base) + 4px)',
65+
lg: 'var(--radius)',
66+
md: 'calc(var(--radius) - 2px)',
67+
sm: 'calc(var(--radius) - 4px)',
68+
xl: 'calc(var(--radius) + 4px)',
6969
},
7070
colors: {
7171
accent: {
72-
DEFAULT: 'hsl(var(--color-accent))',
73-
foreground: 'hsl(var(--color-accent-foreground))',
74-
hover: 'hsl(var(--color-accent-hover))',
72+
DEFAULT: 'hsl(var(--accent))',
73+
foreground: 'hsl(var(--accent-foreground))',
74+
hover: 'hsl(var(--accent-hover))',
7575
},
76-
background: 'hsl(var(--color-background) / <alpha-value>)',
77-
// body: 'hsl(var(--color-body) / <alpha-value>)',
78-
border: 'hsl(var(--color-border))',
76+
background: 'hsl(var(--background))',
77+
border: 'hsl(var(--border))',
7978
card: {
80-
DEFAULT: 'hsl(var(--color-card))',
81-
foreground: 'hsl(var(--color-card-foreground))',
79+
DEFAULT: 'hsl(var(--card))',
80+
foreground: 'hsl(var(--card-foreground))',
8281
},
8382
destructive: {
84-
DEFAULT: 'hsl(var(--color-destructive))',
85-
foreground: 'hsl(var(--color-destructive-foreground))',
83+
DEFAULT: 'hsl(var(--destructive))',
84+
foreground: 'hsl(var(--destructive-foreground))',
8685
},
87-
foreground: 'hsl(var(--color-foreground) / <alpha-value>)',
86+
foreground: 'hsl(var(--foreground) / <alpha-value>)',
8887
heavy: {
89-
DEFAULT: 'hsl(var(--color-heavy) / <alpha-value>)',
90-
foreground: 'hsl(var(--color-heavy-foreground) / <alpha-value>)',
88+
DEFAULT: 'hsl(var(--heavy))',
89+
foreground: 'hsl(var(--heavy-foreground))',
9190
},
9291
input: {
93-
DEFAULT: 'hsl(var(--color-input))',
94-
background: 'hsl(var(--color-input-background))',
92+
DEFAULT: 'hsl(var(--input))',
93+
background: 'hsl(var(--input-background))',
9594
},
9695
muted: {
97-
DEFAULT: 'hsl(var(--color-muted))',
98-
foreground: 'hsl(var(--color-muted-foreground))',
96+
DEFAULT: 'hsl(var(--muted))',
97+
foreground: 'hsl(var(--muted-foreground))',
9998
},
100-
overlay: 'hsl(var(--color-overlay))',
99+
overlay: 'hsl(var(--overlay))',
101100
popover: {
102-
DEFAULT: 'hsl(var(--color-popover))',
103-
foreground: 'hsl(var(--color-popover-foreground))',
101+
DEFAULT: 'hsl(var(--popover))',
102+
foreground: 'hsl(var(--popover-foreground))',
104103
},
105104
primary: {
106-
DEFAULT: 'hsl(var(--color-primary) / <alpha-value>)',
107-
foreground: 'hsl(var(--color-primary-foreground) / <alpha-value>)',
105+
DEFAULT: 'hsl(var(--primary) / <alpha-value>)',
106+
foreground: 'hsl(var(--primary-foreground) / <alpha-value>)',
108107
},
109-
ring: 'hsl(var(--color-ring))',
108+
ring: 'hsl(var(--ring))',
110109
secondary: {
111-
DEFAULT: 'hsl(var(--color-secondary) / <alpha-value>)',
112-
desc: 'hsl(var(--color-secondary-desc) / <alpha-value>)',
113-
foreground: 'hsl(var(--color-secondary-foreground) / <alpha-value>)',
110+
DEFAULT: 'hsl(var(--secondary) / <alpha-value>)',
111+
desc: 'hsl(var(--secondary-desc) / <alpha-value>)',
112+
foreground: 'hsl(var(--secondary-foreground) / <alpha-value>)',
113+
},
114+
success: {
115+
DEFAULT: 'hsl(var(--success))',
116+
foreground: 'hsl(var(--success-foreground))',
117+
},
118+
warning: {
119+
DEFAULT: 'hsl(var(--warning))',
120+
foreground: 'hsl(var(--warning-foreground))',
114121
},
115122
},
116123
fontFamily: {

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
},
4949
"devDependencies": {
5050
"@changesets/changelog-github": "^0.5.0",
51-
"@changesets/cli": "^2.27.5",
51+
"@changesets/cli": "^2.27.6",
5252
"@ls-lint/ls-lint": "^2.2.3",
5353
"@types/jsdom": "^21.1.7",
5454
"@types/node": "^20.14.8",

‎packages/@core/forward/preferences/src/constants.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ export const COLOR_PRIMARY_RESETS = [
99
'hsl(211 91% 39%)',
1010
'hsl(212 100% 45%)',
1111
'hsl(181 84% 32%)',
12-
'hsl(230 99% 66%)',
12+
'hsl(161 90% 43%)',
13+
'hsl(231 98% 65%)',
1314
'hsl(245 82% 67%)',
14-
'hsl(340 100% 68%)',
15+
'hsl(347 77% 60%)',
1516
];
1617

1718
export const SUPPORT_LANGUAGES: Language[] = [

‎packages/@core/forward/preferences/src/preferences.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,7 @@ class PreferenceManager {
182182
if (preference.theme) {
183183
for (const [key, value] of Object.entries(preference.theme)) {
184184
if (['colorPrimary'].includes(key)) {
185-
const cssVarKey = key.replaceAll(/([A-Z])/g, '-$1').toLowerCase();
186-
const cssVarValue = useCssVar(`--${cssVarKey}`);
185+
const cssVarValue = useCssVar(`--primary`);
187186
cssVarValue.value = convertToHslCssVar(value);
188187
}
189188
}

‎packages/@core/shared/design-tokens/src/dark/index.css

Lines changed: 44 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,68 @@
11
:root.dark {
2-
/* 基础背景颜色颜色 */
2+
/* Default background color of <body />...etc */
3+
--background: 220deg 13.04% 8%;
4+
--foreground: 220 13% 91%;
35

4-
--color-background: 220deg 13.04% 8%;
6+
/* Background color for <Card /> */
7+
--card: 222.2 84% 4.9%;
8+
--card-foreground: 210 40% 98%;
59

6-
/* 基础文本颜色 */
7-
--color-foreground: 220 13% 91%;
10+
/* Background color for popovers such as <DropdownMenu />, <HoverCard />, <Popover /> */
11+
--popover: 222.86deg 8.43% 16.27%;
12+
--popover-foreground: 210 40% 98%;
813

9-
/* 主题颜色 */
10-
--color-primary: 211 91% 39%;
11-
12-
/* 前景色，如按钮文本颜色 */
13-
--color-primary-foreground: 0 0 98%;
14-
15-
/* 颜色次要 */
16-
--color-secondary: 240 5% 17%;
17-
18-
/* 前景色，如按钮文本颜色 */
19-
--color-secondary-foreground: 0 0 98%;
14+
/* Muted backgrounds such as <TabsList />, <Skeleton /> and <Switch /> */
15+
--muted: 220deg 6.82% 17.25%;
16+
--muted-foreground: 215 20.2% 65.1%;
2017

21-
/* 次要文本颜色 */
22-
--color-secondary-desc: 210 12.16% 70.98%;
23-
24-
/* 普通颜色 */
25-
26-
/* --color-accent: 240 3.7% 15.9%; */
27-
28-
/* --color-accent: 220deg 7.32% 16.08%; */
29-
--color-accent: 0deg 0% 100% / 8%;
30-
--color-accent-hover: 0deg 0% 100% / 12%;
18+
/* 主题颜色 */
19+
--primary: 211 91% 39%;
20+
--primary-foreground: 0 0 98%;
3121

32-
/* 普通颜色前景色，如按钮文本颜色 */
33-
--color-accent-foreground: 0 0 98%;
22+
/* Used for destructive actions such as <Button variant="destructive"> */
23+
--destructive: 0 63% 31%;
24+
--destructive-foreground: 0 0 98%;
3425

35-
/* 破坏性颜色 */
36-
--color-destructive: 0 63% 31%;
26+
/* Used for success actions such as <message> */
27+
--success: 144 57% 58%;
28+
--success-foreground: 0 0 98%;
3729

38-
/* 破坏性颜色 */
39-
--color-destructive-foreground: 0 86% 97%;
40-
--color-muted: 220deg 6.82% 17.25%;
41-
--color-muted-foreground: 215 20.2% 65.1%;
42-
--color-heavy: 0deg 0% 100% / 12%;
43-
--color-heavy-foreground: var(--color-accent-foreground);
30+
/* Used for warning actions such as <message> */
31+
--warning: 42 84% 61%;
32+
--warning-foreground: 0 0 98%;
4433

45-
/* 基础边框色 */
46-
--color-border: 0deg 0% 100% / 10%;
34+
/* 颜色次要 */
35+
--secondary: 240 5% 17%;
36+
--secondary-foreground: 0 0 98%;
4737

48-
/* --color-popover: 240 4% 29%; */
49-
--color-popover: 222.86deg 8.43% 16.27%;
50-
--color-popover-foreground: 210 40% 98%;
51-
--color-card: 222.2 84% 4.9%;
52-
--color-card-foreground: 210 40% 98%;
38+
/* Used for accents such as hover effects on <DropdownMenuItem>, <SelectItem>...etc */
39+
--accent: 0deg 0% 100% / 8%;
40+
--accent-hover: 0deg 0% 100% / 12%;
41+
--accent-foreground: 0 0 98%;
5342

54-
/* 基础文本边框色 */
55-
--color-input: 0deg 0% 100% / 10%;
43+
/* Darker color */
44+
--heavy: 0deg 0% 100% / 12%;
45+
--heavy-foreground: var(--accent-foreground);
5646

57-
/* input placeholder 颜色 */
58-
--color-input-placeholder: 218deg 11% 65%;
47+
/* Default border color */
48+
--border: 0deg 0% 100% / 10%;
5949

60-
/* 基础文本背景色 */
50+
/* Border color for inputs such as <Input />, <Select />, <Textarea /> */
51+
--input: 0deg 0% 100% / 10%;
52+
--input-placeholder: 218deg 11% 65%;
53+
--input-background: 0deg 0% 100% / 5%;
6154

62-
/* --color-input-background: 216deg 5.38% 18.24%; */
63-
--color-input-background: 0deg 0% 100% / 5%;
55+
/* Used for focus ring */
56+
--ring: 222.2 84% 4.9%;
6457

6558
/* 遮罩颜色 */
66-
--color-overlay: 0deg 0% 0% / 40%;
67-
--color-ring: 222.2 84% 4.9%;
59+
--overlay: 0deg 0% 0% / 40%;
6860

6961
/* 基本文字大小 */
7062
--font-size-base: 16px;
7163

7264
/* 基本圆角大小 */
73-
--radius-base: 0.5rem;
65+
--radius: 0.5rem;
7466

7567
color-scheme: dark;
7668
}

0 commit comments

Comments
 (0)