summaryrefslogtreecommitdiffstats
path: root/apps/settings/src
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@protonmail.com>2022-02-28 14:34:30 +0100
committernextcloud-command <nextcloud-command@users.noreply.github.com>2022-02-28 13:46:03 +0000
commit8c969085acddb2ebd543d4ca76d3f9f17b90e332 (patch)
treea3f734cfcceb302d0c4de72aa7879cd575926847 /apps/settings/src
parent49a7d9b7d3f798bed864a15efb0d7c19905c0b97 (diff)
downloadnextcloud-server-8c969085acddb2ebd543d4ca76d3f9f17b90e332.tar.gz
nextcloud-server-8c969085acddb2ebd543d4ca76d3f9f17b90e332.zip
Apps toolbar height and alignment fix
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Diffstat (limited to 'apps/settings/src')
-rw-r--r--apps/settings/src/components/AppList.vue7
-rw-r--r--apps/settings/src/views/Apps.vue30
2 files changed, 23 insertions, 14 deletions
diff --git a/apps/settings/src/components/AppList.vue b/apps/settings/src/components/AppList.vue
index 31d85e51092..d32f3b08102 100644
--- a/apps/settings/src/components/AppList.vue
+++ b/apps/settings/src/components/AppList.vue
@@ -24,7 +24,7 @@
<div id="app-content-inner">
<div id="apps-list" class="apps-list" :class="{installed: (useBundleView || useListView), store: useAppStoreView}">
<template v-if="useListView">
- <div v-if="showUpdateAll" class="counter">
+ <div v-if="showUpdateAll" class="toolbar">
{{ n('settings', '%n app has an update available', '%n apps have an update available', counter) }}
<Button v-if="showUpdateAll"
id="app-list-update-all"
@@ -33,9 +33,11 @@
{{ t('settings', 'Update all') }}
</Button>
</div>
- <div v-if="!showUpdateAll" class="counter">
+
+ <div v-if="!showUpdateAll" class="toolbar">
{{ t('settings', 'All apps are up-to-date.') }}
</div>
+
<transition-group name="app-list" tag="div" class="apps-list-container">
<AppItem v-for="app in apps"
:key="app.id"
@@ -43,6 +45,7 @@
:category="category" />
</transition-group>
</template>
+
<transition-group v-if="useBundleView"
name="app-list"
tag="div"
diff --git a/apps/settings/src/views/Apps.vue b/apps/settings/src/views/Apps.vue
index eb6d85795bf..6bbd1008f54 100644
--- a/apps/settings/src/views/Apps.vue
+++ b/apps/settings/src/views/Apps.vue
@@ -361,19 +361,25 @@ export default {
}
}
- .app-sidebar-tabs__release {
- h2 {
- border-bottom: 1px solid var(--color-border);
- }
+// Align the appNavigation toggle with the apps header toolbar
+.app-navigation::v-deep button.app-navigation-toggle {
+ top: 8px;
+ right: -8px;
+}
- // Overwrite changelog heading styles
- ::v-deep {
- h3 {
- font-size: 20px;
- }
- h4 {
- font-size: 17px;
- }
+.app-sidebar-tabs__release {
+ h2 {
+ border-bottom: 1px solid var(--color-border);
+ }
+
+ // Overwrite changelog heading styles
+ ::v-deep {
+ h3 {
+ font-size: 20px;
+ }
+ h4 {
+ font-size: 17px;
}
}
+}
</style>