Merge pull request #2253 from nextcloud/backport/2249/stable28

[stable28] Clean up headings
nextcloud · Jan 15, 2024 · c869e4a · c869e4a
2 parents e75bee2 + b86c1ba
commit c869e4a
Show file tree

Hide file tree

Showing 26 changed files with 44 additions and 48 deletions.
diff --git a/js/photos-main.js b/js/photos-main.js
diff --git a/js/photos-main.js.map b/js/photos-main.js.map
diff --git a/...ue-material-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-3c3243.js b/...ue-material-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-3c3243.js
diff --git a/...aterial-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-3c3243.js.map b/...aterial-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-3c3243.js.map
diff --git a/...ue-material-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-e1736f.js b/...ue-material-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-e1736f.js
diff --git a/...aterial-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-e1736f.js.map b/...aterial-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-e1736f.js.map
diff --git a/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Places_vue.js b/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Places_vue.js
diff --git a/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Places_vue.js.map b/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Places_vue.js.map
diff --git a/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_SharedAlbums_vue.js b/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_SharedAlbums_vue.js
diff --git a/...os-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_SharedAlbums_vue.js.map b/...os-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_SharedAlbums_vue.js.map
diff --git a/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js b/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js
diff --git a/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js.map b/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js.map
diff --git a/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-7ffa74.js b/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-7ffa74.js
diff --git a/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-7ffa74.js.map b/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-7ffa74.js.map
diff --git a/js/photos-public.js b/js/photos-public.js
diff --git a/js/photos-public.js.map b/js/photos-public.js.map
diff --git a/js/photos-src_services_collectionFetcher_js-src_components_HeaderNavigation_vue.js b/js/photos-src_services_collectionFetcher_js-src_components_HeaderNavigation_vue.js
diff --git a/js/photos-src_services_collectionFetcher_js-src_components_HeaderNavigation_vue.js.map b/js/photos-src_services_collectionFetcher_js-src_components_HeaderNavigation_vue.js.map
diff --git a/js/photos-src_views_AlbumContent_vue.js b/js/photos-src_views_AlbumContent_vue.js
diff --git a/js/photos-src_views_AlbumContent_vue.js.map b/js/photos-src_views_AlbumContent_vue.js.map
diff --git a/js/photos-src_views_Albums_vue.js b/js/photos-src_views_Albums_vue.js
diff --git a/js/photos-src_views_Albums_vue.js.map b/js/photos-src_views_Albums_vue.js.map
diff --git a/js/photos-src_views_Folders_vue.js b/js/photos-src_views_Folders_vue.js
diff --git a/js/photos-src_views_Folders_vue.js.map b/js/photos-src_views_Folders_vue.js.map
diff --git a/src/Photos.vue b/src/Photos.vue
@@ -111,7 +111,7 @@
 				</div>
 			</template>
 		</NcAppNavigation>
-		<NcAppContent :page-heading="pageHeading">
+		<NcAppContent>
 			<RouterView />
 
 			<!-- svg img loading placeholder (linked to the File component) -->
@@ -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', [])

diff --git a/src/components/HeaderNavigation.vue b/src/components/HeaderNavigation.vue
@@ -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>
@@ -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 {
@@ -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 {