From ecebe77c402a255225af253544b5c270dbe139ce Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Sat, 20 Jun 2020 17:08:27 +0300
Subject: [PATCH] Add settingsGroup labels

---
 src/views/settings/components/Setting.vue |  5 ++--
 src/views/settings/styles/main.scss       | 32 ++++++++++-------------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/views/settings/components/Setting.vue b/src/views/settings/components/Setting.vue
index 7bd28e09..2f99a3d1 100644
--- a/src/views/settings/components/Setting.vue
+++ b/src/views/settings/components/Setting.vue
@@ -1,7 +1,8 @@
 <template>
   <div v-if="!loading">
-    <el-form-item v-if="settingGroup.description" :data-search="settingGroup.key || settingGroup.group" class="description-container">
-      <span class="description" v-html="getFormattedDescription(settingGroup.description)"/>
+    <el-form-item v-if="settingGroup.label || settingGroup.description" :data-search="settingGroup.key || settingGroup.group" class="description-container">
+      <span v-if="settingGroup.label" class="setting-label">{{ settingGroup.label }}</span>
+      <span class="expl no-top-margin" v-html="getFormattedDescription(settingGroup.description)"/>
     </el-form-item>
     <div v-if="settingGroup.key === 'Pleroma.Emails.Mailer'">
       <div v-for="setting in settingGroup.children.filter(setting => !setting.group)" :key="setting.key">
diff --git a/src/views/settings/styles/main.scss b/src/views/settings/styles/main.scss
index abbd3d93..f61cb0b9 100644
--- a/src/views/settings/styles/main.scss
+++ b/src/views/settings/styles/main.scss
@@ -17,22 +17,11 @@
   .delete-setting-button {
     margin-left: 5px;
   }
-  .description > p {
-    font-size: 14px;
-    color: #606266;
-    font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei";
-    font-weight: 700;
-    line-height: 20px;
-    margin: 0 0 14px 0;
-    code {
-      display: inline;
-      padding: 2px 3px;
-      font-size: 14px;
-    }
-  }
   .description-container {
     overflow-wrap: break-word;
-    margin-bottom: 0;
+    .el-form-item__content {
+      line-height: 20px;
+    }
   }
   .divider {
     margin: 0 0 18px 0;
@@ -186,6 +175,9 @@
     width: 30%;
     margin-right: 8px
   }
+  .no-top-margin {
+    margin-top: 0;
+  }
   .pattern-input {
     width: 20%;
     margin-right: 8px
@@ -267,6 +259,14 @@
     display: flex;
     margin-bottom: 10px;
   }
+  .setting-label {
+    font-size: 14px;
+    color: #606266;
+    font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei";
+    font-weight: 700;
+    line-height: 20px;
+    margin: 0 0 14px 0;
+  }
   .settings-container {
     max-width: 1824px;
     margin: auto;
@@ -500,10 +500,6 @@
     .scale-input {
       width: 45%;
     }
-    .setting-label {
-      display: flex;
-      justify-content: space-between;
-    }
     .settings-header {
       width: fit-content;
       display: inline-block;