@jx3box/jx3box-editor 1.0.7 → 1.1.1

package/assets/css/article.less

@@ -1,28 +1,35 @@
 // @import 'node_modules/csslab/base.less';
 // @import 'node_modules/@jx3box/jx3box-common/css/var.less';
 
-@import 'module/_.less';
-@import 'module/a.less';
-@import 'module/list.less';
-@import 'module/quote.less';
-@import 'module/hr.less';
-@import 'module/table.less';
-@import 'module/img.less';
-@import 'module/item.less';
-@import 'module/p.less';
-@import 'module/h.less';
-@import 'module/code.less';
-@import 'module/fold.less';
-@import 'module/video.less';
-@import 'module/directory.less';
-@import 'module/macro.less';
-@import 'module/qixue.less';
-@import 'module/icon.less';
-@import 'module/resource.less';
-@import 'module/nextpage.less';
-@import 'module/plugin.less';
-@import 'module/latex.less';
-@import 'module/imgpreview.less';
-@import 'module/jx3_element.less';
-@import 'module/buff.less';
-@import 'module/skill.less';
+@import "tinymce/_.less";
+@import "tinymce/a.less";
+@import "tinymce/list.less";
+@import "tinymce/quote.less";
+@import "tinymce/hr.less";
+@import "tinymce/table.less";
+@import "tinymce/img.less";
+@import "tinymce/p.less";
+@import "tinymce/h.less";
+@import "tinymce/code.less";
+@import "tinymce/fold.less";
+@import "tinymce/plugin.less";
+@import "tinymce/imgpreview.less";
+@import "tinymce/latex.less";
+@import "tinymce/nextpage.less";
+
+@import "module/macro.less";
+@import "module/talent.less";
+
+@import "tinymce/video.less";
+@import "tinymce/macro.less";
+@import "tinymce/qixue.less";
+
+@import "module/directory.less";
+@import "module/icon.less";
+@import "module/resource.less";
+@import "module/jx3_element.less";
+
+@import "module/buff.less";
+@import "module/skill.less";
+@import "module/item.less";
+@import "module/npc.less";

package/assets/css/article_markdown.less

@@ -1,12 +1,16 @@
-.c-article-markdown {
-    @import "module/video.less";
+@import "module/macro.less";
+@import "module/talent.less";
 
-    @import 'module/macro.less';
-    @import 'module/qixue.less';
+@import "markdown/video.less";
+@import "markdown/macro.less";
+@import "markdown/talent.less";
 
-    @import 'module/jx3_element.less';
-    @import 'module/buff.less';
-    @import 'module/skill.less';
-    @import 'module/icon.less';
-    @import 'module/resource.less';
-}
+@import 'module/directory.less';
+@import 'module/icon.less';
+@import 'module/resource.less';
+@import 'module/jx3_element.less';
+
+@import 'module/buff.less';
+@import 'module/skill.less';
+@import 'module/item.less';
+@import 'module/npc.less';

package/assets/css/markdown/_.less

@@ -0,0 +1,2 @@
+
+

package/assets/css/markdown/macro.less

@@ -0,0 +1,45 @@
+// 编辑器外样式
+.c-article{
+	.e-jx3macro-area{
+		.pr;
+		&:after{
+			content : 'JX3BOX·MACRO';
+			position: absolute;right:0;top:-30px;
+			background-color:@bg-black;
+			color:#fff;
+			border-radius:3px;
+			padding:0 8px;
+			line-height:28px;
+			height: 28px;
+			box-sizing: border-box;
+			font-size: 14px;
+		}
+	}
+}
+// markdown编辑器
+.c-editor-markdown {
+	.e-jx3macro-area{
+		min-height:24px;
+		border-radius:4px;
+		padding:10px;
+		font-size: 14px;
+		white-space: pre-wrap;
+		background-color: #f1f8ff;
+		border: 1px solid #c8e1ff;
+		color:darken(#c8e1ff,20%);
+		.pr;
+		&:after{
+			content : 'JX3BOX·MACRO';
+			position: absolute;right:10px;top:10px;
+			background-color:darken(#c8e1ff,20%);
+			color:#fff;
+			border-radius:3px;
+			padding:0 8px;
+		}
+	}
+}
+// markdown渲染展示
+.c-article-markdown .w-jx3macro{
+	background:none;
+	padding:0;
+}

package/assets/css/markdown/talent.less

@@ -0,0 +1,42 @@
+// 编辑器内
+.e-jx3qixue-area ,.e-jx3talent2-area{
+    min-height: 24px;
+    border-radius: 4px;
+    font-size: 14px;
+    width: 100%;
+    box-sizing: border-box;
+    background-color: #f1f8ff;
+    border: 1px solid #c8e1ff;
+    color: darken(#c8e1ff, 20%);
+
+    line-height: 40px !important;
+    padding: 0 10px;
+    font-family: Monaco, Consolas, "Lucida Console", "Courier New", serif;
+
+    .pr;
+    &:after {
+        content: "JX3BOX·TALENT";
+        position: absolute;
+        .rt(8px);
+        background-color: darken(#c8e1ff, 20%);
+        color: #fff;
+        border-radius: 3px;
+        padding: 2px 8px;
+        line-height: 21px;
+    }
+}
+// Markdown编辑器内展示
+.c-editor-markdown{
+    .e-jx3qixue-area,.e-jx3talent2-area{
+        display: block;
+        padding-top:0;
+        padding-bottom:0;
+    }
+}
+
+// Markdown渲染
+.c-article-markdown{
+    .e-jx3qixue-area,.e-jx3talent2-area{
+        display:none;
+    }
+}

package/assets/css/markdown/video.less

@@ -0,0 +1,25 @@
+.c-article-markdown {
+    video {
+        background-color: #333;
+        width: 100%;
+        height: 800px;
+        display: block;
+        cursor: pointer;
+    }
+}
+.c-article-videox {
+    iframe,
+    iframe[allowfullscreen="allowfullscreen"] {
+        width: 100%;
+        height: 800px;
+        border: 1px solid #eee;
+        box-sizing: border-box;
+    }
+}
+@media screen and (max-width: @ipad) {
+    .c-article-markdown video,
+    .c-article-videox iframe {
+        height: auto;
+        min-height: 200px;
+    }
+}

package/assets/css/markdown.less

@@ -1,33 +1,76 @@
-.c-editor-header {
-    .mb(10px);
-    .clearfix;
+.c-editor-markdown {
+    .c-editor-header {
+        .mb(10px);
+        .clearfix;
 
-    .c-upload,
-    .c-resource {
-        .fl;
+        .c-upload,
+        .c-resource {
+            .fl;
+        }
+        .c-upload {
+            .mr(5px);
+        }
     }
-    .c-upload {
-        .mr(5px);
-    }
-}
 
-.c-markdown{
-    .h(780px);
-    .v-note-wrapper{
+    .c-markdown {
         .h(780px);
+        .v-note-wrapper {
+            .h(780px);
+        }
+        a:hover {
+            text-decoration: none;
+        }
     }
-}
 
-.c-markdown-toolbar-item {
-    .mr(5px);
-    .pointer;
-    padding: 2px 5px 3px 5px;
+    .c-markdown-toolbar-item {
+        .mr(5px);
+        .pointer;
+        padding: 2px 5px 3px 5px;
 
-    &:hover {
-        background: #e9e9eb;
-        .r(4px);
+        &:hover {
+            background: #e9e9eb;
+            .r(4px);
+        }
+    }
+    .c-markdown-store-item {
+        .none;
+    }
+    .c-editor-markdown-dialog {
+        display: inline-block;
+        .u-input {
+            .el-textarea__inner {
+                font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+            }
+        }
+        .el-dialog__body {
+            padding-top: 0;
+        }
+
+        .u-help {
+            margin-bottom: 10px;
+            display: inline-block;
+            color: #0366d6;
+            font-weight: bold;
+            cursor: pointer;
+            text-decoration: none;
+
+            &:hover {
+                text-decoration: none !important;
+            }
+        }
     }
 }
-.c-markdown-store-item {
-    .none;
-}
+
+@import "markdown/video.less";
+@import "markdown/macro.less";
+@import "markdown/talent.less";
+
+@import 'module/directory.less';
+@import 'module/icon.less';
+@import 'module/resource.less';
+@import 'module/jx3_element.less';
+
+@import 'module/buff.less';
+@import 'module/skill.less';
+@import 'module/item.less';
+@import 'module/npc.less';

package/assets/css/module/buff.less

@@ -46,7 +46,7 @@
     .w-buff-meta {
         .db;
         .fz(12px, 20px);
-        color: #f00;
+        color: #5df9eb;
     }
 }
 

package/assets/css/module/item.less

@@ -224,4 +224,3 @@
         }
     }
 }
-

package/assets/css/module/item_simple.less

@@ -1,49 +1,51 @@
 .m-simple-item {
-  .mb(2px);
-  padding: 4px 10px 4px 4px;
-  line-height: initial;
-  font-size: 13px;
-  background-color: #0F2222;
-  text-shadow: 1px 1px 1px #000000;
-  border-radius: 4px;
-  overflow: hidden;
+    .mb(2px);
+    padding: 4px 10px 4px 4px;
+    line-height: initial;
+    font-size: 13px;
+    background-color: #0f2222;
+    text-shadow: 1px 1px 1px #000000;
+    border-radius: 4px;
+    overflow: hidden;
 
-  .m-icon, .u-name {
-    .dbi;
-    vertical-align: middle;
-  }
+    .m-icon,
+    .u-name {
+        .dbi;
+        vertical-align: middle;
+    }
 
-  .m-icon {
-    .pr;
-    .mr(8px);
+    .m-icon {
+        .pr;
+        .mr(8px);
 
-    .u-border, .u-border-quest {
-      .pa;
-      top: 0;
-      left: 0;
-      .w(100%);
-      .h(100%);
-      box-sizing: border-box;
-      background-size: contain;
-      .z(20);
-    }
+        .u-border,
+        .u-border-quest {
+            .pa;
+            top: 0;
+            left: 0;
+            .w(100%);
+            .h(100%);
+            box-sizing: border-box;
+            background-size: contain;
+            .z(20);
+        }
 
-    .u-border-quest {
-      .z(30);
-    }
+        .u-border-quest {
+            .z(30);
+        }
 
-    .u-icon {
-      .pr;
-      .db;
-      .w(24px);
-      .h(auto);
-      .z(10);
+        .u-icon {
+            .pr;
+            .db;
+            .w(24px);
+            .h(auto);
+            .z(10);
+        }
     }
-  }
 
-  .u-uiid {
-    .mt(3px);
-    font-size: 12px;
-    color: lightgreen;
-  }
-}
+    .u-uiid {
+        .mt(3px);
+        font-size: 12px;
+        color: lightgreen;
+    }
+}

package/assets/css/module/macro.less

@@ -1,39 +1,72 @@
-// 编辑器内样式
-.c-article{
-	.e-jx3macro-area{
-		.pr;
-		&:after{
-			content : 'JX3BOX·MACRO';
-			position: absolute;right:0;top:-30px;
-			background-color:@bg-black;
-			color:#fff;
-			border-radius:3px;
-			padding:0 8px;
-			line-height:28px;
-			height: 28px;
-			box-sizing: border-box;
-			font-size: 14px;
-		}
-	}
-}
-.c-article-editor {
-	.e-jx3macro-area{
-		min-height:24px;
-		border-radius:4px;
-		padding:10px;
-		font-size: 14px;
-		white-space: pre-wrap;
-		background-color: #f1f8ff;
-		border: 1px solid #c8e1ff;
-		color:darken(#c8e1ff,20%);
-		.pr;
-		&:after{
-			content : 'JX3BOX·MACRO';
-			position: absolute;right:10px;top:10px;
-			background-color:darken(#c8e1ff,20%);
-			color:#fff;
-			border-radius:3px;
-			padding:0 8px;
-		}
-	}
+// 文章输出样式
+.w-jx3macro {
+    .fz(15px,24px);
+    font-family: Monaco, Consolas, "Lucida Console", "Courier New", serif;
+    ol {
+        padding: 0 0 0 40px;
+        border-radius: 4px;
+        background: #f6f8fa;
+        border: 1px solid #eee;
+    }
+    li {
+        margin: 0 !important;
+        background: #fafbfc;
+        border-bottom: 1px solid #e1e4e8;
+        border-left: 1px solid #e1e4e8;
+        &:last-child {
+            border-bottom: none;
+        }
+        list-style: decimal;
+        &:hover {
+            background-color: #fff;
+        }
+    }
+    pre {
+        background: none;
+        border: none;
+        padding: 6px 10px !important;
+        margin: 0;
+        .lh(24px);
+        border: none !important;
+        font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+        white-space: normal;
+    }
+}
+@media print {
+    .w-jx3macro {
+        page-break-inside: avoid !important;
+        ol {
+            padding-left: 0;
+        }
+        li {
+            list-style: none;
+            border-left: none;
+        }
+    }
+}
+
+//注释
+.jx3macro-comment {
+    color: #22863a;
+}
+//条件
+.jx3macro-condition {
+    color: #6f42c1;
+}
+//符号
+.jx3macro-key {
+    color: #d73a49;
+}
+//命令
+.jx3macro-keyword-cast {
+    color: #005cc5;
+}
+.jx3macro-keyword-fcast {
+    color: #e6a11d;
+}
+.jx3macro-keyword-msg {
+    color: #666;
+}
+//技能
+.jx3macro-skill-name {
 }