From 4cfbf772a0251ff5590cf2d51fc8453289e3fd92 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 20 Mar 2023 11:43:51 +0100
Subject: [PATCH 1/6] fix(webapp): small buttons in notifications menu

---
 .../NotificationMenu/NotificationMenu.vue           | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index 7fcfabe82..14441f4cf 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -19,15 +19,15 @@
       <ds-flex class="notifications-link-container">
         <ds-flex-item :width="{ base: 'auto' }" centered>
           <nuxt-link :to="{ name: 'notifications' }">
-            <ds-button ghost primary>
+            <base-button ghost primary>
               {{ $t('notifications.pageLink') }}
-            </ds-button>
+            </base-button>
           </nuxt-link>
         </ds-flex-item>
         <ds-flex-item :width="{ base: 'auto' }" centered>
-          <ds-button ghost primary @click="markAllAsRead" data-test="markAllAsRead-button">
+          <base-button ghost primary @click="markAllAsRead" data-test="markAllAsRead-button">
             {{ $t('notifications.markAllAsRead') }}
-          </ds-button>
+          </base-button>
         </ds-flex-item>
       </ds-flex>
     </template>
@@ -144,16 +144,15 @@ export default {
 <style lang="scss">
 .notifications-menu-popover {
   max-width: 500px;
-  margin-bottom: $size-height-base;
 }
 .notifications-link-container {
   background-color: $background-color-softer-active;
   justify-content: center;
-  position: fixed;
   bottom: 0;
   left: 0;
   right: 0;
-  height: $size-height-base;
+  height: 62px;
   padding: $space-x-small;
+  flex-direction: column;
 }
 </style>

From a1b12568ef1d486c08e10a1f6892d897d56015d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 20 Mar 2023 13:36:02 +0100
Subject: [PATCH 2/6] Revert PR 'feat(webapp): on newsfeed add bigger y-gap
 between posts' #6121

---
 webapp/components/MasonryGrid/MasonryGrid.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/MasonryGrid/MasonryGrid.vue b/webapp/components/MasonryGrid/MasonryGrid.vue
index f95c0e16e..00afa31af 100644
--- a/webapp/components/MasonryGrid/MasonryGrid.vue
+++ b/webapp/components/MasonryGrid/MasonryGrid.vue
@@ -30,7 +30,7 @@ export default {
 /* dirty fix to override broken styleguide inline-styles */
 .ds-grid {
   grid-template-columns: repeat(auto-fit, minmax(min(300px, 100%), 1fr)) !important;
-  gap: 32px 16px !important;
+  gap: 16px !important;
   grid-auto-rows: 20px;
 }
 

From 393c657e27baca3b8334e3bf2ca630ffc8eb1b19 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 20 Mar 2023 14:08:32 +0100
Subject: [PATCH 3/6] Add class for the flex items

---
 webapp/components/Dropdown.vue                     |  2 +-
 .../NotificationMenu/NotificationMenu.vue          | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/webapp/components/Dropdown.vue b/webapp/components/Dropdown.vue
index 7e4d21223..0dfff3736 100644
--- a/webapp/components/Dropdown.vue
+++ b/webapp/components/Dropdown.vue
@@ -33,7 +33,7 @@ export default {
   data() {
     return {
       isPopoverOpen: false,
-      developerNoAutoClosing: false, // stops automatic closing of menu for developer purposes: default is 'false'
+      developerNoAutoClosing: true, // stops automatic closing of menu for developer purposes: default is 'false'
     }
   },
   computed: {
diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index 14441f4cf..d777cfe5f 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -17,14 +17,14 @@
         <notification-list :notifications="notifications" @markAsRead="markAsRead" />
       </div>
       <ds-flex class="notifications-link-container">
-        <ds-flex-item :width="{ base: 'auto' }" centered>
+        <ds-flex-item class="notifications-link-container-item" :width="{ base: '100%' }" centered>
           <nuxt-link :to="{ name: 'notifications' }">
             <base-button ghost primary>
               {{ $t('notifications.pageLink') }}
             </base-button>
           </nuxt-link>
         </ds-flex-item>
-        <ds-flex-item :width="{ base: 'auto' }" centered>
+        <ds-flex-item class="notifications-link-container-item" :width="{ base: '100%' }" centered>
           <base-button ghost primary @click="markAllAsRead" data-test="markAllAsRead-button">
             {{ $t('notifications.markAllAsRead') }}
           </base-button>
@@ -148,11 +148,11 @@ export default {
 .notifications-link-container {
   background-color: $background-color-softer-active;
   justify-content: center;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 62px;
   padding: $space-x-small;
-  flex-direction: column;
+  flex-direction: row;
+}
+.notifications-link-container-item {
+  justify-content: center;
+  display: flex;
 }
 </style>

From 593b81c501a720dd1db674c742329fcc342326f6 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 20 Mar 2023 14:44:24 +0100
Subject: [PATCH 4/6] fix(webapp): close popover notification menu

---
 webapp/components/NotificationMenu/NotificationMenu.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index 7fcfabe82..ceac606b0 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -12,7 +12,7 @@
         <counter-icon icon="bell" :count="unreadNotificationsCount" danger />
       </base-button>
     </template>
-    <template #popover>
+    <template #popover="{ closeMenu }">
       <div class="notifications-menu-popover">
         <notification-list :notifications="notifications" @markAsRead="markAsRead" />
       </div>
@@ -25,7 +25,7 @@
           </nuxt-link>
         </ds-flex-item>
         <ds-flex-item :width="{ base: 'auto' }" centered>
-          <ds-button ghost primary @click="markAllAsRead" data-test="markAllAsRead-button">
+          <ds-button ghost primary @click="markAllAsRead(closeMenu)" data-test="markAllAsRead-button">
             {{ $t('notifications.markAllAsRead') }}
           </ds-button>
         </ds-flex-item>
@@ -74,11 +74,12 @@ export default {
         this.$toast.error(error.message)
       }
     },
-    async markAllAsRead() {
+    async markAllAsRead(closeMenu) {
       if (!this.hasNotifications) {
         return
       }
 
+      closeMenu()
       try {
         await this.$apollo.mutate({
           mutation: markAllAsReadMutation(this.$i18n),

From e7d6afbc2636e3aa9c963d2fe181d201e4acf65c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 20 Mar 2023 14:44:53 +0100
Subject: [PATCH 5/6] Fix by setting 'developerNoAutoClosing: false'

---
 webapp/components/Dropdown.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/Dropdown.vue b/webapp/components/Dropdown.vue
index 0dfff3736..7e4d21223 100644
--- a/webapp/components/Dropdown.vue
+++ b/webapp/components/Dropdown.vue
@@ -33,7 +33,7 @@ export default {
   data() {
     return {
       isPopoverOpen: false,
-      developerNoAutoClosing: true, // stops automatic closing of menu for developer purposes: default is 'false'
+      developerNoAutoClosing: false, // stops automatic closing of menu for developer purposes: default is 'false'
     }
   },
   computed: {

From 54f216078014f15084523d27860567dab186392f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 20 Mar 2023 15:03:24 +0100
Subject: [PATCH 6/6] Fix linting

---
 webapp/components/NotificationMenu/NotificationMenu.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index ceac606b0..47087e0d6 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -25,7 +25,12 @@
           </nuxt-link>
         </ds-flex-item>
         <ds-flex-item :width="{ base: 'auto' }" centered>
-          <ds-button ghost primary @click="markAllAsRead(closeMenu)" data-test="markAllAsRead-button">
+          <ds-button
+            ghost
+            primary
+            @click="markAllAsRead(closeMenu)"
+            data-test="markAllAsRead-button"
+          >
             {{ $t('notifications.markAllAsRead') }}
           </ds-button>
         </ds-flex-item>