+
{{ $t('settings.style.themes3.editor.invalid') }}
@@ -107,8 +104,8 @@
diff --git a/src/components/contrast_ratio/contrast_ratio.vue b/src/components/contrast_ratio/contrast_ratio.vue
index 93799e4c2..2d3c5c834 100644
--- a/src/components/contrast_ratio/contrast_ratio.vue
+++ b/src/components/contrast_ratio/contrast_ratio.vue
@@ -11,22 +11,13 @@
class="rating"
>
-
+
-
+
-
+
-
+
-
+
-
+
@@ -73,9 +55,6 @@ library.add(
)
export default {
- components: {
- Tooltip
- },
props: {
large: {
required: false,
@@ -95,6 +74,9 @@ export default {
default: false
}
},
+ components: {
+ Tooltip
+ },
computed: {
hint () {
const levelVal = this.contrast.aaa ? 'aaa' : (this.contrast.aa ? 'aa' : 'bad')
diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index ae48139a3..d3d6563ab 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -97,7 +97,7 @@ const EmojiPicker = {
enableStickerPicker: {
required: false,
type: Boolean,
- default: true
+ default: false
},
hideCustomEmoji: {
required: false,
@@ -105,11 +105,7 @@ const EmojiPicker = {
default: false
}
},
- inject: {
- popoversZLayer: {
- default: ''
- }
- },
+ inject: ['popoversZLayer'],
data () {
return {
keyword: '',
diff --git a/src/components/extra_notifications/extra_notifications.vue b/src/components/extra_notifications/extra_notifications.vue
index ffbb43eb3..600c99bbb 100644
--- a/src/components/extra_notifications/extra_notifications.vue
+++ b/src/components/extra_notifications/extra_notifications.vue
@@ -56,7 +56,6 @@
tag="span"
class="notification tip extra-notification"
keypath="notifications.configuration_tip"
- scope="global"
>
diff --git a/src/components/login_form/login_form.vue b/src/components/login_form/login_form.vue
index 25392742f..3c152b2e4 100644
--- a/src/components/login_form/login_form.vue
+++ b/src/components/login_form/login_form.vue
@@ -3,9 +3,7 @@
diff --git a/src/components/mention_link/mention_link.js b/src/components/mention_link/mention_link.js
index 4e1ec23d6..6515bd116 100644
--- a/src/components/mention_link/mention_link.js
+++ b/src/components/mention_link/mention_link.js
@@ -53,9 +53,7 @@ const MentionLink = {
this.$router.push(link)
},
handleSelection () {
- if (this.$refs.full) {
- this.hasSelection = document.getSelection().containsNode(this.$refs.full, true)
- }
+ this.hasSelection = document.getSelection().containsNode(this.$refs.full, true)
}
},
mounted () {
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index 876e97726..a19e9ba55 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -125,7 +125,7 @@
diff --git a/src/components/navigation/navigation.js b/src/components/navigation/navigation.js
index 156cd8cb3..9fc264baa 100644
--- a/src/components/navigation/navigation.js
+++ b/src/components/navigation/navigation.js
@@ -1,16 +1,11 @@
-// routes that take :username property
export const USERNAME_ROUTES = new Set([
+ 'bookmarks',
'dms',
'interactions',
'notifications',
'chat',
- 'chats'
-])
-
-// routes that take :name property
-export const NAME_ROUTES = new Set([
- 'user-profile',
- 'legacy-user-profile'
+ 'chats',
+ 'user-profile'
])
export const TIMELINES = {
@@ -99,9 +94,7 @@ export function routeTo (item, currentUser) {
}
if (USERNAME_ROUTES.has(route.name)) {
- route.params = { username: currentUser.screen_name }
- } else if (NAME_ROUTES.has(route.name)) {
- route.params = { name: currentUser.screen_name }
+ route.params = { username: currentUser.screen_name, name: currentUser.screen_name }
}
return route
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 044d43dbc..f84b75de3 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -47,6 +47,7 @@
>
- {{ label }}
+ {{ label }}
diff --git a/src/components/settings_modal/helpers/emoji_editing_popover.vue b/src/components/settings_modal/helpers/emoji_editing_popover.vue
index 1cca45fbf..f0465dd5d 100644
--- a/src/components/settings_modal/helpers/emoji_editing_popover.vue
+++ b/src/components/settings_modal/helpers/emoji_editing_popover.vue
@@ -112,10 +112,7 @@ export default {
components: { Popover, ConfirmModal, StillImage },
inject: ['emojiAddr'],
props: {
- placement: {
- type: String,
- required: true
- },
+ placement: String,
disabled: {
type: Boolean,
default: false
@@ -123,14 +120,8 @@ export default {
newUpload: Boolean,
- title: {
- type: String,
- required: true
- },
- packName: {
- type: String,
- required: true
- },
+ title: String,
+ packName: String,
shortcode: {
type: String,
// Only exists when this is not a new upload
diff --git a/src/components/settings_modal/helpers/integer_setting.vue b/src/components/settings_modal/helpers/integer_setting.vue
index 8206c0c45..43fa7e1a9 100644
--- a/src/components/settings_modal/helpers/integer_setting.vue
+++ b/src/components/settings_modal/helpers/integer_setting.vue
@@ -1,7 +1,7 @@