Skip to content

Commit

Permalink
Merge pull request #2098 from nextcloud/fix/show-settings-button
Browse files Browse the repository at this point in the history
fix: open settings button
  • Loading branch information
ShGKme authored Oct 23, 2023
2 parents d96a877 + f361649 commit fb96c79
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 9 deletions.
4 changes: 2 additions & 2 deletions js/photos-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-main.js.map

Large diffs are not rendered by default.

25 changes: 19 additions & 6 deletions src/Photos.vue
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,21 @@
</NcAppNavigationItem>
</template>
<template #footer>
<NcAppNavigationItem :name="t('photos', 'Photos settings')" @click="showSettings">
<Cog slot="icon" :size="20" />
</NcAppNavigationItem>
<div class="app-navigation__footer">
<NcButton type="tertiary"
alignment="start"
wide
@click="showSettings">
<template #icon>
<Cog slot="icon" :size="20" />
</template>
{{ t('photos', 'Photos settings') }}
</NcButton>
</div>
</template>
</NcAppNavigation>
<NcAppContent :page-heading="pageHeading">
<router-view />
<RouterView />

<!-- svg img loading placeholder (linked to the File component) -->
<!-- eslint-disable-next-line vue/no-v-html (because it's an SVG file) -->
Expand Down Expand Up @@ -116,7 +124,7 @@ import ShareVariant from 'vue-material-design-icons/ShareVariant.vue'
import AccountBoxMultipleOutline from 'vue-material-design-icons/AccountBoxMultipleOutline.vue'
import Cog from 'vue-material-design-icons/Cog.vue'

import { NcContent, NcAppContent, NcAppNavigation, NcAppNavigationItem } from '@nextcloud/vue'
import { NcContent, NcAppContent, NcAppNavigation, NcAppNavigationItem, NcButton } from '@nextcloud/vue'

import SettingsDialog from './components/Settings/SettingsDialog.vue'

Expand Down Expand Up @@ -148,6 +156,7 @@ export default {
NcAppContent,
NcAppNavigation,
NcAppNavigationItem,
NcButton,
NcContent,
SettingsDialog,
},
Expand Down Expand Up @@ -223,7 +232,11 @@ export default {
align-content: space-between;
}

.app-navigation__photos:deep .app-navigation-entry-icon.icon-photos {
.app-navigation__photos :deep(.app-navigation-entry-icon.icon-photos) {
background-size: 20px;
}

.app-navigation__footer {
padding: calc(var(--default-grid-baseline) * 2);
}
</style>

0 comments on commit fb96c79

Please sign in to comment.