Merge remote-tracking branch 'origin/develop' into been-awhile

* origin/develop:
  lint
  fix bugs
  Apply 1 suggestion(s) to 1 file(s)
  change icons
  Update dependency vue-i18n to v9.2.0
  made quick settings into their own component, added quick view settings, added both to conversation view

1 files changed, 0 insertions, 109 deletions

diff --git a/src/components/timeline/timeline_quick_settings.vue b/src/components/timeline/timeline_quick_settings.vue
deleted file mode 100644
index 297bc72a..00000000
--- a/src/components/timeline/timeline_quick_settings.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<template>
-  <Popover
-    trigger="click"
-    class="TimelineQuickSettings"
-    :bound-to="{ x: 'container' }"
-  >
-    <template #content>
-      <div class="dropdown-menu">
-        <div v-if="loggedIn">
-          <button
-            class="button-default dropdown-item"
-            @click="replyVisibilityAll = true"
-          >
-            <span
-              class="menu-checkbox -radio"
-              :class="{ 'menu-checkbox-checked': replyVisibilityAll }"
-            />{{ $t('settings.reply_visibility_all') }}
-          </button>
-          <button
-            class="button-default dropdown-item"
-            @click="replyVisibilityFollowing = true"
-          >
-            <span
-              class="menu-checkbox -radio"
-              :class="{ 'menu-checkbox-checked': replyVisibilityFollowing }"
-            />{{ $t('settings.reply_visibility_following_short') }}
-          </button>
-          <button
-            class="button-default dropdown-item"
-            @click="replyVisibilitySelf = true"
-          >
-            <span
-              class="menu-checkbox -radio"
-              :class="{ 'menu-checkbox-checked': replyVisibilitySelf }"
-            />{{ $t('settings.reply_visibility_self_short') }}
-          </button>
-          <div
-            role="separator"
-            class="dropdown-divider"
-          />
-        </div>
-        <button
-          class="button-default dropdown-item"
-          @click="muteBotStatuses = !muteBotStatuses"
-        >
-          <span
-            class="menu-checkbox"
-            :class="{ 'menu-checkbox-checked': muteBotStatuses }"
-          />{{ $t('settings.mute_bot_posts') }}
-        </button>
-        <button
-          class="button-default dropdown-item"
-          @click="hideMedia = !hideMedia"
-        >
-          <span
-            class="menu-checkbox"
-            :class="{ 'menu-checkbox-checked': hideMedia }"
-          />{{ $t('settings.hide_media_previews') }}
-        </button>
-        <button
-          class="button-default dropdown-item"
-          @click="hideMutedPosts = !hideMutedPosts"
-        >
-          <span
-            class="menu-checkbox"
-            :class="{ 'menu-checkbox-checked': hideMutedPosts }"
-          />{{ $t('settings.hide_all_muted_posts') }}
-        </button>
-        <button
-          class="button-default dropdown-item dropdown-item-icon"
-          @click="openTab('filtering')"
-        >
-          <FAIcon icon="font" />{{ $t('settings.word_filter') }}
-        </button>
-        <button
-          class="button-default dropdown-item dropdown-item-icon"
-          @click="openTab('general')"
-        >
-          <FAIcon icon="wrench" />{{ $t('settings.more_settings') }}
-        </button>
-      </div>
-    </template>
-    <template #trigger>
-      <button class="button-unstyled">
-        <FAIcon icon="filter" />
-      </button>
-    </template>
-  </Popover>
-</template>
-
-<script src="./timeline_quick_settings.js"></script>
-
-<style lang="scss">
-
-.TimelineQuickSettings {
-
-  > button {
-    line-height: 100%;
-    height: 100%;
-    width: var(--__panel-heading-height-inner);
-    text-align: center;
-
-    svg {
-      font-size: 1.2em;
-    }
-  }
-}
-
-</style>