renxiaodong/lingji-work-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into feature/v1.2灵机空间-内容上传审核_rxd

Browse Source 
# Conflicts:
#	pnpm-lock.yaml
#	src/components/_base/navbar/index.vue
#	src/components/text-over-tips/index.vue
#	src/layouts/Basic.vue
#	src/layouts/Page.vue
#	src/main.ts
#	src/router/constants.ts
#	src/router/index.ts
#	src/router/typeings.d.ts
#	src/utils/tools.ts
This commit is contained in:
rd
2025-08-14 15:06:46 +08:00
parent c3c0d2e40c c8899f620b
commit 9dea979afc
51 changed files with 5928 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/styles/lib/variable.scss
View File

@ -14,7 +14,7 @@ $font-family-manrope-medium: 'Manrope-Medium';
$font-family-manrope-bold: 'Manrope-Bold';
$font-family-manrope-semiBold: 'Manrope-SemiBold';
$color-background: #f9f9f9;
$color-background: #F7F8FA;
$color-primary: #6d4cfe; // 常规
$color-primary-5: #8A70FE; // hover