Merge pull request #2175 from nextcloud/enh/noid/show-inline

show title and close of modal inline
nextcloud · Dec 6, 2023 · 334f080 · 334f080
2 parents afaffd8 + 8f1196e
commit 334f080
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 13 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/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/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/src/views/Timeline.vue b/src/views/Timeline.vue
@@ -126,16 +126,13 @@
 
 		<NcModal v-if="showAlbumCreationForm"
 			key="albumCreationForm"
-			:close-button-contained="false"
-			:name="t('photos', 'New album')"
 			@close="showAlbumCreationForm = false">
+			<h2 class="timeline__heading">{{ t('photos', 'New album') }}</h2>
 			<AlbumForm @done="showAlbumCreationForm = false" />
 		</NcModal>
 
 		<NcModal v-if="showAlbumPicker"
 			key="albumPicker"
-			:close-button-contained="false"
-			:name="t('photos', 'Add to album')"
 			@close="showAlbumPicker = false">
 			<AlbumPicker @album-picked="addSelectionToAlbum" />
 		</NcModal>
@@ -306,6 +303,12 @@ export default {
 		}
 	}
 
+	&__heading {
+		padding: calc(var(--default-grid-baseline) * 4);
+		margin-bottom: 0px;
+		padding-bottom: 0px;
+	}
+
 	&__file-list {
 		padding: 0 64px;