From e2c82116ae1b2f46842f17a373289fdb7360e1b9 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 15 Mar 2023 10:43:35 +0100
Subject: [PATCH 1/7] feat(webapp): GroupList shows 2 GroupItem per row

---
 webapp/components/Group/GroupList.vue | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/webapp/components/Group/GroupList.vue b/webapp/components/Group/GroupList.vue
index 7618e5b57..93ad6e2b0 100644
--- a/webapp/components/Group/GroupList.vue
+++ b/webapp/components/Group/GroupList.vue
@@ -1,9 +1,12 @@
 <template>
-  <div class="group-list">
-    <ds-space margin-bottom="small" v-for="group in groups" :key="group.id">
+  <ds-flex class="group-list">
+    <ds-flex-item 
+      v-for="group in groups"
+      :key="group.id" 
+      :width="{ base: '47%' }">
       <group-teaser :group="group" />
-    </ds-space>
-  </div>
+    </ds-flex-item>
+  </ds-flex>
 </template>
 
 <script>
@@ -19,3 +22,8 @@ export default {
   },
 }
 </script>
+<style lang="scss">
+.ds-flex-item {
+  margin: 0em 1em 2em 1em;
+}
+</style>

From 2eed0986a57ab9f35d78c42edb70056f2f7665d7 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 15 Mar 2023 10:44:15 +0100
Subject: [PATCH 2/7] Change ds-container to ds-space to remove padding

---
 webapp/pages/groups.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/pages/groups.vue b/webapp/pages/groups.vue
index 386905c5b..6b895de72 100644
--- a/webapp/pages/groups.vue
+++ b/webapp/pages/groups.vue
@@ -4,7 +4,7 @@
       <tab-navigation :tabs="tabOptions" :activeTab="tabActive" @switch-tab="handleTab" />
     </ds-space>
     <ds-space margin="large" />
-    <ds-container>
+    <ds-space>
       <!-- create group -->
       <ds-space centered>
         <nuxt-link :to="{ name: 'group-create' }">
@@ -49,7 +49,7 @@
           @next="nextResults"
         />
       </ds-space>
-    </ds-container>
+    </ds-space>
   </div>
 </template>
 

From 19ac18af2af3ad1cf77107be620f7deed4e156f7 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 15 Mar 2023 11:08:47 +0100
Subject: [PATCH 3/7] Base is now width 98% after md we switch to 48%

---
 webapp/components/Group/GroupList.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Group/GroupList.vue b/webapp/components/Group/GroupList.vue
index 93ad6e2b0..debe0e7a5 100644
--- a/webapp/components/Group/GroupList.vue
+++ b/webapp/components/Group/GroupList.vue
@@ -3,7 +3,7 @@
     <ds-flex-item 
       v-for="group in groups"
       :key="group.id" 
-      :width="{ base: '47%' }">
+      :width="{ base: '98%', sm: '98%', md: '48%' }">
       <group-teaser :group="group" />
     </ds-flex-item>
   </ds-flex>
@@ -24,6 +24,6 @@ export default {
 </script>
 <style lang="scss">
 .ds-flex-item {
-  margin: 0em 1em 2em 1em;
+  margin: 0 1% 2% 1%;
 }
 </style>

From be130f849a5ebf6a865c17a0affcae0d82c1dee9 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 15 Mar 2023 11:44:13 +0100
Subject: [PATCH 4/7] Fix linting.

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

diff --git a/webapp/components/Group/GroupList.vue b/webapp/components/Group/GroupList.vue
index debe0e7a5..692e518d8 100644
--- a/webapp/components/Group/GroupList.vue
+++ b/webapp/components/Group/GroupList.vue
@@ -1,9 +1,10 @@
 <template>
   <ds-flex class="group-list">
-    <ds-flex-item 
+    <ds-flex-item
       v-for="group in groups"
-      :key="group.id" 
-      :width="{ base: '98%', sm: '98%', md: '48%' }">
+      :key="group.id"
+      :width="{ base: '98%', sm: '98%', md: '48%' }"
+    >
       <group-teaser :group="group" />
     </ds-flex-item>
   </ds-flex>

From 176050082b1f4da5104d45d0ce05fbdd27d9e381 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 15 Mar 2023 11:55:18 +0100
Subject: [PATCH 5/7] Add scoped to style

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

diff --git a/webapp/components/Group/GroupList.vue b/webapp/components/Group/GroupList.vue
index 692e518d8..8ee027ce6 100644
--- a/webapp/components/Group/GroupList.vue
+++ b/webapp/components/Group/GroupList.vue
@@ -23,7 +23,7 @@ export default {
   },
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .ds-flex-item {
   margin: 0 1% 2% 1%;
 }

From 6223edcb2081e7146199e83ed46882570db56146 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 15 Mar 2023 12:02:19 +0100
Subject: [PATCH 6/7] Change style ds-flex-item to class name group-item

---
 webapp/components/Group/GroupList.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webapp/components/Group/GroupList.vue b/webapp/components/Group/GroupList.vue
index 8ee027ce6..dbde61ac6 100644
--- a/webapp/components/Group/GroupList.vue
+++ b/webapp/components/Group/GroupList.vue
@@ -4,6 +4,7 @@
       v-for="group in groups"
       :key="group.id"
       :width="{ base: '98%', sm: '98%', md: '48%' }"
+      class="group-item"
     >
       <group-teaser :group="group" />
     </ds-flex-item>
@@ -24,7 +25,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.ds-flex-item {
+.group-item {
   margin: 0 1% 2% 1%;
 }
 </style>

From 19b81a85b12a45b2e15228bf6d16762faf9fa516 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 15 Mar 2023 12:17:10 +0100
Subject: [PATCH 7/7] Change padding-bottom from 5px to 20px

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

diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index bb6eff0f4..0094f5706 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -346,7 +346,7 @@ export default {
   position: fixed;
   z-index: 6;
   margin-top: -35px;
-  padding: 20px 10px 5px 10px;
+  padding: 20px 10px 20px 10px;
   background-color: #f5f4f6;
 }
 @media screen and (max-width: 656px) {