From a54986e3e8d2a2e83c0631a442748d0bd20fbe2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=87=E5=A4=A9?= Date: Sat, 30 Sep 2017 10:35:38 +0800 Subject: [PATCH] =?UTF-8?q?MEditor=E6=A0=B7=E5=BC=8F=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/lib/meditor/skin/main.css | 2 +- js/lib/meditor/skin/main.scss | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/js/lib/meditor/skin/main.css b/js/lib/meditor/skin/main.css index a9dc674..3809669 100644 --- a/js/lib/meditor/skin/main.css +++ b/js/lib/meditor/skin/main.css @@ -1 +1 @@ -::-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%} +.do-meditor{position:relative;width:100%;height:100%;min-height:180px;padding-top:43px;border:1px solid #ddd;background:#fff;color:#666}.do-meditor ::-webkit-scrollbar{width:5px;height:5px;background:#ebeeec}.do-meditor ::-webkit-scrollbar:hover{background:rgba(0,0,0,0.05)}.do-meditor ::-webkit-scrollbar-button{display:none}.do-meditor ::-webkit-scrollbar-thumb{background:#1abc9c}.do-meditor ::-webkit-scrollbar-thumb:hover{background:#16a085}.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 index a2c683e..995be3a 100644 --- a/js/lib/meditor/skin/main.scss +++ b/js/lib/meditor/skin/main.scss @@ -8,13 +8,15 @@ @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 {position:relative;width:100%;height:100%;min-height:180px;padding-top:43px;border:1px solid #ddd;background:#fff;color:#666;} + ::-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-font {font-family:"PingFang SC","Helvetica Neue","Hiragino Sans GB","Segoe UI","Microsoft YaHei",sans-serif;}