diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-04-05 12:20:19 -0400 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-04-05 12:24:00 -0400 |
| commit | 7e7350eab5adfa25e3641f8fa8829f5c121713aa (patch) | |
| tree | e152391cf1d2cca067a2cf3988588a3401cea80d /packages/frontend/src/pages/admin | |
| parent | Merge branch 'misskey-develop' into merge/2025-03-24 (diff) | |
| parent | refactor(frontend): refactor styles (diff) | |
| download | sharkey-7e7350eab5adfa25e3641f8fa8829f5c121713aa.tar.gz sharkey-7e7350eab5adfa25e3641f8fa8829f5c121713aa.tar.bz2 sharkey-7e7350eab5adfa25e3641f8fa8829f5c121713aa.zip | |
Merge branch 'misskey-develop' into merge/2025-03-24
# Conflicts:
# .github/workflows/storybook.yml
# package.json
# packages/frontend/src/utility/autogen/settings-search-index.ts
# pnpm-lock.yaml
Diffstat (limited to 'packages/frontend/src/pages/admin')
4 files changed, 4 insertions, 4 deletions
diff --git a/packages/frontend/src/pages/admin/_header_.vue b/packages/frontend/src/pages/admin/_header_.vue index 03f70bc22b..fa16f8892c 100644 --- a/packages/frontend/src/pages/admin/_header_.vue +++ b/packages/frontend/src/pages/admin/_header_.vue @@ -66,7 +66,7 @@ const emit = defineEmits<{ (ev: 'update:tab', key: string); }>(); -const pageMetadata = inject(DI.pageMetadata); +const pageMetadata = inject(DI.pageMetadata, ref(null)); const el = useTemplateRef('el'); const tabHighlightEl = useTemplateRef('tabHighlightEl'); diff --git a/packages/frontend/src/pages/admin/roles.role.vue b/packages/frontend/src/pages/admin/roles.role.vue index 9e21aba8a0..887787e168 100644 --- a/packages/frontend/src/pages/admin/roles.role.vue +++ b/packages/frontend/src/pages/admin/roles.role.vue @@ -184,7 +184,7 @@ definePage(() => ({ .userItemSub { padding: 6px 12px; font-size: 85%; - color: var(--MI_THEME-fgTransparentWeak); + color: color(from var(--MI_THEME-fg) srgb r g b / 0.75); } .userItemMainBody { diff --git a/packages/frontend/src/pages/admin/settings.vue b/packages/frontend/src/pages/admin/settings.vue index 1f5fcc2d33..50187a03ee 100644 --- a/packages/frontend/src/pages/admin/settings.vue +++ b/packages/frontend/src/pages/admin/settings.vue @@ -459,6 +459,6 @@ definePage(() => ({ <style lang="scss" module> .subCaption { font-size: 0.85em; - color: var(--MI_THEME-fgTransparentWeak); + color: color(from var(--MI_THEME-fg) srgb r g b / 0.75); } </style> diff --git a/packages/frontend/src/pages/admin/system-webhook.item.vue b/packages/frontend/src/pages/admin/system-webhook.item.vue index 45f0fff107..b53667e98c 100644 --- a/packages/frontend/src/pages/admin/system-webhook.item.vue +++ b/packages/frontend/src/pages/admin/system-webhook.item.vue @@ -75,6 +75,6 @@ function onDeleteClick() { margin-right: 0.75em; flex-shrink: 0; text-align: center; - color: var(--MI_THEME-fgTransparentWeak); + color: color(from var(--MI_THEME-fg) srgb r g b / 0.75); } </style> |