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/0710_下载中心_rxd

Browse Source 
# Conflicts:
#	src/components/_base/navbar/index.vue
#	src/styles/components/checkbox.scss
This commit is contained in:
rd
2025-07-14 10:01:14 +08:00
parent 789de0150e f7662769ac
commit 30c6fe4ced
124 changed files with 1350 additions and 17677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/styles/components/checkbox.scss
View File

@ -11,13 +11,13 @@
}
&.arco-checkbox-checked {
.arco-checkbox-icon {
background-color: #A794FE !important;
background-color: #a794fe !important;
}
}
&.arco-checkbox-indeterminate {
.arco-checkbox-icon {
border: none;
background-color: #A794FE !important;
background-color: #a794fe !important;
}
}
}
@ -28,5 +28,4 @@
border: none;
}
}
}

2
src/styles/components/pagination.scss
View File

@ -28,7 +28,7 @@
&-prepend {
color: var(--Text-2, #3c4043);
text-align: right;
font-family: 'PuHuiTi-Medium';
font-family: $font-family-medium;
font-size: 14px;
font-style: normal;
font-weight: 400;

2
src/styles/components/table.scss
View File

@ -1,7 +1,7 @@
.arco-table {
@mixin table-cell-text {
color: var(--Text-1, #3C4043);
font-family: 'PuHuiTi-Regular';
font-family: $font-family-regular;
font-size: 14px;
font-style: normal;
font-weight: 400;

2
src/styles/components/tabs.scss
View File

@ -4,7 +4,7 @@
.arco-tabs-tab {
.arco-tabs-tab-title {
color: var(--Text-2, #3c4043);
font-family: 'PuHuiTi-Medium';
font-family: $font-family-medium;
font-size: 16px;
font-style: normal;
font-weight: 400;