From f15c8cca3703e6e11346560fc4830cd074166e0f Mon Sep 17 00:00:00 2001 From: yukineko <27853966+hideki0403@users.noreply.github.com> Date: Wed, 16 Oct 2024 00:13:18 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=204a356f1ba742ae3965d01ad17179d3af484?= =?UTF-8?q?6377a=20=E3=81=AB=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/MkDeleteScheduleEditor.vue | 2 +- .../src/components/MkPostFormDrafts.vue | 10 +-- .../components/MkReactionsViewer.reaction.vue | 4 +- .../src/components/MkSignupDialog.choice.vue | 30 +++++-- .../src/components/MkSignupDialog.rules.vue | 80 ++++++++++++++++--- .../frontend/src/pages/admin/supporter.vue | 4 +- .../src/pages/settings/notifications.note.vue | 59 +++++++------- .../frontend/src/pages/settings/post-form.vue | 2 +- packages/frontend/src/pages/supporter.vue | 6 +- .../src/ui/_common_/connection-status.vue | 6 +- packages/frontend/src/ui/universal-zen.vue | 46 +++++------ 11 files changed, 159 insertions(+), 90 deletions(-) diff --git a/packages/frontend/src/components/MkDeleteScheduleEditor.vue b/packages/frontend/src/components/MkDeleteScheduleEditor.vue index 12f4a946bf05..655ae4bbf3fe 100644 --- a/packages/frontend/src/components/MkDeleteScheduleEditor.vue +++ b/packages/frontend/src/components/MkDeleteScheduleEditor.vue @@ -240,7 +240,7 @@ watch([expiration, atDate, atTime, after, unit, isValid], () => { } .withAccent { - color: var(--accent); + color: var(--MI_THEME-accent); } .chevronOpening { diff --git a/packages/frontend/src/components/MkPostFormDrafts.vue b/packages/frontend/src/components/MkPostFormDrafts.vue index cefedbafb733..b854590fc0ea 100644 --- a/packages/frontend/src/components/MkPostFormDrafts.vue +++ b/packages/frontend/src/components/MkPostFormDrafts.vue @@ -109,10 +109,10 @@ onMounted(async () => { padding: 10px; gap: 6px; flex-grow: 1; - background-color: var(--buttonBg); + background-color: var(--MI_THEME-buttonBg); &:hover:not([aria-disabled="true"]) { - background-color: var(--buttonHoverBg); + background-color: var(--MI_THEME-buttonHoverBg); } &[aria-disabled="true"] { @@ -145,11 +145,11 @@ onMounted(async () => { align-items: center; justify-content: center; padding: 16px; - background-color: var(--buttonBg); - color: var(--error); + background-color: var(--MI_THEME-buttonBg); + color: var(--MI_THEME-error); &:hover { - background-color: var(--error); + background-color: var(--MI_THEME-error); color: white; } } diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue index b422de958c63..6d7c0fd3fc4c 100644 --- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue +++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue @@ -215,11 +215,11 @@ if (!mock) { &.canToggleFallback:not(.canToggle):not(.reacted) { box-sizing: border-box; - border: 2px dashed var(--switchBg); + border: 2px dashed var(--MI_THEME-switchBg); &.small { border-width: 1px; - border-color: var(--buttonBgSub); + border-color: var(--MI_THEME-buttonBgSub); } &:hover { diff --git a/packages/frontend/src/components/MkSignupDialog.choice.vue b/packages/frontend/src/components/MkSignupDialog.choice.vue index b065b4aaf9f5..a8901855942a 100644 --- a/packages/frontend/src/components/MkSignupDialog.choice.vue +++ b/packages/frontend/src/components/MkSignupDialog.choice.vue @@ -10,11 +10,24 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ i18n.tsx.registrationLimitDetails({ limit: instance.registrationLimitCooldown, count: instance.registrationLimit }) }} + + {{ i18n.tsx.registrationLimitDetails({ limit: instance.registrationLimitCooldown, count: + instance.registrationLimit }) }} +
{{ i18n.ts.doYouHaveInviteCode }}
- {{ i18n.ts.hasInviteCode }} - {{ i18n.ts.doesNotHaveInviteCode }} + + {{ i18n.ts.hasInviteCode }} + + + {{ i18n.ts.doesNotHaveInviteCode }} +
{{ i18n.ts.cancel }}
@@ -66,8 +79,8 @@ async function doneWithoutCode() { padding: 16px; text-align: center; font-size: 26px; - background-color: var(--accentedBg); - color: var(--accent); + background-color: var(--MI_THEME-accentedBg); + color: var(--MI_THEME-accent); } .rules { @@ -92,8 +105,8 @@ async function doneWithoutCode() { width: 32px; height: 32px; line-height: 32px; - background-color: var(--accentedBg); - color: var(--accent); + background-color: var(--MI_THEME-accentedBg); + color: var(--MI_THEME-accent); font-size: 13px; font-weight: bold; align-items: center; @@ -104,4 +117,5 @@ async function doneWithoutCode() { .ruleText { padding-top: 6px; -} +} + diff --git a/packages/frontend/src/components/MkSignupDialog.rules.vue b/packages/frontend/src/components/MkSignupDialog.rules.vue index ec3e79cfca58..bf8541f3f8a3 100644 --- a/packages/frontend/src/components/MkSignupDialog.rules.vue +++ b/packages/frontend/src/components/MkSignupDialog.rules.vue @@ -24,49 +24,103 @@ SPDX-License-Identifier: AGPL-3.0-only - +
    -
  1. +
  2. +
    +
- {{ i18n.ts.agree }} + + {{ i18n.ts.agree }} +
- + - {{ i18n.ts.agree }} + + {{ i18n.ts.agree }} + - + - {{ i18n.ts.basicNotesBeforeCreateAccount }} + {{ + i18n.ts.basicNotesBeforeCreateAccount }} - {{ i18n.ts.agree }} + + {{ i18n.ts.agree }} + - + {{ i18n.tsx.ageCheckDescription({ age: instance.ageRestrictionThreshold }) }} - {{ i18n.tsx.ageCheckYes({ age: instance.ageRestrictionThreshold }) }} + + {{ i18n.tsx.ageCheckYes({ age: + instance.ageRestrictionThreshold }) }} +
{{ i18n.ts.pleaseAgreeAllToContinue }}
{{ i18n.ts.cancel }} - {{ i18n.ts.continue }} + + {{ i18n.ts.continue }} +
diff --git a/packages/frontend/src/pages/admin/supporter.vue b/packages/frontend/src/pages/admin/supporter.vue index 59500b931a22..634c0ee9efbc 100644 --- a/packages/frontend/src/pages/admin/supporter.vue +++ b/packages/frontend/src/pages/admin/supporter.vue @@ -85,7 +85,7 @@ definePageMetadata({ diff --git a/packages/frontend/src/pages/settings/notifications.note.vue b/packages/frontend/src/pages/settings/notifications.note.vue index a7886cd61461..3780af8535d4 100644 --- a/packages/frontend/src/pages/settings/notifications.note.vue +++ b/packages/frontend/src/pages/settings/notifications.note.vue @@ -1,34 +1,34 @@