[stable31] fix(NotificationsApp): Fix 'Dismiss all' on the bottom

js/notifications-main.mjs

@@ -1,3 +1,3 @@
-const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=[window.OC.filePath('notifications', '', 'js/NotificationsApp-BblOjCtt.chunk.mjs'),window.OC.filePath('notifications', '', 'js/_plugin-vue2_normalizer-CT8YLgqQ.chunk.mjs'),window.OC.filePath('notifications', '', 'js/style-N1aAjoYj.chunk.mjs'),window.OC.filePath('notifications', '', 'css/style-BRbSke62.chunk.css'),window.OC.filePath('notifications', '', 'css/_plugin-vue2_normalizer-DCbvgtYV.chunk.css'),window.OC.filePath('notifications', '', 'js/BrowserStorage-D6kcvwSJ.chunk.mjs'),window.OC.filePath('notifications', '', 'css/BrowserStorage-ClWbmnb8.chunk.css'),window.OC.filePath('notifications', '', 'css/NotificationsApp-B2NiaI7A.chunk.css')])))=>i.map(i=>d[i]);
+const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=[window.OC.filePath('notifications', '', 'js/NotificationsApp-C3a-pDhV.chunk.mjs'),window.OC.filePath('notifications', '', 'js/_plugin-vue2_normalizer-CT8YLgqQ.chunk.mjs'),window.OC.filePath('notifications', '', 'js/style-N1aAjoYj.chunk.mjs'),window.OC.filePath('notifications', '', 'css/style-BRbSke62.chunk.css'),window.OC.filePath('notifications', '', 'css/_plugin-vue2_normalizer-DCbvgtYV.chunk.css'),window.OC.filePath('notifications', '', 'js/BrowserStorage-D6kcvwSJ.chunk.mjs'),window.OC.filePath('notifications', '', 'css/BrowserStorage-ClWbmnb8.chunk.css'),window.OC.filePath('notifications', '', 'css/NotificationsApp-DIvzDgxg.chunk.css')])))=>i.map(i=>d[i]);
 /*! third party licenses: js/vendor.LICENSE.txt */
-import{V as p}from"./style-N1aAjoYj.chunk.mjs";const v="modulepreload",w=function(i,c){return new URL(i,c).href},y={},A=function(i,c,f){let u=Promise.resolve();if(c&&c.length>0){const s=document.getElementsByTagName("link"),e=document.querySelector("meta[property=csp-nonce]"),h=e?.nonce||e?.getAttribute("nonce");u=Promise.allSettled(c.map(r=>{if(r=w(r,f),r in y)return;y[r]=!0;const l=r.endsWith(".css"),E=l?'[rel="stylesheet"]':"";if(f)for(let a=s.length-1;a>=0;a--){const d=s[a];if(d.href===r&&(!l||d.rel==="stylesheet"))return}else if(document.querySelector(`link[href="${r}"]${E}`))return;const o=document.createElement("link");if(o.rel=l?"stylesheet":v,l||(o.as="script"),o.crossOrigin="",o.href=r,h&&o.setAttribute("nonce",h),document.head.appendChild(o),l)return new Promise((a,d)=>{o.addEventListener("load",a),o.addEventListener("error",()=>d(new Error(`Unable to preload CSS for ${r}`)))})}))}function m(s){const e=new Event("vite:preloadError",{cancelable:!0});if(e.payload=s,window.dispatchEvent(e),!e.defaultPrevented)throw s}return u.then(s=>{for(const e of s||[])e.status==="rejected"&&m(e.reason);return i().catch(m)})};p.prototype.t=t,p.prototype.n=n,p.prototype.OC=OC,p.prototype.OCA=OCA,new p({el:"#notifications",name:"NotificationsApp",components:{NotificationsApp:()=>A(()=>import("./NotificationsApp-BblOjCtt.chunk.mjs").then(i=>i.N),__vite__mapDeps([0,1,2,3,4,5,6,7]),import.meta.url)},render:i=>i("NotificationsApp")});export{A as _};
+import{V as p}from"./style-N1aAjoYj.chunk.mjs";const v="modulepreload",w=function(i,c){return new URL(i,c).href},y={},A=function(i,c,f){let u=Promise.resolve();if(c&&c.length>0){const s=document.getElementsByTagName("link"),e=document.querySelector("meta[property=csp-nonce]"),h=e?.nonce||e?.getAttribute("nonce");u=Promise.allSettled(c.map(r=>{if(r=w(r,f),r in y)return;y[r]=!0;const l=r.endsWith(".css"),E=l?'[rel="stylesheet"]':"";if(f)for(let a=s.length-1;a>=0;a--){const d=s[a];if(d.href===r&&(!l||d.rel==="stylesheet"))return}else if(document.querySelector(`link[href="${r}"]${E}`))return;const o=document.createElement("link");if(o.rel=l?"stylesheet":v,l||(o.as="script"),o.crossOrigin="",o.href=r,h&&o.setAttribute("nonce",h),document.head.appendChild(o),l)return new Promise((a,d)=>{o.addEventListener("load",a),o.addEventListener("error",()=>d(new Error(`Unable to preload CSS for ${r}`)))})}))}function m(s){const e=new Event("vite:preloadError",{cancelable:!0});if(e.payload=s,window.dispatchEvent(e),!e.defaultPrevented)throw s}return u.then(s=>{for(const e of s||[])e.status==="rejected"&&m(e.reason);return i().catch(m)})};p.prototype.t=t,p.prototype.n=n,p.prototype.OC=OC,p.prototype.OCA=OCA,new p({el:"#notifications",name:"NotificationsApp",components:{NotificationsApp:()=>A(()=>import("./NotificationsApp-C3a-pDhV.chunk.mjs").then(i=>i.N),__vite__mapDeps([0,1,2,3,4,5,6,7]),import.meta.url)},render:i=>i("NotificationsApp")});export{A as _};

src/NotificationsApp.vue

@@ -38,17 +38,6 @@
 						v-bind="n"
 						:index="index"
 						@remove="onRemove" />
-					<!-- Dismiss all -->
-					<li key="dismiss-button" class="dismiss-all">
-						<NcButton type="tertiary"
-							wide
-							@click="onDismissAll">
-							<template #icon>
-								<IconClose :size="20" />
-							</template>
-							{{ t('notifications', 'Dismiss all notifications') }}
-						</NcButton>
-					</li>
 				</transition-group>
 
 				<!-- No notifications -->
@@ -73,6 +62,18 @@
 					</template>
 				</NcEmptyContent>
 			</transition>
+
+			<!-- Dismiss all -->
+			<div v-if="notifications.length > 0" class="dismiss-all">
+				<NcButton type="tertiary"
+					wide
+					@click="onDismissAll">
+					<template #icon>
+						<IconClose :size="20" />
+					</template>
+					{{ t('notifications', 'Dismiss all notifications') }}
+				</NcButton>
+			</div>
 		</div>
 	</NcHeaderMenu>
 </template>
@@ -482,12 +483,13 @@ export default {
 	.notification-wrapper {
 		display: flex;
 		flex-direction: column;
-		max-height: calc(100vh - 50px * 4);
+		max-height: calc(100vh - 50px * 5);
 		overflow: auto;
 	}
 
 	.dismiss-all {
 		padding: calc(2 * var(--default-grid-baseline));
+		border-top: 1px solid var(--color-border);
 	}
 }