From 9cd62fe08ddce8759620a1d15a6d934a0305c447 Mon Sep 17 00:00:00 2001 From: Sol Fisher Romanoff Date: Fri, 30 Dec 2022 01:03:31 +0200 Subject: [PATCH 1/3] Remove stray debug log --- src/services/entity_normalizer/entity_normalizer.service.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index eb85418e..5d129556 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -72,7 +72,6 @@ export const parseUser = (data) => { verified_at: field.verified_at } }) - console.log(output.fields_html) output.fields_text = data.fields.map(field => { return { name: unescape(field.name.replace(/<[^>]*>/g, '')), From 014f8b0dd274cd4fc185335679f3aab0c3acb17d Mon Sep 17 00:00:00 2001 From: Norm Date: Fri, 30 Dec 2022 03:01:17 +0000 Subject: [PATCH 2/3] Make minimum width for 3-column layout 1280px (#255) (#256) 1280px is a pretty common screen width for several resolutions (1280x720, 1280x800, 1280x1024, etc.). Since it is only 20px less than the current 1300px minimum, this shouldn't be a big issue to lower the minimum screen width for the 3-column layout to 1280px. Closes: https://akkoma.dev/AkkomaGang/pleroma-fe/issues/255 Co-authored-by: Francis Dinh Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma-fe/pulls/256 Co-authored-by: Norm Co-committed-by: Norm --- src/components/emoji_picker/emoji_picker.scss | 2 +- src/modules/interface.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/emoji_picker/emoji_picker.scss b/src/components/emoji_picker/emoji_picker.scss index 119da7c4..82fc831c 100644 --- a/src/components/emoji_picker/emoji_picker.scss +++ b/src/components/emoji_picker/emoji_picker.scss @@ -18,7 +18,7 @@ overflow: hidden; left: -70%; max-width: 100%; - @media (min-width: 800px) and (max-width: 1300px) { + @media (min-width: 800px) and (max-width: 1280px) { left: -50%; min-width: 50%; max-width: 130%; diff --git a/src/modules/interface.js b/src/modules/interface.js index ae1a31c3..33528c0d 100644 --- a/src/modules/interface.js +++ b/src/modules/interface.js @@ -186,7 +186,7 @@ const interfaceMod = { if (thirdColumnMode === 'none' || !rootState.users.currentUser) { commit('setLayoutType', normalOrMobile) } else { - const wideLayout = width >= 1300 + const wideLayout = width >= 1280 commit('setLayoutType', wideLayout ? 'wide' : normalOrMobile) } }, From 2e5001e5de164be825fc065e0425725e4fe81219 Mon Sep 17 00:00:00 2001 From: Beefox Date: Fri, 30 Dec 2022 03:04:15 +0000 Subject: [PATCH 3/3] Allow follow(er) lists to be acessible by account owner even if follower counts are disabled (#246) Currently, if a user has their follower/follow counts hidden, they cannot access their own list of followers/follows. This makes no real sense and means that they cannot modify those lists without disabling their privacy options. This fix simply allows those tabs to be accessed no matter if the counts are hidden or not. Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma-fe/pulls/246 Co-authored-by: Beefox Co-committed-by: Beefox --- src/components/user_profile/user_profile.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index 4e0d0b0f..87bbf679 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -104,10 +104,9 @@ v-if="followsTabVisible" key="followees" :label="$t('user_card.followees')" - :disabled="!user.friends_count" > -