From a6047e0ad5820e08308d3c7d5f54c14ba57fca5e Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 3 Sep 2018 22:12:18 +0300 Subject: Kinda went back to using align-items: stretch. Fixed error message floating. --- src/components/notifications/notifications.scss | 4 ---- src/components/timeline/timeline.vue | 12 +++--------- 2 files changed, 3 insertions(+), 13 deletions(-) (limited to 'src/components') diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss index 4dbceede..a137ccd5 100644 --- a/src/components/notifications/notifications.scss +++ b/src/components/notifications/notifications.scss @@ -22,10 +22,6 @@ } .loadmore-error { - min-width: 6em; - text-align: center; - padding: 0 0.25em 0 0.25em; - margin: 0; color: $fallback--fg; color: var(--fg, $fallback--fg); } diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index e42c0c4b..2dd4376a 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -4,12 +4,12 @@
{{title}}
-
{{$t('timeline.error_fetching')}}
+
{{$t('timeline.up_to_date')}}
@@ -58,7 +58,6 @@ .timeline { .loadmore-text { - font-size: 14px; opacity: 0.8; background-color: transparent; color: $fallback--faint; @@ -66,11 +65,6 @@ } .loadmore-error { - font-size: 14px; - min-width: 6em; - text-align: center; - padding: 0 0.25em 0 0.25em; - margin: 0; color: $fallback--fg; color: var(--fg, $fallback--fg); } -- cgit v1.2.3-70-g09d2 From d4f9d21857ae1dffce0d4627e536038138e015a5 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 3 Sep 2018 22:23:53 +0300 Subject: Fix last place with usercard having wrong width --- src/components/user_panel/user_panel.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/components') diff --git a/src/components/user_panel/user_panel.vue b/src/components/user_panel/user_panel.vue index 3d4f873d..2d5cb500 100644 --- a/src/components/user_panel/user_panel.vue +++ b/src/components/user_panel/user_panel.vue @@ -14,8 +14,10 @@ -- cgit v1.2.3-70-g09d2 From 6e64324d37e5b89050f965c6912dabb743cad306 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 3 Sep 2018 22:40:45 +0300 Subject: Fixed collapseMessageWithSubjectLocal always using instance-provided config. --- src/components/settings/settings.js | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'src/components') diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js index de12894b..8ef84b2a 100644 --- a/src/components/settings/settings.js +++ b/src/components/settings/settings.js @@ -6,21 +6,25 @@ import { filter, trim } from 'lodash' const settings = { data () { + const config = this.$store.state.config + return { - hideAttachmentsLocal: this.$store.state.config.hideAttachments, - hideAttachmentsInConvLocal: this.$store.state.config.hideAttachmentsInConv, - hideNsfwLocal: this.$store.state.config.hideNsfw, - notificationVisibilityLocal: this.$store.state.config.notificationVisibility, - replyVisibilityLocal: this.$store.state.config.replyVisibility, - loopVideoLocal: this.$store.state.config.loopVideo, - loopVideoSilentOnlyLocal: this.$store.state.config.loopVideoSilentOnly, - muteWordsString: this.$store.state.config.muteWords.join('\n'), - autoLoadLocal: this.$store.state.config.autoLoad, - streamingLocal: this.$store.state.config.streaming, - pauseOnUnfocusedLocal: this.$store.state.config.pauseOnUnfocused, - hoverPreviewLocal: this.$store.state.config.hoverPreview, - collapseMessageWithSubjectLocal: this.$store.state.config.collapseMessageWithSubject, - stopGifs: this.$store.state.config.stopGifs, + hideAttachmentsLocal: config.hideAttachments, + hideAttachmentsInConvLocal: config.hideAttachmentsInConv, + hideNsfwLocal: config.hideNsfw, + notificationVisibilityLocal: config.notificationVisibility, + replyVisibilityLocal: config.replyVisibility, + loopVideoLocal: config.loopVideo, + loopVideoSilentOnlyLocal: config.loopVideoSilentOnly, + muteWordsString: config.muteWords.join('\n'), + autoLoadLocal: config.autoLoad, + streamingLocal: config.streaming, + pauseOnUnfocusedLocal: config.pauseOnUnfocused, + hoverPreviewLocal: config.hoverPreview, + collapseMessageWithSubjectLocal: typeof config.collapseMessageWithSubject === 'undefined' + ? config.defaultCollapseMessageWithSubject + : config.collapseMessageWithSubject, + stopGifs: config.stopGifs, loopSilentAvailable: // Firefox Object.getOwnPropertyDescriptor(HTMLVideoElement.prototype, 'mozHasAudio') || -- cgit v1.2.3-70-g09d2 From f9eb9e0b70a419bd293d6a334802c5af97a22d76 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 3 Sep 2018 22:49:46 +0300 Subject: small fix for non-square gif avatars --- src/components/still-image/still-image.vue | 1 + 1 file changed, 1 insertion(+) (limited to 'src/components') diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue index e23f8bc1..1dcb7ce6 100644 --- a/src/components/still-image/still-image.vue +++ b/src/components/still-image/still-image.vue @@ -23,6 +23,7 @@ img { width: 100%; height: 100%; + object-fit: contain; } &.animated { -- cgit v1.2.3-70-g09d2 From dc0b47e8bda769a3df77a06632e696d54db750fb Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 3 Sep 2018 23:30:07 +0300 Subject: fix collapse link being too small --- src/components/conversation/conversation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/components') diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index e41929fd..5528fef6 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -3,7 +3,7 @@
{{ $t('timeline.conversation') }} - {{ $t('timeline.collapse') }} + {{ $t('timeline.collapse') }}
-- cgit v1.2.3-70-g09d2