Merge pull request #16122 from nextcloud/fix/apps/sidebar-close-icon

Remove duplicate close-icon
This commit is contained in:
Roeland Jago Douma 2019-06-27 22:11:43 +02:00 committed by GitHub
commit e648c07335
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 12 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -22,7 +22,6 @@
<template> <template>
<div id="app-details-view" style="padding: 20px;"> <div id="app-details-view" style="padding: 20px;">
<a class="close icon-close" href="#" v-on:click="hideAppDetails"><span class="hidden-visually">Close</span></a>
<h2> <h2>
<div v-if="!app.preview" class="icon-settings-dark"></div> <div v-if="!app.preview" class="icon-settings-dark"></div>
<svg v-if="app.previewAsIcon && app.preview" width="32" height="32" viewBox="0 0 32 32"> <svg v-if="app.previewAsIcon && app.preview" width="32" height="32" viewBox="0 0 32 32">
@ -126,14 +125,6 @@ export default {
this.groupCheckedAppsData = true; this.groupCheckedAppsData = true;
} }
}, },
methods: {
hideAppDetails() {
this.$router.push({
name: 'apps-category',
params: {category: this.category}
});
},
},
computed: { computed: {
appstoreUrl() { appstoreUrl() {
return `https://apps.nextcloud.com/apps/${this.app.id}`; return `https://apps.nextcloud.com/apps/${this.app.id}`;

View File

@ -31,7 +31,7 @@
<AppContent class="app-settings-content" :class="{ 'icon-loading': loadingList }"> <AppContent class="app-settings-content" :class="{ 'icon-loading': loadingList }">
<AppList :category="category" :app="currentApp" :search="searchQuery" /> <AppList :category="category" :app="currentApp" :search="searchQuery" />
</AppContent> </AppContent>
<AppSidebar v-if="id && currentApp" > <AppSidebar v-if="id && currentApp" @close="hideAppDetails">
<AppDetails :category="category" :app="currentApp" /> <AppDetails :category="category" :app="currentApp" />
</AppSidebar> </AppSidebar>
</Content> </Content>
@ -79,6 +79,12 @@ export default {
}, },
resetSearch() { resetSearch() {
this.setSearch(''); this.setSearch('');
},
hideAppDetails() {
this.$router.push({
name: 'apps-category',
params: {category: this.category}
})
} }
}, },
beforeMount() { beforeMount() {