zhouchijian
/
fe-drone-ci
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge master

This commit is contained in:
Pan 2019-03-06 18:39:16 +08:00
parent cbc77c9a93 fc9e7249e7
commit 5508f05132
6 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -7,7 +7,7 @@
<img src="https://img.shields.io/badge/vue-2.5.17-brightgreen.svg" alt="vue"> <img src="https://img.shields.io/badge/vue-2.5.17-brightgreen.svg" alt="vue">
</a> </a>
<a href="https://github.com/ElemeFE/element"> <a href="https://github.com/ElemeFE/element">
<img src="https://img.shields.io/badge/element--ui-2.4.6-brightgreen.svg" alt="element-ui"> <img src="https://img.shields.io/badge/element--ui-2.4.11-brightgreen.svg" alt="element-ui">
</a> </a>
<a href="https://travis-ci.org/PanJiaChen/vue-element-admin" rel="nofollow"> <a href="https://travis-ci.org/PanJiaChen/vue-element-admin" rel="nofollow">
<img src="https://travis-ci.org/PanJiaChen/vue-element-admin.svg?branch=master" alt="Build Status"> <img src="https://travis-ci.org/PanJiaChen/vue-element-admin.svg?branch=master" alt="Build Status">

2
README.zh-CN.md
View File

@ -7,7 +7,7 @@
<img src="https://img.shields.io/badge/vue-2.5.10-brightgreen.svg" alt="vue"> <img src="https://img.shields.io/badge/vue-2.5.10-brightgreen.svg" alt="vue">
</a> </a>
<a href="https://github.com/ElemeFE/element"> <a href="https://github.com/ElemeFE/element">
<img src="https://img.shields.io/badge/element--ui-2.3.2-brightgreen.svg" alt="element-ui"> <img src="https://img.shields.io/badge/element--ui-2.4.11-brightgreen.svg" alt="element-ui">
</a> </a>
<a href="https://travis-ci.org/PanJiaChen/vue-element-admin" rel="nofollow"> <a href="https://travis-ci.org/PanJiaChen/vue-element-admin" rel="nofollow">
<img src="https://travis-ci.org/PanJiaChen/vue-element-admin.svg?branch=master" alt="Build Status"> <img src="https://travis-ci.org/PanJiaChen/vue-element-admin.svg?branch=master" alt="Build Status">

1
src/components/Tinymce/index.vue
View File

@ -185,6 +185,7 @@ export default {
<style scoped> <style scoped>
.tinymce-container { .tinymce-container {
position: relative; position: relative;
line-height: normal;
} }
.tinymce-container>>>.mce-fullscreen { .tinymce-container>>>.mce-fullscreen {
z-index: 10000; z-index: 10000;

2
src/components/Tinymce/plugins.js
View File

@ -2,6 +2,6 @@
// Detail plugins list see https://www.tinymce.com/docs/plugins/ // Detail plugins list see https://www.tinymce.com/docs/plugins/
// Custom builds see https://www.tinymce.com/download/custom-builds/ // Custom builds see https://www.tinymce.com/download/custom-builds/
const plugins = ['advlist anchor autolink autosave code codesample colorpicker colorpicker contextmenu directionality emoticons fullscreen hr image imagetools importcss insertdatetime link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus table template textcolor textpattern visualblocks visualchars wordcount'] const plugins = ['advlist anchor autolink autosave code codesample colorpicker colorpicker contextmenu directionality emoticons fullscreen hr image imagetools insertdatetime link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus table template textcolor textpattern visualblocks visualchars wordcount']
export default plugins export default plugins

19
src/views/example/components/ArticleDetail.vue
View File

@ -60,13 +60,13 @@
<span v-show="contentShortLength" class="word-counter">{{ contentShortLength }}字</span> <span v-show="contentShortLength" class="word-counter">{{ contentShortLength }}字</span>
</el-form-item> </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" /> <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" /> <Upload v-model="postForm.image_uri" />
</div> </el-form-item>
</div> </div>
</el-form> </el-form>
@ -247,17 +247,6 @@ export default {
float: left; 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 { .word-counter {
width: 40px; width: 40px;

4
src/views/layout/components/Navbar.vue
View File

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