From f4276f72416ab0eb8171b843d475d31f13533a44 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 1 Aug 2022 23:20:27 +0300
Subject: made quick settings into their own component, added quick view
 settings, added both to conversation view

---
 src/components/conversation/conversation.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/components/conversation/conversation.vue')

diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 1adbe250..c7dacdf9 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -17,6 +17,14 @@
       >
         {{ $t('timeline.collapse') }}
       </button>
+      <QuickFilterSettings
+        v-if="!collapsable"
+        :conversation="true"
+        />
+      <QuickViewSettings
+        v-if="!collapsable"
+        :conversation="true"
+        />
     </div>
     <div class="conversation-body panel-body">
       <div
-- 
cgit v1.2.3-70-g09d2


From 09f3783647ff9e0c194e0e0c71b78e98109635b6 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 4 Aug 2022 23:44:56 +0300
Subject: lint

---
 src/components/conversation/conversation.vue               | 4 ++--
 src/components/quick_view_settings/quick_view_settings.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/components/conversation/conversation.vue')

diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index c7dacdf9..61832566 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -20,11 +20,11 @@
       <QuickFilterSettings
         v-if="!collapsable"
         :conversation="true"
-        />
+      />
       <QuickViewSettings
         v-if="!collapsable"
         :conversation="true"
-        />
+      />
     </div>
     <div class="conversation-body panel-body">
       <div
diff --git a/src/components/quick_view_settings/quick_view_settings.vue b/src/components/quick_view_settings/quick_view_settings.vue
index 4dc8a060..99b14a66 100644
--- a/src/components/quick_view_settings/quick_view_settings.vue
+++ b/src/components/quick_view_settings/quick_view_settings.vue
@@ -13,7 +13,7 @@
           <span
             class="menu-checkbox -radio"
             :class="{ 'menu-checkbox-checked': conversationDisplay === 'tree' }"
-          /><FAIcon icon="folder-tree"/> {{ $t('settings.conversation_display_tree_quick') }}
+          /><FAIcon icon="folder-tree" /> {{ $t('settings.conversation_display_tree_quick') }}
         </button>
         <button
           class="button-default dropdown-item"
@@ -22,7 +22,7 @@
           <span
             class="menu-checkbox -radio"
             :class="{ 'menu-checkbox-checked': conversationDisplay === 'linear' }"
-          /><FAIcon icon="list"/> {{ $t('settings.conversation_display_linear_quick') }}
+          /><FAIcon icon="list" /> {{ $t('settings.conversation_display_linear_quick') }}
         </button>
         <div
           role="separator"
-- 
cgit v1.2.3-70-g09d2

