Lint some things
This commit is contained in:
parent
e747ee896e
commit
3294df0325
13 changed files with 56 additions and 16 deletions
|
|
@ -12,6 +12,8 @@
|
||||||
"custom-property-pattern": null,
|
"custom-property-pattern": null,
|
||||||
"keyframes-name-pattern": null,
|
"keyframes-name-pattern": null,
|
||||||
"scss/operator-no-newline-after": null,
|
"scss/operator-no-newline-after": null,
|
||||||
|
"declaration-property-value-no-unknown": true,
|
||||||
|
"scss/declaration-property-value-no-unknown": true,
|
||||||
"declaration-block-no-redundant-longhand-properties": [
|
"declaration-block-no-redundant-longhand-properties": [
|
||||||
true,
|
true,
|
||||||
{
|
{
|
||||||
|
|
|
||||||
0
changelog.d/linter.skip
Normal file
0
changelog.d/linter.skip
Normal file
|
|
@ -1075,7 +1075,7 @@ option {
|
||||||
scale: 1.0063 0.9938;
|
scale: 1.0063 0.9938;
|
||||||
translate: 0 -10%;
|
translate: 0 -10%;
|
||||||
transform: rotateZ(var(--defaultZ));
|
transform: rotateZ(var(--defaultZ));
|
||||||
animation-timing-function: ease-in-ou;
|
animation-timing-function: ease-in-out;
|
||||||
}
|
}
|
||||||
|
|
||||||
90% {
|
90% {
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,10 @@
|
||||||
<template>
|
<template>
|
||||||
<basic-user-card :user="user">
|
<basic-user-card :user="user">
|
||||||
<div class="block-card-content-container">
|
<div class="block-card-content-container">
|
||||||
<span v-if="blocked && blockExpiryAvailable" class="alert neutral">
|
<span
|
||||||
|
v-if="blocked && blockExpiryAvailable"
|
||||||
|
class="alert neutral"
|
||||||
|
>
|
||||||
{{ blockExpiry }}
|
{{ blockExpiry }}
|
||||||
</span>
|
</span>
|
||||||
{{ ' ' }}
|
{{ ' ' }}
|
||||||
|
|
@ -22,9 +25,9 @@
|
||||||
</div>
|
</div>
|
||||||
<teleport to="#modal">
|
<teleport to="#modal">
|
||||||
<UserTimedFilterModal
|
<UserTimedFilterModal
|
||||||
|
ref="timedBlockDialog"
|
||||||
:user="user"
|
:user="user"
|
||||||
:is-mute="false"
|
:is-mute="false"
|
||||||
ref="timedBlockDialog"
|
|
||||||
/>
|
/>
|
||||||
</teleport>
|
</teleport>
|
||||||
</basic-user-card>
|
</basic-user-card>
|
||||||
|
|
|
||||||
|
|
@ -154,10 +154,12 @@
|
||||||
// Autoprefixed seem to ignore this one, and also syntax is different
|
// Autoprefixed seem to ignore this one, and also syntax is different
|
||||||
/* stylelint-disable mask-composite */
|
/* stylelint-disable mask-composite */
|
||||||
/* stylelint-disable declaration-property-value-no-unknown */
|
/* stylelint-disable declaration-property-value-no-unknown */
|
||||||
|
/* stylelint-disable scss/declaration-property-value-no-unknown */
|
||||||
|
|
||||||
/* TODO check if this is still needed */
|
/* TODO check if this is still needed */
|
||||||
mask-composite: xor;
|
mask-composite: xor;
|
||||||
/* stylelint-enable declaration-property-value-no-unknown */
|
/* stylelint-enable declaration-property-value-no-unknown */
|
||||||
|
/* stylelint-enable scss/declaration-property-value-no-unknown */
|
||||||
/* stylelint-enable mask-composite */
|
/* stylelint-enable mask-composite */
|
||||||
mask-composite: exclude;
|
mask-composite: exclude;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -159,9 +159,11 @@
|
||||||
/* Autoprefixed seem to ignore this one, and also syntax is different */
|
/* Autoprefixed seem to ignore this one, and also syntax is different */
|
||||||
/* stylelint-disable mask-composite */
|
/* stylelint-disable mask-composite */
|
||||||
/* stylelint-disable declaration-property-value-no-unknown */
|
/* stylelint-disable declaration-property-value-no-unknown */
|
||||||
|
/* stylelint-disable scss/declaration-property-value-no-unknown */
|
||||||
|
|
||||||
/* TODO check if this is still needed */
|
/* TODO check if this is still needed */
|
||||||
mask-composite: xor;
|
mask-composite: xor;
|
||||||
|
/* stylelint-enable scss/declaration-property-value-no-unknown */
|
||||||
/* stylelint-enable declaration-property-value-no-unknown */
|
/* stylelint-enable declaration-property-value-no-unknown */
|
||||||
/* stylelint-enable mask-composite */
|
/* stylelint-enable mask-composite */
|
||||||
mask-composite: exclude;
|
mask-composite: exclude;
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,10 @@
|
||||||
<template>
|
<template>
|
||||||
<basic-user-card :user="user">
|
<basic-user-card :user="user">
|
||||||
<div class="mute-card-content-container">
|
<div class="mute-card-content-container">
|
||||||
<span v-if="muted && muteExpiryAvailable" class="alert neutral">
|
<span
|
||||||
|
v-if="muted && muteExpiryAvailable"
|
||||||
|
class="alert neutral"
|
||||||
|
>
|
||||||
{{ muteExpiry }}
|
{{ muteExpiry }}
|
||||||
</span>
|
</span>
|
||||||
{{ ' ' }}
|
{{ ' ' }}
|
||||||
|
|
@ -22,9 +25,9 @@
|
||||||
</div>
|
</div>
|
||||||
<teleport to="#modal">
|
<teleport to="#modal">
|
||||||
<UserTimedFilterModal
|
<UserTimedFilterModal
|
||||||
|
ref="timedMuteDialog"
|
||||||
:user="user"
|
:user="user"
|
||||||
:is-mute="true"
|
:is-mute="true"
|
||||||
ref="timedMuteDialog"
|
|
||||||
/>
|
/>
|
||||||
</teleport>
|
</teleport>
|
||||||
</basic-user-card>
|
</basic-user-card>
|
||||||
|
|
|
||||||
|
|
@ -95,8 +95,8 @@
|
||||||
</option>
|
</option>
|
||||||
</Select>
|
</Select>
|
||||||
<ul
|
<ul
|
||||||
class="setting-list suboptions"
|
|
||||||
v-if="onMuteDefaultActionLv1 === 'temporarily'"
|
v-if="onMuteDefaultActionLv1 === 'temporarily'"
|
||||||
|
class="setting-list suboptions"
|
||||||
>
|
>
|
||||||
<li>
|
<li>
|
||||||
<UnitSetting
|
<UnitSetting
|
||||||
|
|
@ -125,8 +125,8 @@
|
||||||
</option>
|
</option>
|
||||||
</Select>
|
</Select>
|
||||||
<ul
|
<ul
|
||||||
class="setting-list suboptions"
|
|
||||||
v-if="onBlockDefaultActionLv1 === 'temporarily'"
|
v-if="onBlockDefaultActionLv1 === 'temporarily'"
|
||||||
|
class="setting-list suboptions"
|
||||||
>
|
>
|
||||||
<li>
|
<li>
|
||||||
<UnitSetting
|
<UnitSetting
|
||||||
|
|
|
||||||
|
|
@ -107,7 +107,10 @@
|
||||||
</BooleanSetting>
|
</BooleanSetting>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<BooleanSetting v-if="!blockExpirationSupported" path="modalOnBlock">
|
<BooleanSetting
|
||||||
|
v-if="!blockExpirationSupported"
|
||||||
|
path="modalOnBlock"
|
||||||
|
>
|
||||||
{{ $t('settings.confirm_dialogs_block') }}
|
{{ $t('settings.confirm_dialogs_block') }}
|
||||||
</BooleanSetting>
|
</BooleanSetting>
|
||||||
</li>
|
</li>
|
||||||
|
|
|
||||||
|
|
@ -95,9 +95,9 @@
|
||||||
:user="user"
|
:user="user"
|
||||||
/>
|
/>
|
||||||
<UserTimedFilterModal
|
<UserTimedFilterModal
|
||||||
|
ref="confirmUser"
|
||||||
:is-mute="true"
|
:is-mute="true"
|
||||||
:user="user"
|
:user="user"
|
||||||
ref="confirmUser"
|
|
||||||
/>
|
/>
|
||||||
</teleport>
|
</teleport>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -73,9 +73,11 @@
|
||||||
/* Autoprefixed seem to ignore this one, and also syntax is different */
|
/* Autoprefixed seem to ignore this one, and also syntax is different */
|
||||||
/* stylelint-disable mask-composite */
|
/* stylelint-disable mask-composite */
|
||||||
/* stylelint-disable declaration-property-value-no-unknown */
|
/* stylelint-disable declaration-property-value-no-unknown */
|
||||||
|
/* stylelint-disable scss/declaration-property-value-no-unknown */
|
||||||
|
|
||||||
/* TODO check if this is still needed */
|
/* TODO check if this is still needed */
|
||||||
mask-composite: xor;
|
mask-composite: xor;
|
||||||
|
/* stylelint-enable scss/declaration-property-value-no-unknown */
|
||||||
/* stylelint-enable declaration-property-value-no-unknown */
|
/* stylelint-enable declaration-property-value-no-unknown */
|
||||||
/* stylelint-enable mask-composite */
|
/* stylelint-enable mask-composite */
|
||||||
mask-composite: exclude;
|
mask-composite: exclude;
|
||||||
|
|
@ -156,9 +158,11 @@
|
||||||
/* Autoprefixed seem to ignore this one, and also syntax is different */
|
/* Autoprefixed seem to ignore this one, and also syntax is different */
|
||||||
/* stylelint-disable mask-composite */
|
/* stylelint-disable mask-composite */
|
||||||
/* stylelint-disable declaration-property-value-no-unknown */
|
/* stylelint-disable declaration-property-value-no-unknown */
|
||||||
|
/* stylelint-disable scss/declaration-property-value-no-unknown */
|
||||||
|
|
||||||
/* TODO check if this is still needed */
|
/* TODO check if this is still needed */
|
||||||
mask-composite: xor;
|
mask-composite: xor;
|
||||||
|
/* stylelint-enable scss/declaration-property-value-no-unknown */
|
||||||
/* stylelint-enable declaration-property-value-no-unknown */
|
/* stylelint-enable declaration-property-value-no-unknown */
|
||||||
/* stylelint-enable mask-composite */
|
/* stylelint-enable mask-composite */
|
||||||
mask-composite: exclude;
|
mask-composite: exclude;
|
||||||
|
|
|
||||||
|
|
@ -33,9 +33,11 @@
|
||||||
// Autoprefixer seem to ignore this one, and also syntax is different
|
// Autoprefixer seem to ignore this one, and also syntax is different
|
||||||
/* stylelint-disable mask-composite */
|
/* stylelint-disable mask-composite */
|
||||||
/* stylelint-disable declaration-property-value-no-unknown */
|
/* stylelint-disable declaration-property-value-no-unknown */
|
||||||
|
/* stylelint-disable scss/declaration-property-value-no-unknown */
|
||||||
|
|
||||||
/* TODO check if this is still needed */
|
/* TODO check if this is still needed */
|
||||||
mask-composite: xor;
|
mask-composite: xor;
|
||||||
|
/* stylelint-enable scss/declaration-property-value-no-unknown */
|
||||||
/* stylelint-enable declaration-property-value-no-unknown */
|
/* stylelint-enable declaration-property-value-no-unknown */
|
||||||
/* stylelint-enable mask-composite */
|
/* stylelint-enable mask-composite */
|
||||||
mask-composite: exclude;
|
mask-composite: exclude;
|
||||||
|
|
|
||||||
|
|
@ -8,17 +8,16 @@
|
||||||
@accepted="accept"
|
@accepted="accept"
|
||||||
@cancelled="cancel"
|
@cancelled="cancel"
|
||||||
>
|
>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
{{ $t(isMute ? 'user_card.expire_mute_message' : 'user_card.expire_block_message', [user.screen_name]) }}
|
{{ $t(isMute ? 'user_card.expire_mute_message' : 'user_card.expire_block_message', [user.screen_name]) }}
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
{{ $t('user_card.expire_in') }}
|
{{ $t('user_card.expire_in') }}
|
||||||
<input
|
<input
|
||||||
id="userFilterExpires"
|
id="userFilterExpires"
|
||||||
|
v-model="expiration"
|
||||||
class="input input-expire-in"
|
class="input input-expire-in"
|
||||||
:class="{ disabled: forever }"
|
:class="{ disabled: forever }"
|
||||||
v-model="expiration"
|
|
||||||
:disabled="forever"
|
:disabled="forever"
|
||||||
min="1"
|
min="1"
|
||||||
type="number"
|
type="number"
|
||||||
|
|
@ -29,10 +28,30 @@
|
||||||
class="input unit-input unstyled"
|
class="input unit-input unstyled"
|
||||||
:disabled="forever"
|
:disabled="forever"
|
||||||
>
|
>
|
||||||
<option key="s" value="s"> {{ $t('time.unit.seconds_suffix') }} </option>
|
<option
|
||||||
<option key="m" value="m"> {{ $t('time.unit.minutes_suffix') }} </option>
|
key="s"
|
||||||
<option key="h" value="h"> {{ $t('time.unit.hours_suffix') }} </option>
|
value="s"
|
||||||
<option key="d" value="d"> {{ $t('time.unit.days_suffix') }} </option>
|
>
|
||||||
|
{{ $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>
|
</Select>
|
||||||
|
|
||||||
{{ $t('user_card.mute_or') }}
|
{{ $t('user_card.mute_or') }}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue