diff options
| author | Henry Jameson <me@hjkos.com> | 2022-03-29 15:35:47 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2022-03-29 15:35:47 +0300 |
| commit | 3e0bb91ff2133d4c26e0bd267a82ab5b64b2fa49 (patch) | |
| tree | ca025aed4b2cef42820bb8dbaf1c7e166d5d90bf /src/components/settings_modal | |
| parent | dc8bef7928cb6a5e06a793a78652234276ca6fce (diff) | |
| parent | 5bbc0e0bb5f4a0c95674e6879975e6b5121b421e (diff) | |
Merge branch 'vue3-again' into vue3-no-compat
* vue3-again:
lint + fixes for registration
fix production build's reply not working in tree mode
lock down version?
manual lint
Revert "fix weird thing i somehow missed"
Revert "lint"
fix weird thing i somehow missed
lint
Diffstat (limited to 'src/components/settings_modal')
5 files changed, 14 insertions, 8 deletions
diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue index 3808bc74..69584808 100644 --- a/src/components/settings_modal/helpers/boolean_setting.vue +++ b/src/components/settings_modal/helpers/boolean_setting.vue @@ -4,7 +4,7 @@ class="BooleanSetting" > <Checkbox - :modelValue="state" + :model-value="state" :disabled="disabled" @update:modelValue="update" > diff --git a/src/components/settings_modal/helpers/choice_setting.vue b/src/components/settings_modal/helpers/choice_setting.vue index b6aa853a..258c7422 100644 --- a/src/components/settings_modal/helpers/choice_setting.vue +++ b/src/components/settings_modal/helpers/choice_setting.vue @@ -6,7 +6,7 @@ <slot /> {{ ' ' }} <Select - :modelValue="state" + :model-value="state" :disabled="disabled" @update:modelValue="update" > diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue index 18dd3d7a..e0e8304d 100644 --- a/src/components/settings_modal/settings_modal.vue +++ b/src/components/settings_modal/settings_modal.vue @@ -110,12 +110,15 @@ </template> </Popover> - <Checkbox :modelValue="!!expertLevel" @update:modelValue="expertLevel = Number($event)"> + <Checkbox + :model-value="!!expertLevel" + @update:modelValue="expertLevel = Number($event)" + > {{ $t("settings.expert_mode") }} </Checkbox> <span - class="extra-content" id="unscrolled-content" + class="extra-content" /> </div> </div> diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue index b78581bd..d3f6727f 100644 --- a/src/components/settings_modal/tabs/profile_tab.vue +++ b/src/components/settings_modal/tabs/profile_tab.vue @@ -184,8 +184,8 @@ <button v-if="!isDefaultBackground" class="button-unstyled" - @click="resetBackground" :title="$t('settings.reset_profile_background')" + @click="resetBackground" > <FAIcon class="reset-button" diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue index dfa9a735..ff2fece9 100644 --- a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue +++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue @@ -951,14 +951,16 @@ :fallback="currentShadowFallback" /> <div v-if="shadowSelected === 'avatar' || shadowSelected === 'avatarStatus'"> - <i18n-t scope="global" + <i18n-t + scope="global" keypath="settings.style.shadows.filter_hint.always_drop_shadow" tag="p" > <code>filter: drop-shadow()</code> </i18n-t> <p>{{ $t('settings.style.shadows.filter_hint.avatar_inset') }}</p> - <i18n-t scope="global" + <i18n-t + scope="global" keypath="settings.style.shadows.filter_hint.drop_shadow_syntax" tag="p" > @@ -966,7 +968,8 @@ <code>spread-radius</code> <code>inset</code> </i18n-t> - <i18n-t scope="global" + <i18n-t + scope="global" keypath="settings.style.shadows.filter_hint.inset_classic" tag="p" > |