From 5d8b44ea67af47e38596ed2803c48326fc5f3c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=87=E5=A4=A9?= Date: Mon, 30 Jul 2018 13:27:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96layer=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F;=E4=BC=98=E5=8C=96meditor=E7=9A=84?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/layer/skin/normal.scss | 16 ++++++++-------- src/js/meditor/skin/main.scss | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/js/layer/skin/normal.scss b/src/js/layer/skin/normal.scss index 45db97d..07fb98c 100644 --- a/src/js/layer/skin/normal.scss +++ b/src/js/layer/skin/normal.scss @@ -39,9 +39,7 @@ .layer-title {width:100%;height:43px;padding:0 10px;line-height:43px;font-size:16px;color:nth($cd, 2);} /* 弹层主体内容 */ - .layer-content {position:relative;width:100%;height:auto;min-height:50px;padding:10px;word-break:break-all;word-wrap: break-word; - - // .msg-icon {position:absolute;left:10px;top:10px;width:50px;height:auto;line-height:40px;font-size:35px;text-align:center;} + .layer-content {position:relative;width:100%;height:auto;min-height:50px;word-break:break-all;word-wrap: break-word; .prompt-value {width: 100%;height: 30px;padding: 0 8px;border: 1px solid #ddd;border-radius: 3px; @@ -71,12 +69,14 @@ /* ;alert/confirm/prompt 3类弹层 */ &.type-1, &.type-2, - &.type-3 {max-width:600px;min-width:300px;} + &.type-3 {max-width:600px;min-width:300px; + + .layer-content {padding:10px;} + } &.type-4 {padding:0; - .layer-content {padding:0;} .frame-box {display:block;width:100%;height:100%;margin:0;padding:0;border:0;resize: none;} } @@ -89,7 +89,7 @@ i.offset-top-left {right:5px;bottom:-14px;border-top:8px solid rgba(0,0,0,.5);} i.offset-bottom-left {right:5px;top:-14px;border-bottom:8px solid rgba(0,0,0,.5);} - .layer-content {min-height:20px;margin:0;padding:0} + .layer-content {min-height:20px;margin:0;} } @@ -100,7 +100,7 @@ /* 特殊类弹层(toast弹层) */ &.type-toast {position:fixed;min-width:10px;padding:0;background:transparent; - .layer-content {min-height:40px;height:40px;padding:0} + .layer-content {min-height:40px;height:40px;} .toast-box {display:inline-block;position:relative;min-height:40px;padding:5px 12px 5px 50px;line-height:28px;border-radius:3px;word-break: break-all; @@ -209,7 +209,7 @@ i.offset-top-left {right:5px;bottom:-14px;border-top:8px solid rgba(0,0,0,.5);} i.offset-bottom-left {right:5px;top:-14px;border-bottom:8px solid rgba(0,0,0,.5);} - .layer-content {min-height:20px;margin:0;padding:0} + .layer-content {min-height:20px;margin:0;} } diff --git a/src/js/meditor/skin/main.scss b/src/js/meditor/skin/main.scss index a791c1f..3cfda4b 100644 --- a/src/js/meditor/skin/main.scss +++ b/src/js/meditor/skin/main.scss @@ -34,7 +34,7 @@ } } - .editor-body{overflow:hidden;overflow-y:auto;float:left;width:100%;height:100%;padding:5px 5px 50px;line-height:1.5;border:0;outline:none;resize:none;color:nth($cgr, 1);background:#fff;font-size:13px;font-family:"Courier New", "Courier";} + .editor-body{overflow:hidden;overflow-y:auto;float:left;width:100%;height:100%;padding:5px 5px 50px;line-height:1.5;border:0;outline:none;resize:none;color:nth($cgr, 1);background:#fff;font-size:13px;} .md-preview {float:right;overflow:hidden;overflow-y:auto;display:block;width:50%;height:100%;padding:10px 10px 50px;line-height:1.5;border-left:1px solid nth($cp, 2);color:nth($cd, 1);font-size:14px;background:#fff;}