'
+ offset: [offset.top + 37 - ME.doc.scrollTop()],
+ content: '
'
+ '
'
+ ' __ __ _____ _ _ _\n'
+ '| \\/ | ____|__| (_) |_ ___ _ __\n'
diff --git a/js/lib/meditor/main.js b/js/lib/meditor/main.js
index 33a8fbe..33789c5 100644
--- a/js/lib/meditor/main.js
+++ b/js/lib/meditor/main.js
@@ -22,7 +22,7 @@ define([
})
var editorVM = []
- yua.ui.meditor = '0.0.1'
+ yua.ui.meditor = '1.0.0'
//存放编辑器公共静态资源
window.ME = {
version: yua.ui.meditor,
@@ -141,7 +141,7 @@ define([
return vm.$htmlTxt
},
setVal: function(txt){
- vm.plainTxt = txt
+ vm.plainTxt = txt || ''
},
show: function(){
vm.editorVisible = true
@@ -152,7 +152,8 @@ define([
}
}
return null
- }
+ },
+ doc: yua(document)
}
//获取真实的引用路径,避免因为不同的目录结构导致加载失败的情况
for(var i in yua.modules){
@@ -224,7 +225,10 @@ define([
return new RegExp(exp, 'gi')
}
function html2md(str){
- str = decodeURIComponent(str).replace(/\t/g, ' ').replace(/]*>/, '')
+ try{
+ str = decodeURIComponent(str)
+ }catch(err){}
+ str = str.replace(/\t/g, ' ').replace(/]*>/, '')
for(var i in elems){
var cb = elems[i],
@@ -294,7 +298,7 @@ define([
function tool(name){
name = (name + '').trim().toLowerCase()
name = '|' === name ? 'pipe' : name
- return ''
}
@@ -302,14 +306,11 @@ define([
yua.component('meditor', {
- $template: ''
- + '
{toolbar}
'
- + '
'
- + ''
- + '
'
- + '
'
+ $template: '
'
+ + '
{toolbar}
'
+ + '
'
+ + '
'
+ '
',
$$template: function(txt){
@@ -335,7 +336,6 @@ define([
return base
},
$init: function(vm){
-
vm.$watch('plainTxt', function(val){
vm.$compile()
//只有开启实时预览,才会赋值给htmlTxt
@@ -368,8 +368,9 @@ define([
vm.plainTxt = this.value
}
},
- $ready: function(vm){
- vm.$editor = document.querySelector('#' + vm.$id)
+ $ready: function(vm, elem){
+
+ vm.$editor = elem.children[1]
editorVM.push(vm)
//自动加载额外的插件
@@ -407,9 +408,11 @@ define([
$paste: yua.noop,
$compile: function(){
var txt = this.plainTxt.trim()
- txt = txt.replace(/
]*?)>/g, '<script$1>')
- .replace(/<\/script>/g, '</script>')
-
+
+ if(this.$safelyCompile){
+ txt = txt.replace(/]*?)>/g, '<script$1>')
+ .replace(/<\/script>/g, '</script>')
+ }
//只解析,不渲染
this.$htmlTxt = marked(txt)
},
@@ -417,6 +420,7 @@ define([
$onSuccess: yua.noop,
$onUpdate: yua.noop,
$onFullscreen: yua.noop,
+ $safelyCompile: true,
disabled: false, //禁用编辑器
fullscreen: false, //是否全屏
preview: false, //是否显示预览
diff --git a/js/lib/meditor/skin/iconfont.eot b/js/lib/meditor/skin/iconfont.eot
deleted file mode 100644
index 3bbb99b..0000000
Binary files a/js/lib/meditor/skin/iconfont.eot and /dev/null differ
diff --git a/js/lib/meditor/skin/iconfont.ttf b/js/lib/meditor/skin/iconfont.ttf
deleted file mode 100644
index 5e6a583..0000000
Binary files a/js/lib/meditor/skin/iconfont.ttf and /dev/null differ
diff --git a/js/lib/meditor/skin/main.css b/js/lib/meditor/skin/main.css
index 159fab6..a9dc674 100644
--- a/js/lib/meditor/skin/main.css
+++ b/js/lib/meditor/skin/main.css
@@ -1,154 +1 @@
-@charset "UTF-8";
-/**
- *
- * @authors yutent (yutent@doui.cc)
- * @date 2017-04-17 16:43:22
- *
- */
-
-@font-face {font-family: "edicon";
- src: url('iconfont.eot'); /* IE9*/
- src: url('iconfont.ttf') format('truetype'); /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
-}
-
-::-webkit-scrollbar {width:5px;height:5px;background:#ebeeec;}
-::-webkit-scrollbar:hover {background:rgba(0,0,0,.05);}
-::-webkit-scrollbar-button {display:none;}
-::-webkit-scrollbar-thumb {background:#cad5d5;}
-::-webkit-scrollbar-thumb:hover {background:#9bacac;}
-
-.do-meditor {position:relative;width:100%;height:100%;min-height:180px;padding-top:43px;border:1px solid #ddd;background:#fff;color:#666;}
-.meditor-font {font-family:"PingFang SC","Helvetica Neue","Hiragino Sans GB","Segoe UI","Microsoft YaHei",sans-serif;}
-
-
-
-
-/* 关于编辑器模块*/
-.do-meditor-about {width:400px;padding:10px 20px;}
-.do-meditor-about pre {padding-bottom:15px;line-height:1;}
-.do-meditor-about a {color:#049789}
-.do-meditor-about p {margin:0 auto 5px;}
-
-/*表格模块*/
-
-.do-meditor-table {width:270px;height:270px;padding:10px;}
-.do-meditor-table li {width:100%;height:25px;}
-.do-meditor-table li span {float:left;width:25px;height:25px;border:2px solid #fff;background:#f2f2f2;}
-.do-meditor-table li span.active {background:rgba(4,151,137,.2);}
-
-
-/*表情模块*/
-.do-meditor-face {float:left;;width:241px;height:241px;margin:10px;border-top:1px solid #e2e2e2;border-left:1px solid #e2e2e2;}
-.do-meditor-face li {float:left;width:40px;height:40px;padding:8px;border:1px solid #e2e2e2;border-top:0;border-left:0}
-.do-meditor-face li img {width:100%;}
-.do-meditor-face li:hover img {-webkit-transform:scale(3);-moz-transform:scale(3);-ms-transform:scale(3);transform:scale(3);}
-
-
-/*段落模块*/
-.do-meditor-h1 {width:150px;height:auto;padding:5px 0;}
-.do-meditor-h1 li {width:100%;height:auto;padding:0 10px;line-height:1.5;font-size:18px;cursor:default;}
-.do-meditor-h1 li:hover {background:#f2f2f2;}
-.do-meditor-h1 li::before {font-family:"edicon" !important;-webkit-font-smoothing: antialiased;-webkit-text-stroke-width: 0.2px;-moz-osx-font-smoothing: grayscale;}
-.do-meditor-h1 li.h1 {font-size:23px;}
-.do-meditor-h1 li.h2 {font-size:21px;}
-.do-meditor-h1 li.h1::before {content:"\e611 "}
-.do-meditor-h1 li.h2::before {content:"\e60d "}
-.do-meditor-h1 li.h3::before {content:"\e60e "}
-.do-meditor-h1 li.h4::before {content:"\e60f "}
-.do-meditor-h1 li.h5::before {content:"\e610 "}
-.do-meditor-h1 li.h6::before {content:"\e60c "}
-
-
-/*通用输入模块, 链接/图片插入/文件插入/代码块插入*/
-.do-meditor-common {width:360px;height:auto;padding:15px 20px;}
-.do-meditor-common section {width:100%;height: 35px;margin:10px 0;line-height:35px;}
-.do-meditor-common section .label {float: left;width:30%;text-align:center;background:#ddd;}
-.do-meditor-common section label {float: left;width:50%;}
-.do-meditor-common section .input {float: left;width:70%;height:35px;padding:0 8px;border:1px solid #ddd;border-left:0;background:#fff;color:#666;}
-.do-meditor-common section .submit {float:right;width:30%;height:35px;background:#ddd;color:#666;text-align:center;}
-
-
-.do-meditor-codeblock {width:780px;height:auto;padding:15px 20px;background:#fafafa;}
-.do-meditor-codeblock section {display:block;width:100%;height:auto;margin:10px 0;line-height:35px;}
-.do-meditor-codeblock section::after {visibility: hidden;overflow:hidden; display: block;height: 0;content: "."; clear: both;}
-.do-meditor-codeblock section .label {float: left;width:80px;}
-.do-meditor-codeblock section select {float:left;width:200px;height:35px;border:1px solid #ddd;border-radius:5px;background:#fff}
-.do-meditor-codeblock section textarea {width:100%;height:300px;padding:5px 10px;border:1px solid #ddd;background:#fff;resize:none;}
-.do-meditor-codeblock section .submit {float:right;width:80px;height:35px;background:#ddd;color:#666;text-align:center;}
-
-
-
-
-.do-meditor .tool-bar {overflow:hidden;position:absolute;top:0;left:0;z-index:99;width:100%;height:43px;padding:5px 10px;border-bottom:1px solid #ddd;background:#f5f5f5;color:#666;}
-.do-meditor .tool-bar .edicon {display:inline-block;width:30px;height:32px;text-align:center;font:20px/32px "edicon" !important;-webkit-font-smoothing: antialiased;-webkit-text-stroke-width: 0.2px;-moz-osx-font-smoothing: grayscale;}
-.do-meditor .tool-bar .edicon:hover {background:#e5e5e5;}
-.do-meditor .tool-bar .icon-pipe {width:20px;}
-.do-meditor .tool-bar .icon-pipe:hover {background:none;}
-.do-meditor .tool-bar .icon-pipe::before {content:"\e612"}
-.do-meditor .tool-bar .icon-h1::before {content:"\e611"}
-.do-meditor .tool-bar .icon-bold::before {content:"\e615"}
-.do-meditor .tool-bar .icon-italic::before {content:"\e61d"}
-.do-meditor .tool-bar .icon-through::before {content:"\e604"}
-.do-meditor .tool-bar .icon-link::before {content:"\e606"}
-.do-meditor .tool-bar .icon-inlinecode::before {content:"\e61e"}
-.do-meditor .tool-bar .icon-blockcode::before {content:"\e617"}
-.do-meditor .tool-bar .icon-quote::before {content:"\e607"}
-.do-meditor .tool-bar .icon-hr::before {content:"\e619"}
-.do-meditor .tool-bar .icon-time::before {content:"\e61a"}
-.do-meditor .tool-bar .icon-face::before {content:"\e616"}
-.do-meditor .tool-bar .icon-image::before {content:"\e61b"}
-.do-meditor .tool-bar .icon-file::before {content:"\e603"}
-.do-meditor .tool-bar .icon-preview::before {content:"\e60a"}
-.do-meditor .tool-bar .icon-fullscreen::before {content:"\e608"}
-.do-meditor .tool-bar .icon-table::before {content:"\e601"}
-.do-meditor .tool-bar .icon-ordered::before {content:"\e61c"}
-.do-meditor .tool-bar .icon-unordered::before {content:"\e618"}
-.do-meditor .tool-bar .icon-about::before {content:"\e613"}
-.do-meditor .tool-bar .icon-help::before {content:"\e614"}
-
-
-.do-meditor .editor-body {float:left;width:100%;height:100%;background:#fff;}
-.do-meditor .editor-body>textarea {overflow:hidden;overflow-y:auto;width:100%;height:100%;padding:5px;border:0;outline:none;resize:none;color:#666;background:none;}
-.do-meditor .md-preview {float:right;overflow:hidden;overflow-y:auto;display:block;width:50%;height:100%;padding:10px;line-height:2;border-left:1px solid #ddd;color:#666;font-size:14px;background:#fff;}
-
-
-.do-meditor .md-preview .md-hd {position:relative;margin:15px 0;padding-left:30px;font-weight:normal;font-size:17px;}
-.do-meditor .md-preview h1.md-hd {padding-left:0;}
-.do-meditor .md-preview .md-hd a {position:relative;display:inline-block;padding:0 8px;background:#fff;color:#454545}
-.do-meditor .md-preview .md-hd a:hover {text-decoration:none;}
-.do-meditor .md-preview h1.md-hd a {padding-left:0;color:#000;}
-.do-meditor .md-preview h2.md-hd a {color:#000;}
-
-.do-meditor .md-preview h1.md-hd {margin:0 0 30px;font-size:25px;}
-.do-meditor .md-preview h2.md-hd {margin:20px 0;font-size:23px;}
-.do-meditor .md-preview h3.md-hd {margin:20px 0 15px;font-size:20px;}
-.do-meditor .md-preview h1:after {display:block;width:100%;content:" ";border-bottom:1px solid #ddd;}
-.do-meditor .md-preview h2:before,
-.do-meditor .md-preview h3:before,
-.do-meditor .md-preview h4:before,
-.do-meditor .md-preview h5:before,
-.do-meditor .md-preview h6:before {display:block;position:absolute;left:0;top:50%;width:100%;content:" ";border-bottom:1px solid #ddd;}
-
-.do-meditor .md-preview a {text-decoration:none;}
-.do-meditor .md-preview a:hover {text-decoration:underline;}
-.do-meditor .md-preview p {margin:15px 0;}
-.do-meditor .md-preview blockquote {margin:10px 0;padding:5px 10px;border-left:5px solid #6bb294;background:#f7f7f7}
-.do-meditor .md-preview blockquote p {margin:0;}
-.do-meditor .md-preview table thead tr {background:#f2f2f2}
-.do-meditor .md-preview table thead th {padding:0 8px;border:1px solid #ddd}
-.do-meditor .md-preview table tbody td {padding:0 8px;border:1px solid #ddd}
-
-.do-meditor .md-preview hr {margin:30px 0;border-bottom:0;}
-.do-meditor .md-preview ol {margin-left:2em;list-style:decimal outside none;}
-.do-meditor .md-preview ul {margin-left:2em;list-style:disc outside none;}
-.do-meditor .md-preview li ol {margin-left:2em;}
-.do-meditor .md-preview li ul {margin-left:2em;list-style-type: circle;}
-.do-meditor .md-preview li ol ul,
-.do-meditor .md-preview li ul ul {list-style-type: square;}
-
-
-/*全屏模式*/
-.do-meditor.fullscreen {position:fixed;left:0;top:0;z-index:999;}
-
-.do-meditor.preview .editor-body,
-.do-meditor.fullscreen .editor-body {width:50%}
+::-webkit-scrollbar{width:5px;height:5px;background:#ebeeec}::-webkit-scrollbar:hover{background:rgba(0,0,0,0.05)}::-webkit-scrollbar-button{display:none}::-webkit-scrollbar-thumb{background:#1abc9c}::-webkit-scrollbar-thumb:hover{background:#16a085}.do-meditor{position:relative;width:100%;height:100%;min-height:180px;padding-top:43px;border:1px solid #ddd;background:#fff;color:#666}.do-meditor-font{font-family:"PingFang SC","Helvetica Neue","Hiragino Sans GB","Segoe UI","Microsoft YaHei",sans-serif}.do-meditor-about{width:400px;padding:10px 20px}.do-meditor-about pre{width:100%;padding-bottom:15px;line-height:1;font-size:14px}.do-meditor-about a{color:#049789}.do-meditor-about p{margin:0 auto 5px}.do-meditor-table{width:270px;height:270px;padding:10px}.do-meditor-table li{width:100%;height:25px}.do-meditor-table li span{float:left;width:25px;height:25px;border:2px solid #fff;background:#f2f2f2}.do-meditor-table li span.active{background:rgba(4,151,137,0.2)}.do-meditor-face{float:left;width:241px;height:241px;margin:10px;border-top:1px solid #e2e2e2;border-left:1px solid #e2e2e2}.do-meditor-face li{float:left;width:40px;height:40px;padding:8px;border:1px solid #e2e2e2;border-top:0;border-left:0}.do-meditor-face li img{width:100%;transition:all .1s ease-in-out}.do-meditor-face li:hover img{-webkit-transform:scale(3);-moz-transform:scale(3);-ms-transform:scale(3);transform:scale(3)}.do-meditor-h1{width:150px;height:auto;padding:5px 0}.do-meditor-h1 li{width:100%;height:auto;padding:0 10px;line-height:1.5;font-size:18px;cursor:default}.do-meditor-h1 li:hover{background:#f2f2f2}.do-meditor-h1 li::before{font-family:"ui font" !important;-webkit-font-smoothing:antialiased;-webkit-text-stroke-width:0.2px;-moz-osx-font-smoothing:grayscale}.do-meditor-h1 li.h1{font-size:23px}.do-meditor-h1 li.h2{font-size:21px}.do-meditor-h1 li.h1::before{content:"\e62b "}.do-meditor-h1 li.h2::before{content:"\e625 "}.do-meditor-h1 li.h3::before{content:"\e626 "}.do-meditor-h1 li.h4::before{content:"\e629 "}.do-meditor-h1 li.h5::before{content:"\e62a "}.do-meditor-h1 li.h6::before{content:"\e624 "}.do-meditor-common{width:360px;height:auto;padding:15px 20px}.do-meditor-common section{width:100%;height:35px;margin:10px 0;line-height:35px}.do-meditor-common section.input{line-height:33px;border:1px solid #e9e9e9}.do-meditor-common section .label{float:left;width:30%;text-align:center;background:#f7f7f7}.do-meditor-common section label{float:left;width:50%}.do-meditor-common section .txt{float:left;width:70%;height:33px;padding:0 8px;border:0;border-left:1px solid #e9e9e9;background:#fff;color:#666}.do-meditor-common section .submit{float:right;width:30%;height:35px;background:#ddd;color:#666;text-align:center}.do-meditor-codeblock{width:780px;height:auto;padding:15px 20px;background:#fafafa}.do-meditor-codeblock section{display:block;width:100%;height:auto;margin:10px 0;line-height:35px}.do-meditor-codeblock section .label{float:left;width:80px}.do-meditor-codeblock section select{float:left;width:200px;height:35px;padding:0 30px 0 10px;border:0;border-bottom:1px solid #e7e7e7;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAMCAMAAABV0m3JAAAADFBMVEUAAAD///+Pj4+JiYkxcGihAAAABHRSTlMAABBwqVQF9wAAADNJREFUeNqlzjEOACAMw8DQ/v/PSE5FFhaEx5usdekBuzRVH0RtCqJYELUFrVjQigX/5jdvzgDh9izlMQAAAABJRU5ErkJggg==) no-repeat right 8px;color:#546e7a;outline:none;-webkit-appearance:none;-moz-appearance:none;transition:all .1s ease-in-out}.do-meditor-codeblock section select::-ms-expand{display:none}.do-meditor-codeblock section select:focus{border-color:#1abc9c}.do-meditor-codeblock section textarea{width:100%;height:300px;padding:5px 10px;border:1px solid #ddd;background:#fff;resize:none;outline:none}.do-meditor-codeblock section .submit{float:right;width:80px;height:35px;background:#ddd;color:#666;text-align:center}.do-meditor .tool-bar{overflow:hidden;position:absolute;top:0;left:0;z-index:99;width:100%;height:43px;padding:5px 10px;border-bottom:1px solid #ddd;background:#f5f5f5;color:#666}.do-meditor .tool-bar span{display:inline-block;width:30px;height:32px;line-height:32px;text-align:center;font-size:20px}.do-meditor .tool-bar span:hover{background:#e5e5e5}.do-meditor .tool-bar .icon-pipe{width:20px}.do-meditor .tool-bar .icon-pipe:hover{background:none}.do-meditor .tool-bar .icon-pipe::before{content:"\e62c"}.do-meditor .tool-bar .icon-h1::before{content:"\e62b"}.do-meditor .tool-bar .icon-bold::before{content:"\e62f"}.do-meditor .tool-bar .icon-italic::before{content:"\e639"}.do-meditor .tool-bar .icon-through::before{content:"\e619"}.do-meditor .tool-bar .icon-link::before{content:"\e61c"}.do-meditor .tool-bar .icon-inlinecode::before{content:"\e63a"}.do-meditor .tool-bar .icon-blockcode::before{content:"\e632"}.do-meditor .tool-bar .icon-quote::before{content:"\e61b"}.do-meditor .tool-bar .icon-hr::before{content:"\e614"}.do-meditor .tool-bar .icon-time::before{content:"\e636"}.do-meditor .tool-bar .icon-face::before{content:"\e630"}.do-meditor .tool-bar .icon-image::before{content:"\e637"}.do-meditor .tool-bar .icon-file::before{content:"\e618"}.do-meditor .tool-bar .icon-preview::before{content:"\e61f"}.do-meditor .tool-bar .icon-fullscreen::before{content:"\e621"}.do-meditor .tool-bar .icon-table::before{content:"\e617"}.do-meditor .tool-bar .icon-ordered::before{content:"\e638"}.do-meditor .tool-bar .icon-unordered::before{content:"\e633"}.do-meditor .tool-bar .icon-about::before{content:"\e700"}.do-meditor .editor-body{overflow:hidden;overflow-y:auto;float:left;width:100%;height:100%;padding:5px 5px 50px;border:0;outline:none;resize:none;color:#666;background:#fff}.do-meditor .md-preview{float:right;overflow:hidden;overflow-y:auto;display:block;width:50%;height:100%;padding:10px 10px 50px;line-height:2;border-left:1px solid #ddd;color:#666;font-size:14px;background:#fff}.do-meditor.fullscreen{position:fixed;left:0;top:0;z-index:999}.do-meditor.preview .editor-body{width:50%}
diff --git a/js/lib/meditor/skin/main.scss b/js/lib/meditor/skin/main.scss
new file mode 100644
index 0000000..a2c683e
--- /dev/null
+++ b/js/lib/meditor/skin/main.scss
@@ -0,0 +1,133 @@
+@charset "UTF-8";
+/**
+ *
+ * @authors yutent (yutent@doui.cc)
+ * @date 2017-04-17 16:43:22
+ *
+ */
+
+@import "../../../../css/var.scss";
+
+::-webkit-scrollbar {width:5px;height:5px;background:#ebeeec;}
+::-webkit-scrollbar:hover {background:rgba(0,0,0,.05);}
+::-webkit-scrollbar-button {display:none;}
+::-webkit-scrollbar-thumb {background:nth($ct, 1);}
+::-webkit-scrollbar-thumb:hover {background:nth($ct, 3);}
+
+.do-meditor {position:relative;width:100%;height:100%;min-height:180px;padding-top:43px;border:1px solid #ddd;background:#fff;color:#666;}
+.do-meditor-font {font-family:"PingFang SC","Helvetica Neue","Hiragino Sans GB","Segoe UI","Microsoft YaHei",sans-serif;}
+
+
+
+
+/* 关于编辑器模块*/
+.do-meditor-about {width:400px;padding:10px 20px;
+ pre {width:100%;padding-bottom:15px;line-height:1;font-size:14px;}
+ a {color:#049789}
+ p {margin:0 auto 5px;}
+}
+
+/*表格模块*/
+
+.do-meditor-table {width:270px;height:270px;padding:10px;
+ li {width:100%;height:25px;
+ span {float:left;width:25px;height:25px;border:2px solid #fff;background:#f2f2f2;}
+ span.active {background:rgba(4,151,137,.2);}
+ }
+}
+
+/*表情模块*/
+.do-meditor-face {float:left;;width:241px;height:241px;margin:10px;border-top:1px solid #e2e2e2;border-left:1px solid #e2e2e2;
+
+ li {float:left;width:40px;height:40px;padding:8px;border:1px solid #e2e2e2;border-top:0;border-left:0}
+ li img {width:100%;@include ts();}
+ li:hover img {-webkit-transform:scale(3);-moz-transform:scale(3);-ms-transform:scale(3);transform:scale(3);}
+}
+
+
+/*段落模块*/
+.do-meditor-h1 {width:150px;height:auto;padding:5px 0;
+
+ li {width:100%;height:auto;padding:0 10px;line-height:1.5;font-size:18px;cursor:default;}
+ li:hover {background:#f2f2f2;}
+ li::before {font-family:"ui font" !important;-webkit-font-smoothing: antialiased;-webkit-text-stroke-width: 0.2px;-moz-osx-font-smoothing: grayscale;}
+ li.h1 {font-size:23px;}
+ li.h2 {font-size:21px;}
+ li.h1::before {content:"\e62b "}
+ li.h2::before {content:"\e625 "}
+ li.h3::before {content:"\e626 "}
+ li.h4::before {content:"\e629 "}
+ li.h5::before {content:"\e62a "}
+ li.h6::before {content:"\e624 "}
+}
+
+/*通用输入模块, 链接/图片插入/文件插入/代码块插入*/
+.do-meditor-common {width:360px;height:auto;padding:15px 20px;
+ section {width:100%;height: 35px;margin:10px 0;line-height:35px;
+
+ &.input {line-height:33px;border:1px solid #e9e9e9;}
+ .label {float: left;width:30%;text-align:center;background:#f7f7f7;}
+ label {float: left;width:50%;}
+ .txt {float: left;width:70%;height:33px;padding:0 8px;border:0;border-left:1px solid #e9e9e9;background:#fff;color:#666;}
+ .submit {float:right;width:30%;height:35px;background:#ddd;color:#666;text-align:center;}
+ }
+}
+
+.do-meditor-codeblock {width:780px;height:auto;padding:15px 20px;background:#fafafa;
+ section {display:block;width:100%;height:auto;margin:10px 0;line-height:35px;
+
+ .label {float: left;width:80px;}
+ select {float:left;width:200px;height:35px;padding:0 30px 0 10px;border:0;border-bottom:1px solid #e7e7e7;background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAMCAMAAABV0m3JAAAADFBMVEUAAAD///+Pj4+JiYkxcGihAAAABHRSTlMAABBwqVQF9wAAADNJREFUeNqlzjEOACAMw8DQ/v/PSE5FFhaEx5usdekBuzRVH0RtCqJYELUFrVjQigX/5jdvzgDh9izlMQAAAABJRU5ErkJggg==) no-repeat right 8px;color:nth($cgr, 1);outline:none;-webkit-appearance:none;-moz-appearance: none;@include ts;
+
+ &::-ms-expand {display:none;}
+
+ &:focus {border-color:nth($ct, 1);}
+ }
+ textarea {width:100%;height:300px;padding:5px 10px;border:1px solid #ddd;background:#fff;resize:none;outline:none;}
+ .submit {float:right;width:80px;height:35px;background:#ddd;color:#666;text-align:center;}
+ }
+}
+
+
+
+
+.do-meditor {
+ .tool-bar {overflow:hidden;position:absolute;top:0;left:0;z-index:99;width:100%;height:43px;padding:5px 10px;border-bottom:1px solid #ddd;background:#f5f5f5;color:#666;
+
+ span {display:inline-block;width:30px;height:32px;line-height:32px;text-align:center;font-size:20px;}
+ span:hover {background:#e5e5e5;}
+ .icon-pipe {width:20px;}
+ .icon-pipe:hover {background:none;}
+ .icon-pipe::before {content:"\e62c"}
+ .icon-h1::before {content:"\e62b"}
+ .icon-bold::before {content:"\e62f"}
+ .icon-italic::before {content:"\e639"}
+ .icon-through::before {content:"\e619"}
+ .icon-link::before {content:"\e61c"}
+ .icon-inlinecode::before {content:"\e63a"}
+ .icon-blockcode::before {content:"\e632"}
+ .icon-quote::before {content:"\e61b"}
+ .icon-hr::before {content:"\e614"}
+ .icon-time::before {content:"\e636"}
+ .icon-face::before {content:"\e630"}
+ .icon-image::before {content:"\e637"}
+ .icon-file::before {content:"\e618"}
+ .icon-preview::before {content:"\e61f"}
+ .icon-fullscreen::before {content:"\e621"}
+ .icon-table::before {content:"\e617"}
+ .icon-ordered::before {content:"\e638"}
+ .icon-unordered::before {content:"\e633"}
+ .icon-about::before {content:"\e700"}
+ }
+
+ .editor-body{overflow:hidden;overflow-y:auto;float:left;width:100%;height:100%;padding:5px 5px 50px;border:0;outline:none;resize:none;color:#666;background:#fff;}
+ .md-preview {float:right;overflow:hidden;overflow-y:auto;display:block;width:50%;height:100%;padding:10px 10px 50px;line-height:2;border-left:1px solid #ddd;color:#666;font-size:14px;background:#fff;}
+
+
+
+ /*全屏模式*/
+ &.fullscreen {position:fixed;left:0;top:0;z-index:999;}
+
+ &.preview .editor-body {width:50%}
+
+}
\ No newline at end of file
diff --git a/js/lib/pages/main.css b/js/lib/pages/main.css
index 954ffe4..b0622df 100644
--- a/js/lib/pages/main.css
+++ b/js/lib/pages/main.css
@@ -1 +1 @@
-.do-pages{height:auto;text-align:center;font-size:13px}.do-pages a{display:inline-block;width:auto;min-width:40px;height:40px;line-height:40px;color:#34495e;text-decoration:none;cursor:pointer}.do-pages a.curr,.do-pages a.disabled{cursor:default}.do-pages.skin-1{width:100%}.do-pages.skin-1 a.normal,.do-pages.skin-1 a.disabled,.do-pages.skin-1 a.curr{padding:0 10px;margin:0 3px}.do-pages.skin-1 a.curr{font-weight:bold;font-size:15px}.do-pages.skin-1 a.disabled{min-width:0;padding:0}.do-pages.skin-1 .input-box,.do-pages.skin-1 .input-box span,.do-pages.skin-1 .input-box input{display:inline-block}.do-pages.skin-1 .input-box input{width:25px;height:20px;padding:0 3px;background:#fff;border:1px solid #ddd}.do-pages.skin-1 .input-box a.normal{height:30px;line-height:30px}.do-pages.skin-2{float:right;width:auto}.do-pages.skin-2 a.normal,.do-pages.skin-2 a.disabled,.do-pages.skin-2 a.curr{float:left;margin:0;padding:0 5px;color:#fff}.do-pages.skin-2 a.disabled{display:none}.do-pages.skin-2 .input-box{display:none}.do-pages.plain a.normal{background:#e7e8eb}.do-pages.plain a.normal:hover{background:#ecf0f1}.do-pages.skin-2.plain a.curr,.do-pages.plain a.normal:active{background:#bdc3c7}.do-pages.grey a.normal{background:#34495e;color:#fff}.do-pages.grey a.normal:hover{background:#5d6d7e}.do-pages.skin-2.grey a.curr,.do-pages.grey a.normal:active{background:#2c3e50}.do-pages.red a.normal{background:#e74c3c;color:#fff}.do-pages.red a.normal:hover{background:#ec7063}.do-pages.skin-2.red a.curr,.do-pages.red a.normal:active{background:#c54133}.do-pages.orange a.normal{background:#f39c12;color:#fff}.do-pages.orange a.normal:hover{background:#fbbb56}.do-pages.skin-2.orange a.curr,.do-pages.orange a.normal:active{background:#e67e22}.do-pages.green a.normal{background:#1abc9c;color:#fff}.do-pages.green a.normal:hover{background:#48c9b0}.do-pages.skin-2.green a.curr,.do-pages.green a.normal:active{background:#16a085}.do-pages.blue a.normal{background:#3498db;color:#fff}.do-pages.blue a.normal:hover{background:#5dade2}.do-pages.skin-2.blue a.curr,.do-pages.blue a.normal:active{background:#2c81ba}
+.do-pages{height:auto;text-align:center;font-size:13px}.do-pages a{display:inline-block;width:auto;min-width:40px;height:40px;line-height:40px;color:#546e7a;text-decoration:none;cursor:pointer}.do-pages a.curr,.do-pages a.disabled{cursor:default}.do-pages.skin-1{width:100%}.do-pages.skin-1 a.normal,.do-pages.skin-1 a.disabled,.do-pages.skin-1 a.curr{padding:0 10px;margin:0 3px}.do-pages.skin-1 a.curr{font-weight:bold;font-size:15px}.do-pages.skin-1 a.disabled{min-width:0;padding:0}.do-pages.skin-1 .input-box,.do-pages.skin-1 .input-box span,.do-pages.skin-1 .input-box input{display:inline-block}.do-pages.skin-1 .input-box input{width:25px;height:20px;padding:0 3px;background:#fff;border:1px solid #ddd}.do-pages.skin-1 .input-box a.normal{height:30px;line-height:30px}.do-pages.skin-2{float:right;width:auto}.do-pages.skin-2 a.normal,.do-pages.skin-2 a.disabled,.do-pages.skin-2 a.curr{float:left;margin:0;padding:0 5px;color:#fff}.do-pages.skin-2 a.disabled{display:none}.do-pages.skin-2 .input-box{display:none}.do-pages.plain a.normal{background:#e7e8eb}.do-pages.plain a.normal:hover{background:#ecf0f1}.do-pages.skin-2.plain a.curr,.do-pages.plain a.normal:active{background:#bdc3c7}.do-pages.grey a.normal{background:#546e7a;color:#fff}.do-pages.grey a.normal:hover{background:#607d8b}.do-pages.skin-2.grey a.curr,.do-pages.grey a.normal:active{background:#37474f}.do-pages.red a.normal{background:#ff5722;color:#fff}.do-pages.red a.normal:hover{background:#ff7043}.do-pages.skin-2.red a.curr,.do-pages.red a.normal:active{background:#e64a19}.do-pages.orange a.normal{background:#ff9800;color:#fff}.do-pages.orange a.normal:hover{background:#ffa726}.do-pages.skin-2.orange a.curr,.do-pages.orange a.normal:active{background:#f57c00}.do-pages.green a.normal{background:#4caf50;color:#fff}.do-pages.green a.normal:hover{background:#81c784}.do-pages.skin-2.green a.curr,.do-pages.green a.normal:active{background:#388e3c}.do-pages.teal a.normal{background:#1abc9c;color:#fff}.do-pages.teal a.normal:hover{background:#48c9b0}.do-pages.skin-2.teal a.curr,.do-pages.teal a.normal:active{background:#16a085}.do-pages.blue a.normal{background:#2196f3;color:#fff}.do-pages.blue a.normal:hover{background:#64b5f6}.do-pages.skin-2.blue a.curr,.do-pages.blue a.normal:active{background:#1976d2}.do-pages.purple a.normal{background:#651fff;color:#fff}.do-pages.purple a.normal:hover{background:#7c4dff}.do-pages.skin-2.purple a.curr,.do-pages.purple a.normal:active{background:#6200ea}
diff --git a/js/lib/pages/main.scss b/js/lib/pages/main.scss
index ab62520..ac82955 100644
--- a/js/lib/pages/main.scss
+++ b/js/lib/pages/main.scss
@@ -67,11 +67,21 @@
&.skin-2.green a.curr,
&.green a.normal:active {background:nth($cg, 3)}
+ &.teal a.normal {background:nth($ct, 1);color: #fff;}
+ &.teal a.normal:hover {background:nth($ct, 2)}
+ &.skin-2.teal a.curr,
+ &.teal a.normal:active {background:nth($ct, 3)}
+
&.blue a.normal {background:nth($cb, 1);color: #fff;}
&.blue a.normal:hover {background:nth($cb, 2)}
&.skin-2.blue a.curr,
&.blue a.normal:active {background:nth($cb, 3)}
+ &.purple a.normal {background:nth($cpp, 1);color: #fff;}
+ &.purple a.normal:hover {background:nth($cpp, 2)}
+ &.skin-2.purple a.curr,
+ &.purple a.normal:active {background:nth($cpp, 3)}
+
}
' : '' + it.thumb = openType === 'image' ? '