s0ulf3re/akkoma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of akkoma.dev:AkkomaGang/akkoma-fe into develop

Browse source
This commit is contained in:
FloatingGhost 2022-12-30 03:20:30 +00:00
commit 236b19e854
4 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/emoji_picker/emoji_picker.scss
View file

@ -18,7 +18,7 @@
overflow: hidden; overflow: hidden;
left: -70%; left: -70%;
max-width: 100%; max-width: 100%;
@media (min-width: 800px) and (max-width: 1300px) { @media (min-width: 800px) and (max-width: 1280px) {
left: -50%; left: -50%;
min-width: 50%; min-width: 50%;
max-width: 130%; max-width: 130%;

6
src/components/user_profile/user_profile.vue
View file

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

2
src/modules/interface.js
View file

@ -186,7 +186,7 @@ const interfaceMod = {
if (thirdColumnMode === 'none' || !rootState.users.currentUser) { if (thirdColumnMode === 'none' || !rootState.users.currentUser) {
commit('setLayoutType', normalOrMobile) commit('setLayoutType', normalOrMobile)
} else { } else {
const wideLayout = width >= 1300 const wideLayout = width >= 1280
commit('setLayoutType', wideLayout ? 'wide' : normalOrMobile) commit('setLayoutType', wideLayout ? 'wide' : normalOrMobile)
} }
}, },

1
src/services/entity_normalizer/entity_normalizer.service.js
View file

@ -72,7 +72,6 @@ export const parseUser = (data) => {
verified_at: field.verified_at verified_at: field.verified_at
} }
}) })
console.log(output.fields_html)
output.fields_text = data.fields.map(field => { output.fields_text = data.fields.map(field => {
return { return {
name: unescape(field.name.replace(/<[^>]*>/g, '')), name: unescape(field.name.replace(/<[^>]*>/g, '')),