From bb0c9fcde7acfb2385480996412f1b8cb429a59f Mon Sep 17 00:00:00 2001 From: Zero King Date: Tue, 18 May 2021 18:13:44 +0000 Subject: [Glitch] Remove duplicate CSS property of margin Port 689974b1ed081c238560d6b368609acc50dc7336 to glitch-soc Signed-off-by: Claire --- app/javascript/flavours/glitch/styles/components/index.scss | 1 - 1 file changed, 1 deletion(-) (limited to 'app/javascript/flavours') diff --git a/app/javascript/flavours/glitch/styles/components/index.scss b/app/javascript/flavours/glitch/styles/components/index.scss index 16045d5ee..24f750e1d 100644 --- a/app/javascript/flavours/glitch/styles/components/index.scss +++ b/app/javascript/flavours/glitch/styles/components/index.scss @@ -1232,7 +1232,6 @@ button.icon-button.active i.fa-retweet { span { display: block; float: left; - margin-left: 50%; transform: translateX(-50%); margin: 82px 0 0 50%; white-space: nowrap; -- cgit From 1a591ffc8b650f815ab37be6319d8132e591bdb2 Mon Sep 17 00:00:00 2001 From: Claire Date: Wed, 19 May 2021 23:51:05 +0200 Subject: [Glitch] Fix unread notification count when polling Port 92f1d739b554b6d5496013fb50196a14434943e2 to glitch-soc Signed-off-by: Claire --- app/javascript/flavours/glitch/reducers/notifications.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/javascript/flavours') diff --git a/app/javascript/flavours/glitch/reducers/notifications.js b/app/javascript/flavours/glitch/reducers/notifications.js index b4c5ef71a..859a8b3a1 100644 --- a/app/javascript/flavours/glitch/reducers/notifications.js +++ b/app/javascript/flavours/glitch/reducers/notifications.js @@ -112,7 +112,7 @@ const expandNormalizedNotifications = (state, notifications, next, isLoadingRece } if (shouldCountUnreadNotifications(state)) { - mutable.update('unread', unread => unread + items.count(item => compareId(item.get('id'), lastReadId) > 0)); + mutable.set('unread', mutable.get('pendingItems').count(item => item !== null) + mutable.get('items').count(item => item && compareId(item.get('id'), lastReadId) > 0)); } else { const mostRecent = items.find(item => item !== null); if (mostRecent && compareId(lastReadId, mostRecent.get('id')) < 0) { -- cgit From 8027d921ab174b35bcf08bf96b69676a4515435f Mon Sep 17 00:00:00 2001 From: Zero King Date: Wed, 19 May 2021 21:51:52 +0000 Subject: [Glitch] Remove duplicate CSS properties Port 028ba13eb3f1e5e5e35485fe1531ec7630e84abe to glitch-soc Signed-off-by: Claire --- app/javascript/flavours/glitch/styles/about.scss | 1 - app/javascript/flavours/glitch/styles/widgets.scss | 1 - 2 files changed, 2 deletions(-) (limited to 'app/javascript/flavours') diff --git a/app/javascript/flavours/glitch/styles/about.scss b/app/javascript/flavours/glitch/styles/about.scss index cdf2d116b..2cc43afec 100644 --- a/app/javascript/flavours/glitch/styles/about.scss +++ b/app/javascript/flavours/glitch/styles/about.scss @@ -324,7 +324,6 @@ $small-breakpoint: 960px; font-family: $font-sans-serif, sans-serif; font-size: 16px; font-weight: 400; - font-size: 16px; line-height: 30px; margin-bottom: 12px; color: $darker-text-color; diff --git a/app/javascript/flavours/glitch/styles/widgets.scss b/app/javascript/flavours/glitch/styles/widgets.scss index b397844a2..05bc076ea 100644 --- a/app/javascript/flavours/glitch/styles/widgets.scss +++ b/app/javascript/flavours/glitch/styles/widgets.scss @@ -584,7 +584,6 @@ $fluid-breakpoint: $maximum-width + 20px; display: block; font-weight: 500; padding: 15px; - overflow: hidden; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; -- cgit