From 6488a2ea35ec9d66d6b72501d64bb7608d91e609 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=87=E5=A4=A9?= Date: Mon, 30 Jul 2018 12:59:06 +0800 Subject: [PATCH] =?UTF-8?q?reset=E6=A0=B7=E5=BC=8F=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=AD=97=E4=BD=93;=E4=BF=AE=E5=A4=8Ddrag?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=9A=84=E5=9B=9E=E8=B0=83=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/css/reset-basic.scss | 4 +++- src/js/drag/index.js | 6 +++--- src/js/marked/theme.scss | 4 ++-- src/js/meditor/addon/attach.js | 2 +- src/js/meditor/addon/base.js | 10 +++++----- src/js/meditor/index.js | 1 - src/js/prism/highlight.scss | 4 ++-- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/css/reset-basic.scss b/src/css/reset-basic.scss index 0d1770f..2762641 100644 --- a/src/css/reset-basic.scss +++ b/src/css/reset-basic.scss @@ -40,7 +40,9 @@ a:focus,input,textarea,button:focus,input:focus,textarea:focus {outline:none;} ::-moz-focus-inner { border:none;outline:none; } -[anot],[\:if] {visibility:hidden;} +body {font-family:"Avenir Next", Helvetica, Arial,"WenQuanYi Micro Hei","PingFang SC","Hiragino Sans GB","Segoe UI", "Microsoft Yahei", sans-serif;-webkit-font-smoothing: antialiased;text-size-adjust: 100%;-webkit-tap-highlight-color: transparent;} +code,pre,samp {font-family:Menlo,Monaco,Consolas,"Courier New",monospace;} +[anot],[\:repeat],[\:if] {visibility:hidden;} .do-fn-cl { *zoom: 1; } .do-fn-cl::after { content: "."; display: block; height: 0; clear: both; visibility: hidden; overflow:hidden;} diff --git a/src/js/drag/index.js b/src/js/drag/index.js index a4a3273..42f96d4 100644 --- a/src/js/drag/index.js +++ b/src/js/drag/index.js @@ -143,7 +143,7 @@ Anot.directive('drag', { //拖拽前回调 if (_this.beforedrag) { let result = _this.beforedrag.call( - _this.vmodels, + _this.vmodels[0], target, ox + dx, oy + dy @@ -224,7 +224,7 @@ Anot.directive('drag', { //拖拽过程的回调 if (_this.dragging) { - _this.dragging.call(_this.vmodels, target, fox, foy) + _this.dragging.call(_this.vmodels[0], target, fox, foy) } }) let upfn = $doc.bind('mouseup', function(ev) { @@ -234,7 +234,7 @@ Anot.directive('drag', { target.style.transitionDuration = cssTransition //结束回调 if (_this.dragged) { - _this.dragged.call(_this.vmodels, target, fox, foy) + _this.dragged.call(_this.vmodels[0], target, fox, foy) } }) }) diff --git a/src/js/marked/theme.scss b/src/js/marked/theme.scss index 271ff18..29bcd12 100644 --- a/src/js/marked/theme.scss +++ b/src/js/marked/theme.scss @@ -55,12 +55,12 @@ } } table {width:100%; - thead tr {height:45px;line-height:45px;background:#f7f7f7} + thead tr {height:45px;line-height:45px;background:nth($cp, 1)} thead th {padding:0 8px;border:0;} tbody tr {height:43px;line-height:42px;@include ts(all, .3s); &:hover {background:#ecf6fd} } - tbody td {padding:0 8px;border-bottom:1px solid #e9e9e9} + tbody td {padding:0 8px;border-bottom:1px solid nth($cp, 2)} } hr {margin:30px 0;border-bottom:0;} diff --git a/src/js/meditor/addon/attach.js b/src/js/meditor/addon/attach.js index b4935e8..c3a9d86 100644 --- a/src/js/meditor/addon/attach.js +++ b/src/js/meditor/addon/attach.js @@ -74,7 +74,7 @@ const fixCont = function(vm, tool) { limit = (vm.props.uploadSizeLimit / (1024 * 1024)).toFixed(2) } return ` -
+
${LANG[tool][0]} diff --git a/src/js/meditor/addon/base.js b/src/js/meditor/addon/base.js index 5d34361..9e8f975 100644 --- a/src/js/meditor/addon/base.js +++ b/src/js/meditor/addon/base.js @@ -49,7 +49,7 @@ const addon = { left: offset.left - $doc.scrollLeft() }, content: ` -
    +
    • 一级标题
    • 二级标题
    • 三级标题
      • @@ -140,7 +140,7 @@ const addon = { left: offset.left - $doc.scrollLeft() }, content: ` -
      +
      @@ -360,7 +360,7 @@ const addon = { left: offset.left - $doc.scrollLeft() }, content: ` -
      +
      @@ -438,7 +438,7 @@ const addon = { this.close() }, content: ` -
      +
      语言类型