Skip to content

Commit 63f9c27

Browse files
committed
🎨
1 parent 400ae6e commit 63f9c27

File tree

3 files changed

+30
-23
lines changed

3 files changed

+30
-23
lines changed

packages/frontend/src/components/MkSystemWebhookEditor.vue

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ SPDX-License-Identifier: AGPL-3.0-only
1919
{{ mode === 'create' ? i18n.ts._webhookSettings.createWebhook : i18n.ts._webhookSettings.modifyWebhook }}
2020
</template>
2121

22-
<div>
23-
<MkSpacer :marginMin="20" :marginMax="28">
22+
<div style="display: flex; flex-direction: column; min-height: 100%;">
23+
<MkSpacer :marginMin="20" :marginMax="28" style="flex-grow: 1;">
2424
<MkLoading v-if="loading !== 0"/>
2525
<div v-else :class="$style.root" class="_gaps_m">
2626
<MkInput v-model="title">
@@ -226,6 +226,7 @@ onMounted(async () => {
226226

227227
.footer {
228228
position: sticky;
229+
z-index: 10000;
229230
bottom: 0;
230231
left: 0;
231232
padding: 12px;

packages/frontend/src/pages/admin/abuse-report/notification-recipient.editor.vue

+24-19
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ SPDX-License-Identifier: AGPL-3.0-only
1616
<template #header>
1717
{{ mode === 'create' ? i18n.ts._abuseReport._notificationRecipient.createRecipient : i18n.ts._abuseReport._notificationRecipient.modifyRecipient }}
1818
</template>
19-
<div v-if="loading === 0">
20-
<MkSpacer :marginMin="20" :marginMax="28">
19+
<div v-if="loading === 0" style="display: flex; flex-direction: column; min-height: 100%;">
20+
<MkSpacer :marginMin="20" :marginMax="28" style="flex-grow: 1;">
2121
<div :class="$style.root" class="_gaps_m">
2222
<MkInput v-model="title">
2323
<template #label>{{ i18n.ts.title }}</template>
@@ -44,7 +44,7 @@ SPDX-License-Identifier: AGPL-3.0-only
4444
{{ webhook.name }}
4545
</option>
4646
</MkSelect>
47-
<MkButton rounded @click="onEditSystemWebhookClicked">
47+
<MkButton rounded :class="$style.systemWebhookEditButton" @click="onEditSystemWebhookClicked">
4848
<span v-if="systemWebhookId === null" class="ti ti-plus" style="line-height: normal"/>
4949
<span v-else class="ti ti-settings" style="line-height: normal"/>
5050
</MkButton>
@@ -60,8 +60,8 @@ SPDX-License-Identifier: AGPL-3.0-only
6060
</MkSpacer>
6161

6262
<div :class="$style.footer" class="_buttonsCenter">
63-
<MkButton primary :disabled="disableSubmitButton" @click="onSubmitClicked"><i class="ti ti-check"></i> {{ i18n.ts.ok }}</MkButton>
64-
<MkButton @click="onCancelClicked"><i class="ti ti-x"></i> {{ i18n.ts.cancel }}</MkButton>
63+
<MkButton primary rounded :disabled="disableSubmitButton" @click="onSubmitClicked"><i class="ti ti-check"></i> {{ i18n.ts.ok }}</MkButton>
64+
<MkButton rounded @click="onCancelClicked"><i class="ti ti-x"></i> {{ i18n.ts.cancel }}</MkButton>
6565
</div>
6666
</div>
6767
<div v-else>
@@ -289,10 +289,15 @@ onMounted(async () => {
289289
}
290290

291291
.footer {
292-
display: flex;
293-
justify-content: center;
294-
align-items: flex-end;
295-
margin-top: 20px;
292+
position: sticky;
293+
z-index: 10000;
294+
bottom: 0;
295+
left: 0;
296+
padding: 12px;
297+
border-top: solid 0.5px var(--divider);
298+
background: var(--acrylicBg);
299+
-webkit-backdrop-filter: var(--blur, blur(15px));
300+
backdrop-filter: var(--blur, blur(15px));
296301
}
297302

298303
.systemWebhook {
@@ -301,16 +306,16 @@ onMounted(async () => {
301306
justify-content: stretch;
302307
align-items: flex-end;
303308
gap: 8px;
309+
}
304310

305-
button {
306-
min-width: 0;
307-
min-height: 0;
308-
width: 34px;
309-
height: 34px;
310-
flex-shrink: 0;
311-
box-sizing: border-box;
312-
margin: 1px 0;
313-
padding: 6px;
314-
}
311+
.systemWebhookEditButton {
312+
min-width: 0;
313+
min-height: 0;
314+
width: 34px;
315+
height: 34px;
316+
flex-shrink: 0;
317+
box-sizing: border-box;
318+
margin: 1px 0;
319+
padding: 6px;
315320
}
316321
</style>

packages/frontend/src/pages/emoji-edit-dialog.vue

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ SPDX-License-Identifier: AGPL-3.0-only
1515
<template v-if="emoji" #header>:{{ emoji.name }}:</template>
1616
<template v-else #header>New emoji</template>
1717

18-
<div>
19-
<MkSpacer :marginMin="20" :marginMax="28">
18+
<div style="display: flex; flex-direction: column; min-height: 100%;">
19+
<MkSpacer :marginMin="20" :marginMax="28" style="flex-grow: 1;">
2020
<div class="_gaps_m">
2121
<div v-if="imgUrl != null" :class="$style.imgs">
2222
<div style="background: #000;" :class="$style.imgContainer">
@@ -239,6 +239,7 @@ async function del() {
239239

240240
.footer {
241241
position: sticky;
242+
z-index: 10000;
242243
bottom: 0;
243244
left: 0;
244245
padding: 12px;

0 commit comments

Comments
 (0)