AkkomaGang/admin-fe
6
2
Fork 9
Code Issues 5 Pull requests 2 Projects Releases Wiki Activity

Add settingsGroup labels

Browse source
This commit is contained in:
Angelina Filippova 2020-06-20 17:08:27 +03:00
parent 54e5191d04
commit ecebe77c40
2 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/views/settings/components/Setting.vue
View file

@ -1,7 +1,8 @@
<template> <template>
<div v-if="!loading"> <div v-if="!loading">
<el-form-item v-if="settingGroup.description" :data-search="settingGroup.key || settingGroup.group" class="description-container"> <el-form-item v-if="settingGroup.label || settingGroup.description" :data-search="settingGroup.key || settingGroup.group" class="description-container">
<span class="description" v-html="getFormattedDescription(settingGroup.description)"/> <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> </el-form-item>
<div v-if="settingGroup.key === 'Pleroma.Emails.Mailer'"> <div v-if="settingGroup.key === 'Pleroma.Emails.Mailer'">
<div v-for="setting in settingGroup.children.filter(setting => !setting.group)" :key="setting.key"> <div v-for="setting in settingGroup.children.filter(setting => !setting.group)" :key="setting.key">

32
src/views/settings/styles/main.scss
View file

@ -17,22 +17,11 @@
.delete-setting-button { .delete-setting-button {
margin-left: 5px; 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 { .description-container {
overflow-wrap: break-word; overflow-wrap: break-word;
margin-bottom: 0; .el-form-item__content {
line-height: 20px;
}
} }
.divider { .divider {
margin: 0 0 18px 0; margin: 0 0 18px 0;
@ -186,6 +175,9 @@
width: 30%; width: 30%;
margin-right: 8px margin-right: 8px
} }
.no-top-margin {
margin-top: 0;
}
.pattern-input { .pattern-input {
width: 20%; width: 20%;
margin-right: 8px margin-right: 8px
@ -267,6 +259,14 @@
display: flex; display: flex;
margin-bottom: 10px; 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 { .settings-container {
max-width: 1824px; max-width: 1824px;
margin: auto; margin: auto;
@ -500,10 +500,6 @@
.scale-input { .scale-input {
width: 45%; width: 45%;
} }
.setting-label {
display: flex;
justify-content: space-between;
}
.settings-header { .settings-header {
width: fit-content; width: fit-content;
display: inline-block; display: inline-block;