mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10561 from nextcloud/fix/10476/applist-layout 

Fixes the apps list layout
This commit is contained in:
John Molakvoæ 2018-08-08 09:23:14 +02:00 committed by GitHub
parent b198e17071 978fc50c65
commit e595cad880
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
settings/css/settings.scss
View File

@ -909,9 +909,16 @@ span.version {
width: 50%; width: 50%;
} }
} }
@media only screen and (max-width: 480px) {
.store .section {
width: 100%;
}
}
/* hide app version and level on narrower screens */ /* hide app version and level on narrower screens */
@media only screen and (max-width: 900px) { @media only screen and (max-width: 900px) {
#apps-list.installed { .apps-list.installed {
.app-version, .app-level { .app-version, .app-level {
display: none !important; display: none !important;
} }
@ -919,7 +926,7 @@ span.version {
} }
@media only screen and (max-width: 500px) { @media only screen and (max-width: 500px) {
#apps-list.installed .app-groups { .apps-list.installed .app-groups {
display: none !important; display: none !important;
} }
} }
@ -1000,8 +1007,7 @@ span.version {
list-style-position: inside; list-style-position: inside;
} }
.apps-list {
#apps-list, #apps-list-search {
.section { .section {
cursor: pointer; cursor: pointer;
} }
@ -1134,6 +1140,14 @@ span.version {
} }
} }
#apps-list-search {
.section {
h2 {
margin-bottom: 0;
}
}
}
/* LOG */ /* LOG */
#log { #log {
white-space: normal; white-space: normal;

2
settings/js/settings-vue.js
View File

File diff suppressed because one or more lines are too long

2
settings/js/settings-vue.js.map
View File

File diff suppressed because one or more lines are too long

22
settings/src/components/appList.vue
View File

@ -22,7 +22,7 @@
<template> <template>
<div id="app-content-inner"> <div id="app-content-inner">
<div id="apps-list" :class="{installed: (useBundleView || useListView), store: useAppStoreView}"> <div id="apps-list" class="apps-list" :class="{installed: (useBundleView || useListView), store: useAppStoreView}">
<template v-if="useListView"> <template v-if="useListView">
<transition-group name="app-list" tag="div" class="apps-list-container"> <transition-group name="app-list" tag="div" class="apps-list-container">
<app-item v-for="app in apps" :key="app.id" :app="app" :category="category" /> <app-item v-for="app in apps" :key="app.id" :app="app" :category="category" />
@ -48,14 +48,18 @@
</div> </div>
<div id="apps-list-search" class="installed"> <div id="apps-list-search" class="apps-list installed">
<template v-if="search !== '' && searchApps.length > 0"> <div class="apps-list-container">
<div class="section"> <template v-if="search !== '' && searchApps.length > 0">
<div></div> <div class="section">
<h2>{{ t('settings', 'Results from other categories') }}</h2> <div></div>
</div> <td colspan="5">
<app-item v-for="app in searchApps" :key="app.id" :app="app" :category="category" :list-view="true" /> <h2>{{ t('settings', 'Results from other categories') }}</h2>
</template> </td>
</div>
<app-item v-for="app in searchApps" :key="app.id" :app="app" :category="category" :list-view="true" />
</template>
</div>
</div> </div>
<div id="apps-list-empty" class="emptycontent emptycontent-search" v-if="!loading && searchApps.length === 0 && apps.length === 0"> <div id="apps-list-empty" class="emptycontent emptycontent-search" v-if="!loading && searchApps.length === 0 && apps.length === 0">