From 363424cad335574856eab955bf83a8293e37ffab Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Wed, 5 Feb 2020 20:30:19 +0300
Subject: [PATCH 1/3] Add link to documentation on Settings tab

---
 src/lang/en.js               |  3 ++-
 src/views/settings/index.vue | 34 ++++++++++++++++++++++++++++++----
 src/views/statuses/index.vue | 10 +++++-----
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/src/lang/en.js b/src/lang/en.js
index 272dc4b0..24c1a3b9 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -358,7 +358,8 @@ export default {
     successfullyUpdated: 'Successfully updated',
     metadatLowerCase: 'metadata',
     files: 'files',
-    successfullyRemoved: 'Setting removed successfully!'
+    successfullyRemoved: 'Setting removed successfully!',
+    seeDocs: 'See Documentation'
   },
   invites: {
     inviteTokens: 'Invite tokens',
diff --git a/src/views/settings/index.vue b/src/views/settings/index.vue
index 5edb0a19..36f9ef10 100644
--- a/src/views/settings/index.vue
+++ b/src/views/settings/index.vue
@@ -1,6 +1,20 @@
 <template>
   <div class="settings-container">
-    <h1>{{ $t('settings.settings') }}</h1>
+    <div class="settings-header-container">
+      <h1 class="settings-header">{{ $t('settings.settings') }}</h1>
+      <el-link
+        :underline="false"
+        href="https://docs-develop.pleroma.social/backend/admin/config/"
+        target="_blank">
+        <el-button class="settings-docs-button">
+          <span>
+            <i class="el-icon-document"/>
+            {{ $t('settings.seeDocs') }}
+          </span>
+        </el-button>
+      </el-link>
+
+    </div>
     <el-tabs v-model="activeTab" :tab-position="tabPosition">
       <el-tab-pane :label="$t('settings.activityPub')" :disabled="configDisabled" lazy>
         <activity-pub/>
@@ -143,9 +157,21 @@ export default {
     .el-tabs {
       margin-top: 20px
     }
-    h1 {
-      margin: 22px 0 0 15px;
-    }
+  }
+  .settings-docs-button {
+    width: 163px;
+    text-align: left;
+    padding: 10px;
+  }
+  .settings-header {
+    margin: 0;
+  }
+  .settings-header-container {
+    display: flex;
+    height: 36px;
+    justify-content: space-between;
+    align-items: center;
+    margin: 22px 15px 15px 15px;
   }
   @media only screen and (min-width: 1824px) {
     .settings-container {
diff --git a/src/views/statuses/index.vue b/src/views/statuses/index.vue
index df120bc7..828526c8 100644
--- a/src/views/statuses/index.vue
+++ b/src/views/statuses/index.vue
@@ -112,11 +112,11 @@ export default {
   }
 }
 .filter-container {
-    display: flex;
-    height: 36px;
-    justify-content: space-between;
-    align-items: center;
-    margin: 22px 0 15px 0;
+  display: flex;
+  height: 36px;
+  justify-content: space-between;
+  align-items: center;
+  margin: 22px 0 15px 0;
 }
 .select-instance {
   width: 350px;

From 7440c2cef484aa4d912e6f8d2b6c61cad85eabf9 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Wed, 5 Feb 2020 21:45:59 +0300
Subject: [PATCH 2/3] Render select component for settings that have dropdown
 type

---
 src/views/settings/components/Inputs.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/settings/components/Inputs.vue b/src/views/settings/components/Inputs.vue
index 1f5a79c6..957b071d 100644
--- a/src/views/settings/components/Inputs.vue
+++ b/src/views/settings/components/Inputs.vue
@@ -24,7 +24,7 @@
       class="top-margin"
       @change="update($event, settingGroup.group, settingGroup.key, settingParent, setting.key, setting.type, nested)"/>
     <el-select
-      v-if="setting.type === 'module' || (setting.type.includes('atom') && setting.type.includes(false))"
+      v-if="setting.type === 'module' || (setting.type.includes('atom') && setting.type.includes('dropdown'))"
       :value="inputValue"
       clearable
       @change="update($event, settingGroup.group, settingGroup.key, settingParent, setting.key, setting.type, nested)">

From db713474da80de9e4c7950ce8fa662b31bb0f7d6 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Wed, 5 Feb 2020 21:52:25 +0300
Subject: [PATCH 3/3] Fix tab position

---
 src/views/settings/components/Logger.vue | 1 -
 src/views/settings/index.vue             | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/views/settings/components/Logger.vue b/src/views/settings/components/Logger.vue
index aa7e361a..81c32f74 100644
--- a/src/views/settings/components/Logger.vue
+++ b/src/views/settings/components/Logger.vue
@@ -13,7 +13,6 @@
     </el-form>
     <div class="line"/>
     <el-form ref="quackData" :model="quackData" :label-width="labelWidth">
-      <el-form-item label="Quack logger:"/>
       <setting :setting-group="quack" :data="quackData"/>
     </el-form>
     <div class="submit-button-container">
diff --git a/src/views/settings/index.vue b/src/views/settings/index.vue
index 36f9ef10..3c37bdab 100644
--- a/src/views/settings/index.vue
+++ b/src/views/settings/index.vue
@@ -15,7 +15,7 @@
       </el-link>
 
     </div>
-    <el-tabs v-model="activeTab" :tab-position="tabPosition">
+    <el-tabs v-model="activeTab" tab-position="left">
       <el-tab-pane :label="$t('settings.activityPub')" :disabled="configDisabled" lazy>
         <activity-pub/>
       </el-tab-pane>
@@ -141,9 +141,6 @@ export default {
     },
     isMobile() {
       return this.$store.state.app.device === 'mobile'
-    },
-    tabPosition() {
-      return this.isMobile ? 'top' : 'left'
     }
   },
   mounted: function() {