diff --git a/resources/assets/js/components/minder/editor.js b/resources/assets/js/components/Minder/editor.js
similarity index 100%
rename from resources/assets/js/components/minder/editor.js
rename to resources/assets/js/components/Minder/editor.js
diff --git a/resources/assets/js/components/minder/index.js b/resources/assets/js/components/Minder/index.js
similarity index 100%
rename from resources/assets/js/components/minder/index.js
rename to resources/assets/js/components/Minder/index.js
diff --git a/resources/assets/js/components/minder/minder.vue b/resources/assets/js/components/Minder/minder.vue
similarity index 100%
rename from resources/assets/js/components/minder/minder.vue
rename to resources/assets/js/components/Minder/minder.vue
diff --git a/resources/assets/js/components/minder/static/kity.js b/resources/assets/js/components/Minder/static/kity.js
similarity index 100%
rename from resources/assets/js/components/minder/static/kity.js
rename to resources/assets/js/components/Minder/static/kity.js
diff --git a/resources/assets/js/components/minder/static/kityminder.core.min.js b/resources/assets/js/components/Minder/static/kityminder.core.min.js
similarity index 100%
rename from resources/assets/js/components/minder/static/kityminder.core.min.js
rename to resources/assets/js/components/Minder/static/kityminder.core.min.js
diff --git a/resources/assets/js/pages/manage/components/FileContent.vue b/resources/assets/js/pages/manage/components/FileContent.vue
index b26247307..59a0c9371 100644
--- a/resources/assets/js/pages/manage/components/FileContent.vue
+++ b/resources/assets/js/pages/manage/components/FileContent.vue
@@ -62,7 +62,7 @@
 
 <script>
 import Vue from 'vue'
-import Minder from '../../../components/minder'
+import Minder from '../../../components/Minder'
 import {mapState} from "vuex";
 Vue.use(Minder)
 
diff --git a/resources/assets/js/pages/manage/components/FilePreview.vue b/resources/assets/js/pages/manage/components/FilePreview.vue
index 6314a6f8b..1a4c92c99 100644
--- a/resources/assets/js/pages/manage/components/FilePreview.vue
+++ b/resources/assets/js/pages/manage/components/FilePreview.vue
@@ -39,7 +39,7 @@
 
 <script>
 import Vue from 'vue'
-import Minder from '../../../components/minder'
+import Minder from '../../../components/Minder'
 Vue.use(Minder)
 
 const MDPreview = () => import('../../../components/MDEditor/preview');
diff --git a/resources/assets/js/pages/manage/setting/system/columnTemplate.vue b/resources/assets/js/pages/manage/setting/components/SystemColumnTemplate.vue
similarity index 100%
rename from resources/assets/js/pages/manage/setting/system/columnTemplate.vue
rename to resources/assets/js/pages/manage/setting/components/SystemColumnTemplate.vue
diff --git a/resources/assets/js/pages/manage/setting/system/EmailSetting.vue b/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue
similarity index 51%
rename from resources/assets/js/pages/manage/setting/system/EmailSetting.vue
rename to resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue
index 7fbb47e1a..aaba56dc7 100644
--- a/resources/assets/js/pages/manage/setting/system/EmailSetting.vue
+++ b/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue
@@ -1,46 +1,52 @@
 <template>
-    <div class="setting-item submit">
+    <div class="setting-system-item">
         <Form ref="formData" :model="formData" :rules="ruleData" label-width="auto" @submit.native.prevent>
-            <h3>{{ $L('邮箱服务器设置') }}</h3>
-            <FormItem :label="$L('SMTP服务器')" prop="smtp_server">
-                <Input v-model="formData.smtp_server"/>
-            </FormItem>
-            <FormItem :label="$L('端口')" prop="port">
-                <Input :maxlength="20" v-model="formData.port"/>
-            </FormItem>
-            <FormItem :label="$L('账号')" prop="account">
-                <Input :maxlength="20" v-model="formData.account"/>
-            </FormItem>
-            <FormItem :label="$L('密码')" prop="password">
-                <Input :maxlength="20" v-model="formData.password"/>
-            </FormItem>
+            <div class="email-setting-box">
+                <h3>{{ $L('邮箱服务器设置') }}</h3>
+                <FormItem :label="$L('SMTP服务器')" prop="smtp_server">
+                    <Input v-model="formData.smtp_server"/>
+                </FormItem>
+                <FormItem :label="$L('端口')" prop="port">
+                    <Input :maxlength="20" v-model="formData.port"/>
+                </FormItem>
+                <FormItem :label="$L('账号')" prop="account">
+                    <Input :maxlength="20" v-model="formData.account"/>
+                </FormItem>
+                <FormItem :label="$L('密码')" prop="password">
+                    <Input :maxlength="20" v-model="formData.password" type="password"/>
+                </FormItem>
+            </div>
 
-            <h3>{{ $L('邮件通知设置') }}</h3>
-            <FormItem :label="$L('开启注册验证')" prop="reg_verify">
-                <RadioGroup v-model="formData.reg_verify">
-                    <Radio label="open">{{ $L('开启') }}</Radio>
-                    <Radio label="close">{{ $L('关闭') }}</Radio>
-                </RadioGroup>
-                <div v-if="formData.reg_verify == 'open'" class="form-tip">{{$L('开启后账号需验证通过才可登录')}}</div>
-            </FormItem>
-            <FormItem :label="$L('开启通知')" prop="notice">
-                <RadioGroup v-model="formData.notice">
-                    <Radio label="open">{{ $L('开启') }}</Radio>
-                    <Radio label="close">{{ $L('关闭') }}</Radio>
-                </RadioGroup>
-            </FormItem>
-            <template v-if="formData.notice == 'open'">
-                <FormItem :label="$L('任务提醒:')" prop="task_remind_hours">
-                    <label>{{ $L('到期前') }}</label>
-                    <InputNumber v-model="formData.task_remind_hours" :min="0.5" :step="0.5" @on-change="hoursChange"/>
-                    <label>{{ $L('小时') }}</label>
+            <div class="email-setting-placeholder"></div>
+
+            <div class="email-setting-box">
+                <h3>{{ $L('邮件通知设置') }}</h3>
+                <FormItem :label="$L('开启注册验证')" prop="reg_verify">
+                    <RadioGroup v-model="formData.reg_verify">
+                        <Radio label="open">{{ $L('开启') }}</Radio>
+                        <Radio label="close">{{ $L('关闭') }}</Radio>
+                    </RadioGroup>
+                    <div v-if="formData.reg_verify == 'open'" class="form-tip">{{$L('开启后账号需验证通过才可登录')}}</div>
                 </FormItem>
-                <FormItem :label="$L('第二次任务提醒:')" prop="task_remind_hours2">
-                    <label>{{ $L('到期后') }}</label>
-                    <InputNumber v-model="formData.task_remind_hours2" :min="0.5" :step="0.5" @on-change="hours2Change"/>
-                    <label>{{ $L('小时') }}</label>
+                <FormItem :label="$L('开启通知')" prop="notice">
+                    <RadioGroup v-model="formData.notice">
+                        <Radio label="open">{{ $L('开启') }}</Radio>
+                        <Radio label="close">{{ $L('关闭') }}</Radio>
+                    </RadioGroup>
                 </FormItem>
-            </template>
+                <template v-if="formData.notice == 'open'">
+                    <FormItem :label="$L('任务提醒:')" prop="task_remind_hours">
+                        <label>{{ $L('到期前') }}</label>
+                        <InputNumber v-model="formData.task_remind_hours" :min="0.5" :step="0.5" @on-change="hoursChange"/>
+                        <label>{{ $L('小时') }}</label>
+                    </FormItem>
+                    <FormItem :label="$L('第二次任务提醒:')" prop="task_remind_hours2">
+                        <label>{{ $L('到期后') }}</label>
+                        <InputNumber v-model="formData.task_remind_hours2" :min="0.5" :step="0.5" @on-change="hours2Change"/>
+                        <label>{{ $L('小时') }}</label>
+                    </FormItem>
+                </template>
+            </div>
         </Form>
         <div class="setting-footer">
             <Button :loading="loadIng > 0" type="primary" @click="submitForm">{{ $L('提交') }}</Button>
diff --git a/resources/assets/js/pages/manage/setting/system/setting.vue b/resources/assets/js/pages/manage/setting/components/SystemSetting.vue
similarity index 93%
rename from resources/assets/js/pages/manage/setting/system/setting.vue
rename to resources/assets/js/pages/manage/setting/components/SystemSetting.vue
index c575144ec..d1d8c0da5 100644
--- a/resources/assets/js/pages/manage/setting/system/setting.vue
+++ b/resources/assets/js/pages/manage/setting/components/SystemSetting.vue
@@ -64,12 +64,14 @@
                     <Radio label="open">{{$L('开启')}}</Radio>
                     <Radio label="close">{{$L('关闭')}}</Radio>
                 </RadioGroup>
-                <template v-if="formDatum.start_home == 'open'">
-                    <div class="form-tip">{{ $L('首页底部：首页底部网站备案号等信息') }}</div>
-                    <Input v-model="formDatum.home_footer" style="width:100%;margin-top:6px">
-                        <span slot="prepend">{{ $L('首页底部') }}</span>
-                    </Input>
-                </template>
+                <Input
+                    v-if="formDatum.start_home == 'open'"
+                    v-model="formDatum.home_footer"
+                    type="textarea"
+                    style="margin:8px 0 -8px"
+                    :rows="2"
+                    :autosize="{ minRows: 2, maxRows: 8 }"
+                    :placeholder="$L('首页底部：首页底部网站备案号等信息')"/>
             </FormItem>
         </Form>
         <div class="setting-footer">
diff --git a/resources/assets/js/pages/manage/setting/system/taskPriority.vue b/resources/assets/js/pages/manage/setting/components/SystemTaskPriority.vue
similarity index 100%
rename from resources/assets/js/pages/manage/setting/system/taskPriority.vue
rename to resources/assets/js/pages/manage/setting/components/SystemTaskPriority.vue
diff --git a/resources/assets/js/pages/manage/setting/system/index.vue b/resources/assets/js/pages/manage/setting/system.vue
similarity index 76%
rename from resources/assets/js/pages/manage/setting/system/index.vue
rename to resources/assets/js/pages/manage/setting/system.vue
index bf0fc3bcf..6d0b30c21 100644
--- a/resources/assets/js/pages/manage/setting/system/index.vue
+++ b/resources/assets/js/pages/manage/setting/system.vue
@@ -18,10 +18,10 @@
 </template>
 
 <script>
-import SystemSetting from "./setting";
-import SystemTaskPriority from "./taskPriority";
-import SystemColumnTemplate from "./columnTemplate";
-import SystemEmailSetting from "./EmailSetting";
+import SystemSetting from "./components/SystemSetting";
+import SystemTaskPriority from "./components/SystemTaskPriority";
+import SystemColumnTemplate from "./components/SystemColumnTemplate";
+import SystemEmailSetting from "./components/SystemEmailSetting";
 
 export default {
     components: {SystemColumnTemplate, SystemTaskPriority, SystemSetting, SystemEmailSetting},
diff --git a/resources/assets/js/pages/single/fileMsg.vue b/resources/assets/js/pages/single/fileMsg.vue
index 604b48132..3887e8409 100644
--- a/resources/assets/js/pages/single/fileMsg.vue
+++ b/resources/assets/js/pages/single/fileMsg.vue
@@ -58,7 +58,7 @@
 </style>
 <script>
 import Vue from 'vue'
-import Minder from '../../components/minder'
+import Minder from '../../components/Minder'
 Vue.use(Minder)
 
 const MDPreview = () => import('../../components/MDEditor/preview');
diff --git a/resources/assets/js/pages/single/fileTask.vue b/resources/assets/js/pages/single/fileTask.vue
index 6734ae195..52a200bfd 100644
--- a/resources/assets/js/pages/single/fileTask.vue
+++ b/resources/assets/js/pages/single/fileTask.vue
@@ -58,7 +58,7 @@
 </style>
 <script>
 import Vue from 'vue'
-import Minder from '../../components/minder'
+import Minder from '../../components/Minder'
 Vue.use(Minder)
 
 const MDPreview = () => import('../../components/MDEditor/preview');
diff --git a/resources/assets/js/routes.js b/resources/assets/js/routes.js
index 937f293f7..531b4bf48 100755
--- a/resources/assets/js/routes.js
+++ b/resources/assets/js/routes.js
@@ -49,7 +49,7 @@ export default [
                     {
                         name: 'manage-setting-system',
                         path: 'system',
-                        component: () => import('./pages/manage/setting/system/index.vue'),
+                        component: () => import('./pages/manage/setting/system.vue'),
                     },
                 ]
             },
diff --git a/resources/assets/sass/pages/page-setting.scss b/resources/assets/sass/pages/page-setting.scss
index 79646a632..48708d188 100755
--- a/resources/assets/sass/pages/page-setting.scss
+++ b/resources/assets/sass/pages/page-setting.scss
@@ -179,10 +179,6 @@
             display: flex;
             flex-direction: column;
             padding: 0 !important;
-            h3 {
-                font-size: 16px;
-                margin-bottom: 15px;
-            }
             .ivu-form {
                 flex: 1;
                 padding: 24px 40px;
@@ -213,6 +209,33 @@
                             .setting-footer {
                                 margin: 0 -32px;
                             }
+                            .email-setting-box {
+                                position: relative;
+                                padding: 36px 24px 4px;
+                                margin: 24px 0 12px;
+                                border-radius: 8px;
+                                border: 1px solid #eeeeee;
+                                transition: box-shadow 0.3s;
+                                &:hover {
+                                    box-shadow: 0 0 10px #e6ecfa;
+                                }
+                                h3 {
+                                    position: absolute;
+                                    top: 0;
+                                    left: 24px;
+                                    padding: 4px 10px;
+                                    border-radius: 4px;
+                                    display: inline-block;
+                                    background-color: #ffffff;
+                                    border: 1px solid #eeeeee;
+                                    font-size: 15px;
+                                    font-weight: 500;
+                                    transform: translateY(-50%);
+                                }
+                            }
+                            .email-setting-placeholder {
+                                height: 8px;
+                            }
                         }
                     }
                 }
diff --git a/resources/assets/statics/public/css/fonts/taskfont.ttf b/resources/assets/statics/public/css/fonts/taskfont.ttf
index 74ed53a0a..894a7255b 100644
Binary files a/resources/assets/statics/public/css/fonts/taskfont.ttf and b/resources/assets/statics/public/css/fonts/taskfont.ttf differ
diff --git a/resources/assets/statics/public/css/fonts/taskfont.woff b/resources/assets/statics/public/css/fonts/taskfont.woff
index 2c4203cb4..dd8d3eea2 100644
Binary files a/resources/assets/statics/public/css/fonts/taskfont.woff and b/resources/assets/statics/public/css/fonts/taskfont.woff differ
diff --git a/resources/assets/statics/public/css/fonts/taskfont.woff2 b/resources/assets/statics/public/css/fonts/taskfont.woff2
index 00a5062fa..f83819f67 100644
Binary files a/resources/assets/statics/public/css/fonts/taskfont.woff2 and b/resources/assets/statics/public/css/fonts/taskfont.woff2 differ