Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes the apps list layout #10561

Merged
merged 2 commits into from
Aug 8, 2018
+33 −15
Merged

Fixes the apps list layout #10561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d163614
Fixes the apps list layout
weeman1337 Aug 6, 2018
978fc50
Updates the built files
weeman1337 Aug 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions settings/css/settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,17 +909,24 @@ span.version {
width: 50%;
}
}

@media only screen and (max-width: 480px) {
.store .section {
width: 100%;
}
}

/* hide app version and level on narrower screens */
@media only screen and (max-width: 900px) {
#apps-list.installed {
.apps-list.installed {
.app-version, .app-level {
display: none !important;
}
}
}

@media only screen and (max-width: 500px) {
#apps-list.installed .app-groups {
.apps-list.installed .app-groups {
display: none !important;
}
}
Expand Down Expand Up @@ -1000,8 +1007,7 @@ span.version {
list-style-position: inside;
}


#apps-list, #apps-list-search {
.apps-list {
.section {
cursor: pointer;
}
Expand Down Expand Up @@ -1134,6 +1140,14 @@ span.version {
}
}

#apps-list-search {
.section {
h2 {
margin-bottom: 0;
}
}
}

/* LOG */
#log {
white-space: normal;
Expand Down
2 changes: 1 addition & 1 deletion settings/js/settings-vue.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion settings/js/settings-vue.js.map
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 13 additions & 9 deletions settings/src/components/appList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<template>
<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">
<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" />
Expand All @@ -48,14 +48,18 @@

</div>

<div id="apps-list-search" class="installed">
<template v-if="search !== '' && searchApps.length > 0">
<div class="section">
<div></div>
<h2>{{ t('settings', 'Results from other categories') }}</h2>
</div>
<app-item v-for="app in searchApps" :key="app.id" :app="app" :category="category" :list-view="true" />
</template>
<div id="apps-list-search" class="apps-list installed">
<div class="apps-list-container">
<template v-if="search !== '' && searchApps.length > 0">
<div class="section">
<div></div>
<td colspan="5">
<h2>{{ t('settings', 'Results from other categories') }}</h2>
</td>
</div>
<app-item v-for="app in searchApps" :key="app.id" :app="app" :category="category" :list-view="true" />
</template>
</div>
</div>

<div id="apps-list-empty" class="emptycontent emptycontent-search" v-if="!loading && searchApps.length === 0 && apps.length === 0">
Expand Down