Skip to content

[stable28] Clean up headings #2253

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

Merged
JuliaKirschenheuter merged 2 commits into from
Jan 15, 2024
Merged

[stable28] Clean up headings #2253

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cadc42f
fix(photos): adapt headings and `<h1>` styles
JuliaKirschenheuter Jan 12, 2024
b86c1ba
chore(assets): Recompile assets
nextcloud-command Jan 15, 2024
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
9 changes: 1 addition & 8 deletions src/Photos.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
</div>
</template>
</NcAppNavigation>
<NcAppContent :page-heading="pageHeading">
<NcAppContent>
<RouterView />

<!-- svg img loading placeholder (linked to the File component) -->
Expand Down Expand Up @@ -201,13 +201,6 @@ export default {
openedSettings: false,
}
},

computed: {
pageHeading() {
return this.$route.meta.rootTitle?.(this.$route)
},
},

async beforeMount() {
// Register excluded paths
const files = loadState('photos', 'nomedia-paths', [])
Expand Down
11 changes: 7 additions & 4 deletions src/components/HeaderNavigation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@

<!-- Main Navigation title -->
<div class="photos-navigation__title">
<h2 class="photos-navigation__title__main" @click="refresh">
<h1 class="photos-navigation__title__main" @click="refresh">
{{ name }}
</h2>
</h1>
<div class="photos-navigation__title__sub" />
<slot name="subtitle" />
</div>
Expand Down Expand Up @@ -204,7 +204,7 @@ button.app-navigation-toggle {
align-items: center;
width: 100%;
min-height: var(--photos-navigation-height);
padding: 0 var(--photos-navigation-height);
padding: 15px var(--photos-navigation-height) 0 var(--photos-navigation-height);
background: var(--color-main-background);

&__back {
Expand All @@ -221,8 +221,11 @@ button.app-navigation-toggle {
flex-direction: column;

&__main {
margin: 0;
cursor: pointer;
font-weight: 700;
font-size: 20px;
line-height: 44px;
margin: 0 0 0 calc(2 * var(--app-navigation-padding, 8px) + 44px);
}

&__main, &__sub {
Expand Down