From af96cb4adc5957d01c3c49e25d9a884bc30b31f2 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Sat, 15 Feb 2020 00:11:23 +0300
Subject: [PATCH] Remove settings-input class

---
 src/views/settings/components/Inputs.vue       |  6 +++---
 src/views/settings/components/Setting.vue      |  2 +-
 .../inputComponents/MascotsInput.vue           |  6 +++---
 .../components/inputComponents/PruneInput.vue  |  6 +++---
 .../inputComponents/RateLimitInput.vue         |  4 ++--
 src/views/settings/index.vue                   |  2 +-
 src/views/settings/styles/main.scss            | 18 ++++++------------
 7 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/views/settings/components/Inputs.vue b/src/views/settings/components/Inputs.vue
index 957e35ab..93d0f28e 100644
--- a/src/views/settings/components/Inputs.vue
+++ b/src/views/settings/components/Inputs.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="input-container">
     <div v-if="setting.type === 'keyword'" class="keyword-container">
-      <el-form-item :label-width="customLabelWidth" :class="labelClass" :style="`margin-left:${margin}px;margin-bottom:0`" class="settings-input">
+      <el-form-item :label-width="customLabelWidth" :class="labelClass" :style="`margin-left:${margin}px;margin-bottom:0`" >
         <span slot="label">
           {{ setting.label }}
           <el-tooltip v-if="canBeDeleted && isDesktop" :content="$t('settings.removeFromDB')" placement="bottom-end">
@@ -9,7 +9,7 @@
           </el-tooltip>
         </span>
       </el-form-item>
-      <el-form-item v-for="subSetting in setting.children" :key="subSetting.key" class="settings-input">
+      <el-form-item v-for="subSetting in setting.children" :key="subSetting.key">
         <inputs
           :setting-group="settingGroup"
           :setting-parent="[...settingParent, subSetting]"
@@ -21,7 +21,7 @@
           :nested="true"/>
       </el-form-item>
     </div>
-    <el-form-item v-if="setting.type !== 'keyword'" :label-width="customLabelWidth" :class="labelClass" class="settings-input">
+    <el-form-item v-if="setting.type !== 'keyword'" :label-width="customLabelWidth" :class="labelClass">
       <span slot="label">
         {{ setting.label }}
         <el-tooltip v-if="canBeDeleted && isDesktop" :content="$t('settings.removeFromDB')" placement="bottom-end">
diff --git a/src/views/settings/components/Setting.vue b/src/views/settings/components/Setting.vue
index 53e45450..116aada5 100644
--- a/src/views/settings/components/Setting.vue
+++ b/src/views/settings/components/Setting.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="!loading">
-    <el-form-item v-if="settingGroup.description" class="description-container settings-input">
+    <el-form-item v-if="settingGroup.description" class="description-container">
       <span class="description" v-html="getFormattedDescription(settingGroup.description)"/>
     </el-form-item>
     <div v-if="settingGroup.key === 'Pleroma.Emails.Mailer'">
diff --git a/src/views/settings/components/inputComponents/MascotsInput.vue b/src/views/settings/components/inputComponents/MascotsInput.vue
index 4f4ec9f2..a409e5c4 100644
--- a/src/views/settings/components/inputComponents/MascotsInput.vue
+++ b/src/views/settings/components/inputComponents/MascotsInput.vue
@@ -1,16 +1,16 @@
 <template>
   <div>
     <div v-for="mascot in data" :key="getId(mascot)" class="mascot-container">
-      <el-form-item label="Name" label-width="85px" class="settings-input">
+      <el-form-item label="Name" label-width="85px">
         <div class="mascot-name-container">
           <el-input :value="getName(mascot)" placeholder="Name" class="mascot-name-input" @input="parseMascots($event, 'name', mascot)"/>
           <el-button :size="isDesktop ? 'medium' : 'mini'" class="icon-minus-button" icon="el-icon-minus" circle @click="deleteMascotsRow(mascot)"/>
         </div>
       </el-form-item>
-      <el-form-item label="URL" label-width="85px" class="settings-input">
+      <el-form-item label="URL" label-width="85px">
         <el-input :value="getUrl(mascot)" placeholder="URL" class="mascot-input" @input="parseMascots($event, 'url', mascot)"/>
       </el-form-item>
-      <el-form-item label="Mime type" label-width="85px" class="settings-input">
+      <el-form-item label="Mime type" label-width="85px">
         <el-input :value="getMimeType(mascot)" placeholder="Mime type" class="mascot-input" @input="parseMascots($event, 'mimeType', mascot)"/>
       </el-form-item>
     </div>
diff --git a/src/views/settings/components/inputComponents/PruneInput.vue b/src/views/settings/components/inputComponents/PruneInput.vue
index a37f22c2..c851aa5b 100644
--- a/src/views/settings/components/inputComponents/PruneInput.vue
+++ b/src/views/settings/components/inputComponents/PruneInput.vue
@@ -1,11 +1,11 @@
 <template>
   <div>
-    <el-radio-group v-model="prune">
+    <el-radio-group v-model="prune" class="prune-options">
       <el-radio label=":disabled">Disabled</el-radio>
       <el-radio label=":maxlen">Limit-based</el-radio>
       <el-radio label=":maxage">Time-based</el-radio>
     </el-radio-group>
-    <el-form-item v-if="prune === ':maxlen'" label="max length" label-width="100" label-position="left" class="settings-input">
+    <el-form-item v-if="prune === ':maxlen'" label="max length" label-width="100" label-position="left">
       <el-input-number
         :value="data[1]"
         :min="0"
@@ -14,7 +14,7 @@
         class="top-margin"
         @change="updateIntInput($event, ':maxlen')"/>
     </el-form-item>
-    <el-form-item v-if="prune === ':maxage'" label="max age" label-width="100" label-position="left" class="settings-input">
+    <el-form-item v-if="prune === ':maxage'" label="max age" label-width="100" label-position="left">
       <el-input-number
         :value="data[1]"
         :min="0"
diff --git a/src/views/settings/components/inputComponents/RateLimitInput.vue b/src/views/settings/components/inputComponents/RateLimitInput.vue
index c1180476..e9d01724 100644
--- a/src/views/settings/components/inputComponents/RateLimitInput.vue
+++ b/src/views/settings/components/inputComponents/RateLimitInput.vue
@@ -18,7 +18,7 @@
       </div>
     </div>
     <div v-if="rateLimitAuthUsers">
-      <el-form-item class="rate-limit settings-input">
+      <el-form-item class="rate-limit">
         <div class="rate-limit-label-container">
           <span class="rate-limit-label">
             Unauthenticated users:
@@ -42,7 +42,7 @@
           )"/>
         </div>
       </el-form-item>
-      <el-form-item class="rate-limit settings-input">
+      <el-form-item class="rate-limit">
         <div class="rate-limit-label-container">
           <span class="rate-limit-label">
             Authenticated users:
diff --git a/src/views/settings/index.vue b/src/views/settings/index.vue
index bf112080..0925b73d 100644
--- a/src/views/settings/index.vue
+++ b/src/views/settings/index.vue
@@ -261,7 +261,7 @@ export default {
     margin: 15px;
   }
   .settings-menu {
-    width: 45%;
+    width: 163px;
   }
 }
 </style>
diff --git a/src/views/settings/styles/main.scss b/src/views/settings/styles/main.scss
index 48c958c7..c13f259e 100644
--- a/src/views/settings/styles/main.scss
+++ b/src/views/settings/styles/main.scss
@@ -182,6 +182,9 @@
     margin-left: 8px;
     margin-right: 10px
   }
+  .prune-options {
+    display: flex;
+  }
   .rate-limit {
     .el-form-item__content {
       width: 100%;
@@ -288,9 +291,6 @@
         font-size: 14px;
       }
     }
-    .description-container.settings-input {
-      margin-bottom: 0;
-    }
     .follow-relay {
       width: 70%;
       margin-right: 5px;
@@ -328,6 +328,9 @@
       width: 100%;
       margin-left: 0;
     }
+    .prune-options {
+      flex-direction: column;
+    }
     .rate-limit {
       .el-form-item__content {
         flex-direction: column;
@@ -343,12 +346,6 @@
       display: flex;
       justify-content: space-between;
     }
-    .settings-input {
-      display: inline-block;
-      width: 90%;
-      padding: 0 15px 10px 0;
-      margin: 0;
-    }
     .socks5-checkbox-container {
       width: 100%;
     }
@@ -394,9 +391,6 @@
     }
     .mascot-container {
       margin-bottom: 5px;
-      .settings-input {
-        width: 100%;
-      }
     }
     .name-input {
       width: 40%;