From e2521e501ca0a9ddf109d9d8ea69fb1e0421358d Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Wed, 25 Jan 2023 10:30:20 +0100
Subject: [PATCH] Change the position of the clear button [SCI-7585]

---
 app/assets/stylesheets/repository/filters.scss     | 6 +++++-
 app/javascript/vue/repository_filter/container.vue | 7 +++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/repository/filters.scss b/app/assets/stylesheets/repository/filters.scss
index 5625f004d..c2cefe3c9 100644
--- a/app/assets/stylesheets/repository/filters.scss
+++ b/app/assets/stylesheets/repository/filters.scss
@@ -69,7 +69,7 @@
         @include font-h2;
       }
 
-      .clear-filters-btn {
+      .close {
         margin-left: auto;
       }
     }
@@ -120,6 +120,10 @@
       padding: 1em;
 
       .apply-button {
+        margin-left: 8px;
+      }
+
+      .clear-filters-btn {
         margin-left: auto;
       }
 
diff --git a/app/javascript/vue/repository_filter/container.vue b/app/javascript/vue/repository_filter/container.vue
index 5ccc8faaa..001c52d5e 100644
--- a/app/javascript/vue/repository_filter/container.vue
+++ b/app/javascript/vue/repository_filter/container.vue
@@ -19,10 +19,6 @@
           />
         </div>
       </div>
-      <button class="btn btn-light clear-filters-btn prevent-shrink" @click="clearFilters()">
-        <i class="fas fa-times-circle"></i>
-        {{ i18n.t('repositories.show.filters.clear') }}
-      </button>
     </div>
     <FiltersList 
       :filters.sync="filters" 
@@ -46,6 +42,9 @@
           />
         </div>
       </div>
+      <button class="btn btn-light clear-filters-btn prevent-shrink" @click="clearFilters()">
+        {{ i18n.t('repositories.show.filters.clear') }}
+      </button>
       <button @click="$emit('filters:apply')" class="btn btn-primary apply-button prevent-shrink">
         {{ i18n.t('repositories.show.filters.apply') }}
       </button>