merge master

src/views/example/components/ArticleDetail.vue

@@ -60,13 +60,13 @@
           <span v-show="contentShortLength" class="word-counter">{{ contentShortLength }}字</span>
         </el-form-item>
 
-        <div class="editor-container">
+        <el-form-item prop="content" style="margin-bottom: 30px;">
           <Tinymce ref="editor" :height="400" v-model="postForm.content" />
-        </div>
+        </el-form-item>
 
-        <div style="margin-bottom: 20px;">
+        <el-form-item prop="image_uri" style="margin-bottom: 30px;">
           <Upload v-model="postForm.image_uri" />
-        </div>
+        </el-form-item>
       </div>
     </el-form>
 
@@ -247,17 +247,6 @@ export default {
         float: left;
       }
     }
-    .editor-container {
-      min-height: 500px;
-      margin: 0 0 30px;
-      .editor-upload-btn-container {
-        text-align: right;
-        margin-right: 10px;
-        .editor-upload-btn {
-          display: inline-block;
-        }
-      }
-    }
   }
   .word-counter {
     width: 40px;

src/views/layout/components/Navbar.vue

@@ -150,15 +150,15 @@ export default {
       .avatar-wrapper {
         margin-top: 5px;
         position: relative;
-        line-height: initial;
-        cursor: pointer;
         .user-avatar {
+          cursor: pointer;
           width: 40px;
           height: 40px;
           border-radius: 10px;
         }
 
         .el-icon-caret-bottom {
+          cursor: pointer;
           position: absolute;
           right: -20px;
           top: 25px;