From a6047e0ad5820e08308d3c7d5f54c14ba57fca5e Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 3 Sep 2018 22:12:18 +0300 Subject: [PATCH 1/7] Kinda went back to using align-items: stretch. Fixed error message floating. --- src/App.scss | 23 ++++++++++++++++--- .../notifications/notifications.scss | 4 ---- src/components/timeline/timeline.vue | 12 +++------- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/App.scss b/src/App.scss index dd43c5caa6..6ae4a1bb23 100644 --- a/src/App.scss +++ b/src/App.scss @@ -325,18 +325,35 @@ main-router { background-size: cover; padding: .6em .6em; text-align: left; - font-size: 1.3em; - line-height: 24px; + line-height: 28px; background-color: $fallback--btn; background-color: var(--btn, $fallback--btn); align-items: baseline; .title { flex: 1 0 auto; + font-size: 1.3em; + } + + .alert { + white-space: nowrap; + text-overflow: ellipsis; + overflow-x: hidden; } button { - height: 100%; + flex-shrink: 0; + } + + button, .alert { + // height: 100%; + line-height: 21px; + min-height: 0; + box-sizing: border-box; + margin: 0; + margin-left: .25em; + min-width: 1px; + align-self: stretch; } } diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss index 4dbceedef9..a137ccd5ba 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 e42c0c4bfd..2dd4376a5b 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); } From 08b044c365527492b1f6d20f2f5a2acb125799b4 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 3 Sep 2018 22:18:59 +0300 Subject: [PATCH 2/7] Fixed non-masked image looking weird in chrome. --- src/App.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/App.scss b/src/App.scss index 6ae4a1bb23..056a235ef1 100644 --- a/src/App.scss +++ b/src/App.scss @@ -248,6 +248,7 @@ nav { justify-content: center; flex: 0 0 auto; z-index: -1; + .mask { mask-repeat: no-repeat; mask-position: center; @@ -260,7 +261,10 @@ nav { left: 0; right: 0; } + img { + height: 100%; + object-fit: contain; display: block; flex: 0; } From d4f9d21857ae1dffce0d4627e536038138e015a5 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 3 Sep 2018 22:23:53 +0300 Subject: [PATCH 3/7] Fix last place with usercard having wrong width --- src/components/user_panel/user_panel.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/user_panel/user_panel.vue b/src/components/user_panel/user_panel.vue index 3d4f873da9..2d5cb500d6 100644 --- a/src/components/user_panel/user_panel.vue +++ b/src/components/user_panel/user_panel.vue @@ -14,8 +14,10 @@ From 6e64324d37e5b89050f965c6912dabb743cad306 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 3 Sep 2018 22:40:45 +0300 Subject: [PATCH 4/7] Fixed collapseMessageWithSubjectLocal always using instance-provided config. --- src/components/settings/settings.js | 32 ++++++++++++++++------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js index de12894b8d..8ef84b2a78 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') || From f9eb9e0b70a419bd293d6a334802c5af97a22d76 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 3 Sep 2018 22:49:46 +0300 Subject: [PATCH 5/7] small fix for non-square gif avatars --- src/components/still-image/still-image.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue index e23f8bc170..1dcb7ce655 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 { From dc0b47e8bda769a3df77a06632e696d54db750fb Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 3 Sep 2018 23:30:07 +0300 Subject: [PATCH 6/7] fix collapse link being too small --- src/components/conversation/conversation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index e41929fd02..5528fef659 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') }}
From 5726be68307f0215470d2e5baea105718b5039fe Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sat, 8 Sep 2018 05:16:25 +0300 Subject: [PATCH 7/7] fix --- src/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.js b/src/main.js index debd87038e..068563fdf9 100644 --- a/src/main.js +++ b/src/main.js @@ -120,7 +120,7 @@ window.fetch('/api/statusnet/config.json') var showInstanceSpecificPanel = (config.showInstanceSpecificPanel) var scopeOptionsEnabled = (config.scopeOptionsEnabled) var formattingOptionsEnabled = (config.formattingOptionsEnabled) - var collapseMessageWithSubject = (config.collapseMessageWithSubject) + var defaultCollapseMessageWithSubject = (config.collapseMessageWithSubject) store.dispatch('setOption', { name: 'theme', value: theme }) store.dispatch('setOption', { name: 'background', value: background }) @@ -133,7 +133,7 @@ window.fetch('/api/statusnet/config.json') store.dispatch('setOption', { name: 'showInstanceSpecificPanel', value: showInstanceSpecificPanel }) store.dispatch('setOption', { name: 'scopeOptionsEnabled', value: scopeOptionsEnabled }) store.dispatch('setOption', { name: 'formattingOptionsEnabled', value: formattingOptionsEnabled }) - store.dispatch('setOption', { name: 'collapseMessageWithSubject', value: collapseMessageWithSubject }) + store.dispatch('setOption', { name: 'defaultCollapseMessageWithSubject', value: defaultCollapseMessageWithSubject }) if (chatDisabled) { store.dispatch('disableChat') }