From 8c1c2604186e5214c36b68f4135a2ee7d7c7f9f7 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 28 Oct 2022 12:05:23 +0200
Subject: [PATCH] menu filter clear position of buttons

---
 .../FilterMenu/CategoriesFilter.vue           | 13 ++--
 .../FilterMenu/FilterMenuSection.vue          | 63 +++++++++----------
 .../components/FilterMenu/FollowingFilter.vue |  7 ++-
 3 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/webapp/components/FilterMenu/CategoriesFilter.vue b/webapp/components/FilterMenu/CategoriesFilter.vue
index fef947178..0e0504731 100644
--- a/webapp/components/FilterMenu/CategoriesFilter.vue
+++ b/webapp/components/FilterMenu/CategoriesFilter.vue
@@ -1,16 +1,19 @@
 <template>
   <filter-menu-section :title="$t('filter-menu.categories')" class="categories-filter">
-    <template #sidebar>
-      <labeled-button
+    <template #filter-themen>
+      <li class="item"> 
+        <labeled-button
         :filled="!filteredCategoryIds.length"
         :label="$t('filter-menu.all')"
         icon="check"
         @click="resetCategories"
-        style="margin-left: 50px; margin-right: 20px"
       />
-      <labeled-button filled :label="$t('actions.save')" icon="save" @click="saveCategories" />
-      <hr />
+      </li>
+      <li class="item">
+        <labeled-button filled :label="$t('actions.save')" icon="save" @click="saveCategories" />
+      </li>
     </template>
+
     <template #filter-list>
       <li v-for="category in categories" :key="category.id" class="item">
         <labeled-button
diff --git a/webapp/components/FilterMenu/FilterMenuSection.vue b/webapp/components/FilterMenu/FilterMenuSection.vue
index 453773929..5c26e302f 100644
--- a/webapp/components/FilterMenu/FilterMenuSection.vue
+++ b/webapp/components/FilterMenu/FilterMenuSection.vue
@@ -1,10 +1,17 @@
 <template>
   <section class="filter-menu-section">
     <h3 v-if="title" class="title">{{ title }}</h3>
-    <aside class="sidebar">
+     
+    <ul class="filter-list">
+      <slot name="filter-follower" />
+    </ul>
+    <ul class="filter-list">
+      <slot name="filter-themen" />
+    </ul>
+    <!-- <aside class="sidebar">
       <slot name="sidebar" />
-    </aside>
-    <div v-if="divider" class="divider" />
+    </aside> -->
+    <!-- <div v-if="divider" class="divider" /> -->
     <ul class="filter-list">
       <slot name="filter-list" />
     </ul>
@@ -37,25 +44,25 @@ export default {
     font-size: $font-size-base;
   }
 
-  > .sidebar {
-    display: flex;
-    flex-wrap: wrap;
-    flex-basis: 80%;
-    flex-grow: 1;
-    margin-bottom: 20px;
-    // max-width: $size-width-filter-sidebar;
-  }
+  // > .sidebar {
+  //   display: flex;
+  //   flex-wrap: wrap;
+  //   flex-basis: 80%;
+  //   flex-grow: 1;
+  //   margin-bottom: 20px;
+  //   // max-width: $size-width-filter-sidebar;
+  // }
 
-  > .divider {
-    border-left: $border-size-base solid $border-color-soft;
-    margin: $space-small;
-    margin-left: 0;
-  }
+  // > .divider {
+  //   border-left: $border-size-base solid $border-color-soft;
+  //   margin: $space-small;
+  //   margin-left: 0;
+  // }
 
   > .filter-list {
     display: flex;
     flex-wrap: wrap;
-    flex-basis: 80%;
+    flex-basis: 100%;
     flex-grow: 1;
 
     > .item {
@@ -67,14 +74,6 @@ export default {
       @media only screen and (min-width: 800px) {
         width: 20%;
       }
-
-      // @media only screen and (max-width: 630px) {
-      //   width: 30%;
-      // }
-
-      // @media only screen and (max-width: 440px) {
-      //   width: 30%;
-      // }
     }
   }
 
@@ -85,14 +84,14 @@ export default {
       text-align: center;
     }
 
-    > .sidebar {
-      max-width: none;
-    }
+    // > .sidebar {
+    //   max-width: none;
+    // }
 
-    > .divider {
-      border-top: $border-size-base solid $border-color-soft;
-      margin: $space-small;
-    }
+    // > .divider {
+    //   border-top: $border-size-base solid $border-color-soft;
+    //   margin: $space-small;
+    // }
   }
 }
 </style>
diff --git a/webapp/components/FilterMenu/FollowingFilter.vue b/webapp/components/FilterMenu/FollowingFilter.vue
index 677e9a1d2..cf056d4df 100644
--- a/webapp/components/FilterMenu/FollowingFilter.vue
+++ b/webapp/components/FilterMenu/FollowingFilter.vue
@@ -1,13 +1,14 @@
 <template>
   <filter-menu-section :divider="false" class="following-filter">
-    <template #sidebar>
-      <labeled-button
+    <template #filter-follower>
+      <li class="item"> 
+        <labeled-button
         icon="user-plus"
         :label="$t('filter-menu.following')"
         :filled="filteredByUsersFollowed"
         :title="$t('contribution.filterFollow')"
         @click="toggleFilteredByFollowed(currentUser.id)"
-      />
+      /></li>
     </template>
   </filter-menu-section>
 </template>