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/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" > <FriendList :user-id="userId"> - <template v-slot:item="{item}"> + <template #item="{item}"> <FollowCard :user="item" /> </template> </FriendList> @@ -116,10 +115,9 @@ v-if="followersTabVisible" key="followers" :label="$t('user_card.followers')" - :disabled="!user.followers_count" > <FollowerList :user-id="userId"> - <template v-slot:item="{item}"> + <template #item="{item}"> <FollowCard :user="item" :no-follows-you="isUs" 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) } }, 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, '')),