summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <4439005+syuilo@users.noreply.github.com>2024-07-30 20:58:25 +0900
committersyuilo <4439005+syuilo@users.noreply.github.com>2024-07-30 20:58:25 +0900
commit63f9c271ca9958abb00d879be01a045d25d261d1 (patch)
tree2a53fbf79fe3c9a9c85a9e779ff0bf23679a7fb3
parentBump version to 2024.7.0-rc.8 (diff)
downloadsharkey-63f9c271ca9958abb00d879be01a045d25d261d1.tar.gz
sharkey-63f9c271ca9958abb00d879be01a045d25d261d1.tar.bz2
sharkey-63f9c271ca9958abb00d879be01a045d25d261d1.zip
:art:
-rw-r--r--packages/frontend/src/components/MkSystemWebhookEditor.vue5
-rw-r--r--packages/frontend/src/pages/admin/abuse-report/notification-recipient.editor.vue43
-rw-r--r--packages/frontend/src/pages/emoji-edit-dialog.vue5
3 files changed, 30 insertions, 23 deletions
diff --git a/packages/frontend/src/components/MkSystemWebhookEditor.vue b/packages/frontend/src/components/MkSystemWebhookEditor.vue
index a141b4ff74..cad2e99e4d 100644
--- a/packages/frontend/src/components/MkSystemWebhookEditor.vue
+++ b/packages/frontend/src/components/MkSystemWebhookEditor.vue
@@ -19,8 +19,8 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ mode === 'create' ? i18n.ts._webhookSettings.createWebhook : i18n.ts._webhookSettings.modifyWebhook }}
</template>
- <div>
- <MkSpacer :marginMin="20" :marginMax="28">
+ <div style="display: flex; flex-direction: column; min-height: 100%;">
+ <MkSpacer :marginMin="20" :marginMax="28" style="flex-grow: 1;">
<MkLoading v-if="loading !== 0"/>
<div v-else :class="$style.root" class="_gaps_m">
<MkInput v-model="title">
@@ -226,6 +226,7 @@ onMounted(async () => {
.footer {
position: sticky;
+ z-index: 10000;
bottom: 0;
left: 0;
padding: 12px;
diff --git a/packages/frontend/src/pages/admin/abuse-report/notification-recipient.editor.vue b/packages/frontend/src/pages/admin/abuse-report/notification-recipient.editor.vue
index 015109f54e..827e22e8ae 100644
--- a/packages/frontend/src/pages/admin/abuse-report/notification-recipient.editor.vue
+++ b/packages/frontend/src/pages/admin/abuse-report/notification-recipient.editor.vue
@@ -16,8 +16,8 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #header>
{{ mode === 'create' ? i18n.ts._abuseReport._notificationRecipient.createRecipient : i18n.ts._abuseReport._notificationRecipient.modifyRecipient }}
</template>
- <div v-if="loading === 0">
- <MkSpacer :marginMin="20" :marginMax="28">
+ <div v-if="loading === 0" style="display: flex; flex-direction: column; min-height: 100%;">
+ <MkSpacer :marginMin="20" :marginMax="28" style="flex-grow: 1;">
<div :class="$style.root" class="_gaps_m">
<MkInput v-model="title">
<template #label>{{ i18n.ts.title }}</template>
@@ -44,7 +44,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ webhook.name }}
</option>
</MkSelect>
- <MkButton rounded @click="onEditSystemWebhookClicked">
+ <MkButton rounded :class="$style.systemWebhookEditButton" @click="onEditSystemWebhookClicked">
<span v-if="systemWebhookId === null" class="ti ti-plus" style="line-height: normal"/>
<span v-else class="ti ti-settings" style="line-height: normal"/>
</MkButton>
@@ -60,8 +60,8 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkSpacer>
<div :class="$style.footer" class="_buttonsCenter">
- <MkButton primary :disabled="disableSubmitButton" @click="onSubmitClicked"><i class="ti ti-check"></i> {{ i18n.ts.ok }}</MkButton>
- <MkButton @click="onCancelClicked"><i class="ti ti-x"></i> {{ i18n.ts.cancel }}</MkButton>
+ <MkButton primary rounded :disabled="disableSubmitButton" @click="onSubmitClicked"><i class="ti ti-check"></i> {{ i18n.ts.ok }}</MkButton>
+ <MkButton rounded @click="onCancelClicked"><i class="ti ti-x"></i> {{ i18n.ts.cancel }}</MkButton>
</div>
</div>
<div v-else>
@@ -289,10 +289,15 @@ onMounted(async () => {
}
.footer {
- display: flex;
- justify-content: center;
- align-items: flex-end;
- margin-top: 20px;
+ position: sticky;
+ z-index: 10000;
+ bottom: 0;
+ left: 0;
+ padding: 12px;
+ border-top: solid 0.5px var(--divider);
+ background: var(--acrylicBg);
+ -webkit-backdrop-filter: var(--blur, blur(15px));
+ backdrop-filter: var(--blur, blur(15px));
}
.systemWebhook {
@@ -301,16 +306,16 @@ onMounted(async () => {
justify-content: stretch;
align-items: flex-end;
gap: 8px;
+}
- button {
- min-width: 0;
- min-height: 0;
- width: 34px;
- height: 34px;
- flex-shrink: 0;
- box-sizing: border-box;
- margin: 1px 0;
- padding: 6px;
- }
+.systemWebhookEditButton {
+ min-width: 0;
+ min-height: 0;
+ width: 34px;
+ height: 34px;
+ flex-shrink: 0;
+ box-sizing: border-box;
+ margin: 1px 0;
+ padding: 6px;
}
</style>
diff --git a/packages/frontend/src/pages/emoji-edit-dialog.vue b/packages/frontend/src/pages/emoji-edit-dialog.vue
index d0a6bba47b..853c1d6b0b 100644
--- a/packages/frontend/src/pages/emoji-edit-dialog.vue
+++ b/packages/frontend/src/pages/emoji-edit-dialog.vue
@@ -15,8 +15,8 @@ SPDX-License-Identifier: AGPL-3.0-only
<template v-if="emoji" #header>:{{ emoji.name }}:</template>
<template v-else #header>New emoji</template>
- <div>
- <MkSpacer :marginMin="20" :marginMax="28">
+ <div style="display: flex; flex-direction: column; min-height: 100%;">
+ <MkSpacer :marginMin="20" :marginMax="28" style="flex-grow: 1;">
<div class="_gaps_m">
<div v-if="imgUrl != null" :class="$style.imgs">
<div style="background: #000;" :class="$style.imgContainer">
@@ -239,6 +239,7 @@ async function del() {
.footer {
position: sticky;
+ z-index: 10000;
bottom: 0;
left: 0;
padding: 12px;