From 4d112b70fd0cc360b97e3a7c53c94a4045cef635 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 13 Aug 2018 14:46:28 +0300 Subject: fixed custom emoji in nickname. changed icons on right side to be more streamlined. adjusted CSS so that all text in header of post is on same baseline and all icons/images are middle-aligned. --- src/components/status/status.vue | 50 ++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/components/status/status.vue b/src/components/status/status.vue index e2fb5d36..1e31aa2b 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -11,8 +11,8 @@
- - {{retweeter}} + + {{retweeter}} {{$t('timeline.repeated')}}
@@ -57,8 +57,10 @@ - - +
+ +
+ @@ -141,6 +143,7 @@ margin-top: 0.25em; margin-left: 0.5em; z-index: 50; + .status { flex: 1; border: 0; @@ -155,6 +158,7 @@ text-align: center; border-width: 1px; border-style: solid; + i { font-size: 2em; } @@ -196,6 +200,7 @@ .media-heading { flex-wrap: nowrap; + line-height: 16px; } .media-heading-left { @@ -218,12 +223,20 @@ flex: 1 0; display: flex; flex-wrap: wrap; - align-content: center; + align-items: baseline; + + .user-name { + margin-right: 0.2em; + img { + width: 14px; + height: 14px; + vertical-align: middle + } + } } + .links { display: flex; - padding-top: 1px; - margin-left: 0.2em; font-size: 12px; color: $fallback--link; color: var(--link, $fallback--link); @@ -247,17 +260,18 @@ } .media-heading-right { + display: inline-flex; flex-shrink: 0; - display: flex; flex-wrap: nowrap; - max-height: 1.5em; - margin-left: 0.25em; + margin-left: .25em; + .timeago { margin-right: 0.2em; font-size: 12px; - padding-top: 1px; + align-self: last baseline; } - i { + + > * { margin-left: 0.2em; } } @@ -318,6 +332,7 @@ .retweet-info { padding: 0.4em 0.6em 0 0.6em; margin: 0; + .avatar { border-radius: $fallback--avatarAltRadius; border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius); @@ -333,9 +348,20 @@ display: flex; align-content: center; flex-wrap: wrap; + + .user-name { + font-weight: bold; + img { + width: 14px; + height: 14px; + vertical-align: middle; + } + } + i { padding: 0 0.2em; } + a { max-width: 100%; overflow: hidden; -- cgit v1.2.3-70-g09d2 From d417cb35bbd2a7603c5c655aa76d3df13a6f92ae Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 13 Aug 2018 15:36:10 +0300 Subject: fix potential stretched spurdo --- src/components/status/status.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 1e31aa2b..4b168db0 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -227,10 +227,12 @@ .user-name { margin-right: 0.2em; + img { width: 14px; height: 14px; - vertical-align: middle + vertical-align: middle; + object-fit: contain } } } @@ -351,10 +353,12 @@ .user-name { font-weight: bold; + img { width: 14px; height: 14px; vertical-align: middle; + object-fit: contain } } -- cgit v1.2.3-70-g09d2 From 18117c3bfa4cae9542e49222aad058aa52929f18 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 13 Aug 2018 16:17:00 +0300 Subject: storing entire config instead of each separate thing of it, so that future options won't be lost during reloads because developer forgot to update that list of settings to be persisted --- src/main.js | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src') diff --git a/src/main.js b/src/main.js index cb53edd3..50e5ea8d 100644 --- a/src/main.js +++ b/src/main.js @@ -45,15 +45,7 @@ Vue.use(VueChatScroll) const persistedStateOptions = { paths: [ - 'config.hideAttachments', - 'config.hideAttachmentsInConv', - 'config.hideNsfw', - 'config.autoLoad', - 'config.hoverPreview', - 'config.streaming', - 'config.muteWords', - 'config.customTheme', - 'config.highlight', + 'config', 'users.lastLoginName' ] } -- cgit v1.2.3-70-g09d2 From 87eee191b8eaa8b7c8a396f9c6ca976c280d44af Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 13 Aug 2018 17:07:45 +0300 Subject: Made pausing TL updating configurable. Added styles for disabled checkboxes. Shuffled settings a bit b/c all the settings are in "Attachments" section depsite the fact not all of them are attachments-related. --- src/App.scss | 8 +++ src/components/settings/settings.js | 4 ++ src/components/settings/settings.vue | 103 ++++++++++++++++++++--------------- src/components/timeline/timeline.js | 5 +- src/i18n/messages.js | 1 + 5 files changed, 76 insertions(+), 45 deletions(-) (limited to 'src') diff --git a/src/App.scss b/src/App.scss index 2426b998..9f7ef860 100644 --- a/src/App.scss +++ b/src/App.scss @@ -142,6 +142,14 @@ input, textarea, .select { color: $fallback--fg; color: var(--fg, $fallback--fg); } + &:disabled, + { + &, + & + label, + & + label::before { + opacity: .5; + } + } + label::before { display: inline-block; content: '✔'; diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js index a26111d6..e5f4b001 100644 --- a/src/components/settings/settings.js +++ b/src/components/settings/settings.js @@ -10,6 +10,7 @@ const settings = { muteWordsString: this.$store.state.config.muteWords.join('\n'), autoLoadLocal: this.$store.state.config.autoLoad, streamingLocal: this.$store.state.config.streaming, + pauseOnUnfocused: this.$store.state.config.pauseOnUnfocused, hoverPreviewLocal: this.$store.state.config.hoverPreview, stopGifs: this.$store.state.config.stopGifs } @@ -38,6 +39,9 @@ const settings = { streamingLocal (value) { this.$store.dispatch('setOption', { name: 'streaming', value }) }, + pauseOnUnfocusedLocal (value) { + this.$store.dispatch('setOption', { name: 'pauseOnUnfocused', value }) + }, hoverPreviewLocal (value) { this.$store.dispatch('setOption', { name: 'hoverPreview', value }) }, diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue index 6245e758..d6dbab27 100644 --- a/src/components/settings/settings.vue +++ b/src/components/settings/settings.vue @@ -1,53 +1,64 @@