From 01d8fa4e543b0a349c95ea7e60a79cf5ecc82157 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 23 Mar 2022 16:31:34 +0200 Subject: fix i18n at places --- src/components/shadow_control/shadow_control.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/components/shadow_control') diff --git a/src/components/shadow_control/shadow_control.vue b/src/components/shadow_control/shadow_control.vue index 511e07f3..b59ac3bc 100644 --- a/src/components/shadow_control/shadow_control.vue +++ b/src/components/shadow_control/shadow_control.vue @@ -204,12 +204,12 @@ v-model="selected.alpha" :disabled="!present" /> - --variable,mod - + -- cgit v1.2.3-70-g09d2 From 1d77063a4bd27074200bea9b7b19d9b92dd71649 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 27 Mar 2022 13:31:29 +0300 Subject: fix shadow control in theme tab --- src/components/shadow_control/shadow_control.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/components/shadow_control') diff --git a/src/components/shadow_control/shadow_control.js b/src/components/shadow_control/shadow_control.js index 2d5d6eb1..386a5756 100644 --- a/src/components/shadow_control/shadow_control.js +++ b/src/components/shadow_control/shadow_control.js @@ -30,18 +30,19 @@ const toModel = (object = {}) => ({ }) export default { - // 'Value' and 'Fallback' can be undefined, but if they are + // 'modelValue' and 'Fallback' can be undefined, but if they are // initially vue won't detect it when they become something else // therefore i'm using "ready" which should be passed as true when // data becomes available props: [ - 'value', 'fallback', 'ready' + 'modelValue', 'fallback', 'ready' ], + emits: ['update:modelValue'], data () { return { selectedId: 0, // TODO there are some bugs regarding display of array (it's not getting updated when deleting for some reason) - cValue: (this.value || this.fallback || []).map(toModel) + cValue: (this.modelValue || this.fallback || []).map(toModel) } }, components: { @@ -70,7 +71,7 @@ export default { } }, beforeUpdate () { - this.cValue = this.value || this.fallback + this.cValue = this.modelValue || this.fallback }, computed: { anyShadows () { @@ -105,7 +106,7 @@ export default { !this.usingFallback }, usingFallback () { - return typeof this.value === 'undefined' + return typeof this.modelValue === 'undefined' }, rgb () { return hex2rgb(this.selected.color) -- cgit v1.2.3-70-g09d2 From 650e69c33683b34e002f5fdc698ceb384baf059b Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 29 Mar 2022 00:02:02 +0300 Subject: fix misc warnings --- src/components/notification/notification.vue | 2 +- src/components/poll/poll.vue | 2 +- src/components/settings_modal/helpers/integer_setting.js | 2 +- src/components/settings_modal/tabs/theme_tab/theme_tab.vue | 6 +++--- src/components/shadow_control/shadow_control.vue | 2 +- src/components/thread_tree/thread_tree.vue | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/components/shadow_control') diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue index 23157a51..d77b2f57 100644 --- a/src/components/notification/notification.vue +++ b/src/components/notification/notification.vue @@ -112,7 +112,7 @@ - + {{ notification.emoji }} diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue index e949c653..c3880096 100644 --- a/src/components/poll/poll.vue +++ b/src/components/poll/poll.vue @@ -71,7 +71,7 @@ {{ $tc("polls.votes_count", poll.votes_count, { count: poll.votes_count }) }} ·  - +
- filter: drop-shadow()

{{ $t('settings.style.shadows.filter_hint.avatar_inset') }}

- @@ -966,7 +966,7 @@ spread-radius inset - diff --git a/src/components/shadow_control/shadow_control.vue b/src/components/shadow_control/shadow_control.vue index b59ac3bc..d1e5fc22 100644 --- a/src/components/shadow_control/shadow_control.vue +++ b/src/components/shadow_control/shadow_control.vue @@ -204,7 +204,7 @@ v-model="selected.alpha" :disabled="!present" /> - diff --git a/src/components/thread_tree/thread_tree.vue b/src/components/thread_tree/thread_tree.vue index 48942005..f81653eb 100644 --- a/src/components/thread_tree/thread_tree.vue +++ b/src/components/thread_tree/thread_tree.vue @@ -74,7 +74,7 @@ v-if="currentReplies.length && !threadShowing" class="thread-tree-replies thread-tree-replies-hidden" > - - Date: Tue, 29 Mar 2022 01:04:37 +0300 Subject: lint --- src/components/color_input/color_input.vue | 2 +- src/components/notification/notification.vue | 5 ++++- src/components/opacity_input/opacity_input.vue | 2 +- src/components/poll/poll.vue | 5 ++++- src/components/selectable_list/selectable_list.vue | 4 ++-- src/components/settings_modal/helpers/boolean_setting.vue | 2 +- src/components/settings_modal/helpers/choice_setting.vue | 2 +- src/components/settings_modal/settings_modal.vue | 7 +++++-- src/components/settings_modal/tabs/profile_tab.vue | 2 +- src/components/settings_modal/tabs/theme_tab/theme_tab.vue | 9 ++++++--- src/components/shadow_control/shadow_control.vue | 3 ++- src/components/thread_tree/thread_tree.vue | 6 ++++-- src/components/user_avatar/user_avatar.vue | 2 +- src/components/user_reporting_modal/user_reporting_modal.vue | 2 +- 14 files changed, 34 insertions(+), 19 deletions(-) (limited to 'src/components/shadow_control') diff --git a/src/components/color_input/color_input.vue b/src/components/color_input/color_input.vue index bb25f5a8..e84603c3 100644 --- a/src/components/color_input/color_input.vue +++ b/src/components/color_input/color_input.vue @@ -11,7 +11,7 @@ - + {{ notification.emoji }} diff --git a/src/components/opacity_input/opacity_input.vue b/src/components/opacity_input/opacity_input.vue index 83bc917d..15d08e04 100644 --- a/src/components/opacity_input/opacity_input.vue +++ b/src/components/opacity_input/opacity_input.vue @@ -11,7 +11,7 @@
- +
@@ -31,7 +31,7 @@ >
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" > 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 @@ {{ ' ' }} diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue index e0e8304d..18dd3d7a 100644 --- a/src/components/settings_modal/settings_modal.vue +++ b/src/components/settings_modal/settings_modal.vue @@ -110,15 +110,12 @@ - + {{ $t("settings.expert_mode") }}
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue index d3f6727f..b78581bd 100644 --- a/src/components/settings_modal/tabs/profile_tab.vue +++ b/src/components/settings_modal/tabs/profile_tab.vue @@ -184,8 +184,8 @@