Skip to content

Commit

Permalink
fixup! Upgrade to Nextcloud vue 8.0.0
Browse files Browse the repository at this point in the history
Signed-off-by: greta <[email protected]>
  • Loading branch information
GretaD committed Nov 8, 2023
1 parent 3ff3798 commit 64e1164
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 10 deletions.
5 changes: 4 additions & 1 deletion src/components/AppContent/CircleContent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</AppContent>

<AppContent v-else-if="loading">
<EmptyContent :name="t('contacts', 'Loading circle …')">
<EmptyContent class="empty-content" :name="t('contacts', 'Loading circle …')">
<template #icon>
<IconLoading :size="20" />
</template>
Expand Down Expand Up @@ -176,4 +176,7 @@ button {
margin-right: 10px;
}
}
.empty-content {
height: 100%;
}
</style>
11 changes: 8 additions & 3 deletions src/components/AppContent/ContactsContent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@

<template>
<AppContent v-if="loading">
<EmptyContent :name="t('contacts', 'Loading contacts …')">
<EmptyContent class="empty-content" :name="t('contacts', 'Loading contacts …')">
<template #icon>
<IconLoading :size="20" />
</template>
</EmptyContent>
</AppContent>

<AppContent v-else-if="isEmptyGroup && !isRealGroup">
<EmptyContent :name="t('contacts', 'There are no contacts yet')">
<EmptyContent class="empty-content" :name="t('contacts', 'There are no contacts yet')">
<template #icon>
<IconContact :size="20" />
</template>
Expand All @@ -43,7 +43,7 @@
</AppContent>

<AppContent v-else-if="isEmptyGroup && isRealGroup">
<EmptyContent :name=" t('contacts', 'There are no contacts in this group')">
<EmptyContent class="empty-content" :name=" t('contacts', 'There are no contacts in this group')">
<template #icon>
<IconContact :size="20" />
</template>
Expand Down Expand Up @@ -192,3 +192,8 @@ export default {
},
}
</script>
<style lang="scss" scoped>
.empty-content {
height: 100%;
}
</style>
2 changes: 1 addition & 1 deletion src/components/ContactDetails/ContactDetailsAddNewProp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<Actions menu-align="right"
event=""
type="secondary"
:menu-title="t('contacts', 'Add more info')"
:menu-name="t('contacts', 'Add more info')"
@click.native.prevent>
<template #icon>
<IconAdd :size="20" />
Expand Down
9 changes: 6 additions & 3 deletions src/components/MemberList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,21 @@
<template>
<AppContentList v-if="!hasMembers" class="members-list">
<template v-if="loading">
<EmptyContent :name="t('contacts', 'Loading members list …')">
<EmptyContent class="empty-content" :name="t('contacts', 'Loading members list …')">
<template #icon>
<IconLoading :size="20" />
</template>
</EmptyContent>
</template>
<template v-else-if="!circle.isMember">
<EmptyContent :name="t('contacts', 'The list of members is only visible to members of this circle')">
<EmptyContent class="empty-content" :name="t('contacts', 'The list of members is only visible to members of this circle')">
<template #icon>
<IconContact :size="20" />
</template>
</EmptyContent>
</template>
<template v-else>
<EmptyContent :name="t('contacts', 'You currently have no access to the member list')">
<EmptyContent class="empty-content" :name="t('contacts', 'You currently have no access to the member list')">
<template #icon>
<IconContact :size="20" />
</template>
Expand Down Expand Up @@ -339,4 +339,7 @@ export default {
margin: auto;
}
}
.empty-content {
height: 100%;
}
</style>
2 changes: 1 addition & 1 deletion src/components/MembersList/MembersListItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
:key="source.singleId"
:avatar-size="44"
:is-no-user="!source.isUser"
:subtitle="levelName"
:subname="levelName"
:name="source.displayName"
:user="source.userId"
class="members-list__item">
Expand Down
2 changes: 1 addition & 1 deletion src/views/Processing/ImportView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<ProcessingScreen :progress="progress"
:total="total"
:desc="failed > 0 ? importFailed : ''"
:name="total === progress
:title="total === progress
? importedHeader
: importingHeader" />
<div class="close__button">
Expand Down

0 comments on commit 64e1164

Please sign in to comment.