Skip to content

Commit 2e2fc5a

Browse files
Merge pull request #2181 from nextcloud/backport/2175/stable28
[stable28] show title and close of modal inline
2 parents b2ba5af + 4d72cd3 commit 2e2fc5a

7 files changed

Lines changed: 16 additions & 13 deletions

js/photos-main.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-main.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-public.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-public.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/views/Timeline.vue

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,16 +126,13 @@
126126

127127
<NcModal v-if="showAlbumCreationForm"
128128
key="albumCreationForm"
129-
:close-button-contained="false"
130-
:name="t('photos', 'New album')"
131129
@close="showAlbumCreationForm = false">
130+
<h2 class="timeline__heading">{{ t('photos', 'New album') }}</h2>
132131
<AlbumForm @done="showAlbumCreationForm = false" />
133132
</NcModal>
134133

135134
<NcModal v-if="showAlbumPicker"
136135
key="albumPicker"
137-
:close-button-contained="false"
138-
:name="t('photos', 'Add to album')"
139136
@close="showAlbumPicker = false">
140137
<AlbumPicker @album-picked="addSelectionToAlbum" />
141138
</NcModal>
@@ -306,6 +303,12 @@ export default {
306303
}
307304
}
308305
306+
&__heading {
307+
padding: calc(var(--default-grid-baseline) * 4);
308+
margin-bottom: 0px;
309+
padding-bottom: 0px;
310+
}
311+
309312
&__file-list {
310313
padding: 0 64px;
311314

0 commit comments

Comments
 (0)