Page MenuHomePhorge
Files F85832103

No OneTemporary
Actions

Authored By
Unknown
Size
4 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/src/components/user_timed_filter_modal/user_timed_filter_modal.scss b/src/components/user_timed_filter_modal/user_timed_filter_modal.scss
index 24388868f1..9616564428 100644
--- a/src/components/user_timed_filter_modal/user_timed_filter_modal.scss
+++ b/src/components/user_timed_filter_modal/user_timed_filter_modal.scss
@@ -1,13 +1,24 @@
.UserTimedFilterModal {
.input-dont-ask-again {
margin-left: 1em;
}
.input-expire-at {
margin-left: 0.25em;
}
.footer-left-checkbox {
width: max-content;
}
+
+ .expirationTime {
+ display: inline-flex;
+ white-space: nowrap;
+ padding: 0.5em;
+ }
+
+ .dialog-modal-content .checkbox {
+ vertical-align: middle;
+ padding: 0.5em;
+ }
}
diff --git a/src/components/user_timed_filter_modal/user_timed_filter_modal.vue b/src/components/user_timed_filter_modal/user_timed_filter_modal.vue
index 91c05ad773..0ccf2812c7 100644
--- a/src/components/user_timed_filter_modal/user_timed_filter_modal.vue
+++ b/src/components/user_timed_filter_modal/user_timed_filter_modal.vue
@@ -1,86 +1,88 @@
<template>
<confirm-modal
v-if="showing"
class="UserTimedFilterModal"
:title="$t(isMute ? $t('user_card.mute') : $t('user_card.block'))"
:confirm-text="$t(isMute ? 'user_card.mute_confirm_accept_button' : 'user_card.block_confirm_accept_button')"
:cancel-text="$t(isMute ? 'user_card.mute_confirm_cancel_button' : 'user_card.block_confirm_cancel_button')"
@accepted="accept"
@cancelled="cancel"
>
<p>
{{ $t(isMute ? 'user_card.expire_mute_message' : 'user_card.expire_block_message', [user.screen_name]) }}
</p>
- <p>
+ <div>
{{ $t('user_card.expire_in') }}
- <input
- id="userFilterExpires"
- v-model="expiration"
- class="input input-expire-in"
- :class="{ disabled: forever }"
- :disabled="forever"
- min="1"
- type="number"
- >
- <Select
- id="userFilterExpiresUnit"
- v-model="expirationUnit"
- class="input unit-input unstyled"
- :disabled="forever"
- >
- <option
- key="s"
- value="s"
+ <span class="expirationTime">
+ <input
+ id="userFilterExpires"
+ v-model="expiration"
+ class="input input-expire-in"
+ :class="{ disabled: forever }"
+ :disabled="forever"
+ min="1"
+ type="number"
>
- {{ $t('time.unit.seconds_suffix') }}
- </option>
- <option
- key="m"
- value="m"
+ <Select
+ id="userFilterExpiresUnit"
+ v-model="expirationUnit"
+ class="input unit-input unstyled"
+ :disabled="forever"
>
- {{ $t('time.unit.minutes_suffix') }}
- </option>
- <option
- key="h"
- value="h"
- >
- {{ $t('time.unit.hours_suffix') }}
- </option>
- <option
- key="d"
- value="d"
- >
- {{ $t('time.unit.days_suffix') }}
- </option>
- </Select>
+ <option
+ key="s"
+ value="s"
+ >
+ {{ $t('time.unit.seconds_suffix') }}
+ </option>
+ <option
+ key="m"
+ value="m"
+ >
+ {{ $t('time.unit.minutes_suffix') }}
+ </option>
+ <option
+ key="h"
+ value="h"
+ >
+ {{ $t('time.unit.hours_suffix') }}
+ </option>
+ <option
+ key="d"
+ value="d"
+ >
+ {{ $t('time.unit.days_suffix') }}
+ </option>
+ </Select>
+ </span>
{{ $t('user_card.mute_or') }}
<Checkbox
id="forever"
v-model="forever"
name="forever"
class="input-forever"
>
{{ $t('user_card.mute_block_never') }}
</Checkbox>
- </p>
+ </div>
<template #footerLeft>
<div class="footer-left-checkbox">
<Checkbox
id="dontAskAgain"
v-model="dontAskAgain"
name="dontAskAgain"
class="input-dont-ask-again"
>
{{ $t(isMute ? 'user_card.dont_ask_again_mute' : 'user_card.dont_ask_again_block') }}
</Checkbox>
</div>
</template>
</confirm-modal>
</template>
<script src="./user_timed_filter_modal.js"></script>
<style lang="scss" src="./user_timed_filter_modal.scss" />

File Metadata

Mime Type
text/x-diff
Expires
Mon, Nov 2, 3:53 AM (7 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1803563
Default Alt Text
(4 KB)

Event Timeline