From 91a52a29ce6025203ab2edcc6831db9eac7eff24 Mon Sep 17 00:00:00 2001
From: grimhilt <grimhilt@users.noreply.github.com>
Date: Wed, 26 Apr 2023 17:45:48 +0200
Subject: [PATCH] change color of flag

---
 .../components/structure/message/Options.vue  |  7 +++++-
 front/src/components/utils/SvgLoader.vue      | 25 +++++++------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/front/src/components/structure/message/Options.vue b/front/src/components/structure/message/Options.vue
index 77a3a5f..85b59cb 100644
--- a/front/src/components/structure/message/Options.vue
+++ b/front/src/components/structure/message/Options.vue
@@ -64,7 +64,12 @@ const setFlag = (flag: string, loadingState: Ref<boolean>) => {
                 />
             </span>
             <span @click="setFlaggedFlag()">
-                <SvgLoader svg="flag-line" class="option" :loading="flaggedLoading" />
+                <SvgLoader
+                    svg="flag-line"
+                    class="option"
+                    :loading="flaggedLoading"
+                    :classes="hasFlag(props.msg?.flags, '\\Flagged') ? 'warn' : ''"
+                />
                 <!-- 
                 <SvgLoader
                     v-if="isSeenFc(props.msg?.flags)"
diff --git a/front/src/components/utils/SvgLoader.vue b/front/src/components/utils/SvgLoader.vue
index 22b2062..242135d 100644
--- a/front/src/components/utils/SvgLoader.vue
+++ b/front/src/components/utils/SvgLoader.vue
@@ -6,11 +6,6 @@ const props = defineProps({
     isDisabled: Boolean,
     classes: String,
     loading: { type: Boolean, default: false },
-    color: {
-        type: String,
-        default: `brightness(0) saturate(100%) invert(100%) sepia(4%) saturate(1934%) hue-rotate(130deg)
-            brightness(114%) contrast(100%)`,
-    },
 });
 
 console.log(props.loading);
@@ -20,27 +15,25 @@ const pathSvg = () => require(`@/assets/svg/${props.svg}.svg`);
 <template>
     <div class="mainSvg">
         <div class="lds-dual-ring" v-if="loading"></div>
-        <img
-            v-if="!loading"
-            :disabled="props.isDisabled"
-            :src="pathSvg()"
-            :class="props.classes"
-            :style="{ filter: color }"
-        />
+        <img v-if="!loading" :disabled="props.isDisabled" :src="pathSvg()" :class="props.classes" />
     </div>
 </template>
 
-<style scoped>
+<style lang="scss" scoped>
 .mainSvg {
     display: inherit;
 }
 
 img {
     padding: 1px;
-}
+    filter: var(--svg-primary-text);
+    &.danger {
+        filter: var(--svg-danger);
+    }
 
-img.danger {
-    filter: var(--svg-danger) !important;
+    &.warn {
+        filter: var(--svg-warn);
+    }
 }
 
 .lds-dual-ring {