1
0

Merge branch 'misskey-develop' into merge/2025-03-24

# Conflicts:
#	package.json
#	packages/backend/src/core/AccountMoveService.ts
#	packages/frontend/src/components/MkDateSeparatedList.vue
#	packages/misskey-js/etc/misskey-js.api.md
#	pnpm-lock.yaml
This commit is contained in:
Hazelnoot
2025-04-03 22:04:11 -04:00
74 changed files with 622 additions and 242 deletions
@@ -13,18 +13,18 @@
fgHighlighted: '#6bc9a0',
fgOnWhite: '@accent',
divider: '#cfcfcf',
panel: '@X14',
panel: '#ebe7e5',
panelHeaderBg: '@panel',
panelHeaderDivider: '@divider',
header: ':alpha<0.7<@panel',
navBg: '@X14',
navBg: '#ebe7e5',
renote: '#229e92',
mention: '#da6d35',
mentionMe: '#d44c4c',
hashtag: '#4cb8d4',
link: '@accent',
buttonGradateB: ':hue<-70<@accent',
success: '#86b300',
X14: '#ebe7e5'
success: '@accent',
error: '#da5635',
},
}
@@ -18,5 +18,8 @@
mention: '@accent',
mentionMe: 'rgb(170, 149, 98)',
hashtag: '@accent',
error: '#db9184',
warn: '#dbc184',
success: '#a3c975',
},
}