分离editor_color.css从而更方便进行配色

This commit is contained in:
ckcz123 2020-06-09 10:58:08 +08:00
parent b51083fafc
commit e83eecde63
15 changed files with 585 additions and 637 deletions

View File

@ -1134,10 +1134,10 @@
function getQueryDialog(cm) { function getQueryDialog(cm) {
return '<span class="CodeMirror-search-label">搜索: </span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span class="CodeMirror-search-label" id="CodeMirror-search-count">0/0</span> <span style="color: #888" class="CodeMirror-search-hint">使用/re/语法正则搜索</span>'; return '<span class="CodeMirror-search-label">搜索: </span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span class="CodeMirror-search-label" id="CodeMirror-search-count">0/0</span> <span class="CodeMirror-search-hint">使用/re/语法正则搜索</span>';
} }
function getReplaceQueryDialog(cm) { function getReplaceQueryDialog(cm) {
return ' <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">使用/re/语法正则搜索</span>'; return ' <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span class="CodeMirror-search-hint">使用/re/语法正则搜索</span>';
} }
function getReplacementQueryDialog(cm) { function getReplacementQueryDialog(cm) {
return '<span class="CodeMirror-search-label">替换为: </span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/>'; return '<span class="CodeMirror-search-label">替换为: </span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/>';

File diff suppressed because one or more lines are too long

View File

@ -4,7 +4,6 @@
/* Set height, width, borders, and global font properties here */ /* Set height, width, borders, and global font properties here */
font-family: monospace; font-family: monospace;
height: 300px; height: 300px;
color: black;
direction: ltr; direction: ltr;
} }
@ -18,54 +17,29 @@
padding: 0 4px; /* Horizontal padding of content */ padding: 0 4px; /* Horizontal padding of content */
} }
.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
background-color: white; /* The little square between H and V scrollbars */
}
/* GUTTER */ /* GUTTER */
.CodeMirror-gutters { .CodeMirror-gutters {
border-right: 1px solid #ddd;
background-color: #f7f7f7;
white-space: nowrap; white-space: nowrap;
} }
.CodeMirror-linenumbers {
}
.CodeMirror-linenumber { .CodeMirror-linenumber {
padding: 0 3px 0 5px; padding: 0 3px 0 5px;
min-width: 20px; min-width: 20px;
text-align: right; text-align: right;
color: #999;
white-space: nowrap; white-space: nowrap;
} }
.CodeMirror-guttermarker {
color: black;
}
.CodeMirror-guttermarker-subtle {
color: #999;
}
/* CURSOR */ /* CURSOR */
.CodeMirror-cursor { .CodeMirror-cursor {
border-left: 1px solid black;
border-right: none; border-right: none;
width: 0; width: 0;
} }
/* Shown when moving in bi-directional text */
.CodeMirror div.CodeMirror-secondarycursor {
border-left: 1px solid silver;
}
.cm-fat-cursor .CodeMirror-cursor { .cm-fat-cursor .CodeMirror-cursor {
width: auto; width: auto;
border: 0 !important; border: 0 !important;
background: #7e7;
} }
.cm-fat-cursor div.CodeMirror-cursors { .cm-fat-cursor div.CodeMirror-cursors {
@ -73,7 +47,6 @@
} }
.cm-fat-cursor-mark { .cm-fat-cursor-mark {
background-color: rgba(20, 255, 20, 0.5);
-webkit-animation: blink 1.06s steps(1) infinite; -webkit-animation: blink 1.06s steps(1) infinite;
-moz-animation: blink 1.06s steps(1) infinite; -moz-animation: blink 1.06s steps(1) infinite;
animation: blink 1.06s steps(1) infinite; animation: blink 1.06s steps(1) infinite;
@ -85,7 +58,6 @@
-webkit-animation: blink 1.06s steps(1) infinite; -webkit-animation: blink 1.06s steps(1) infinite;
-moz-animation: blink 1.06s steps(1) infinite; -moz-animation: blink 1.06s steps(1) infinite;
animation: blink 1.06s steps(1) infinite; animation: blink 1.06s steps(1) infinite;
background-color: #7e7;
} }
@-moz-keyframes blink { @-moz-keyframes blink {
@ -119,8 +91,6 @@
} }
/* Can style cursor different in overwrite (non-insert) mode */ /* Can style cursor different in overwrite (non-insert) mode */
.CodeMirror-overwrite .CodeMirror-cursor {
}
.cm-tab { .cm-tab {
display: inline-block; display: inline-block;
@ -137,7 +107,6 @@
} }
.CodeMirror-ruler { .CodeMirror-ruler {
border-left: 1px solid #ccc;
top: 0; top: 0;
bottom: 0; bottom: 0;
position: absolute; position: absolute;
@ -145,22 +114,6 @@
/* DEFAULT THEME */ /* DEFAULT THEME */
.cm-s-default .cm-header {
color: blue;
}
.cm-s-default .cm-quote {
color: #090;
}
.cm-negative {
color: #d44;
}
.cm-positive {
color: #292;
}
.cm-header, .cm-strong { .cm-header, .cm-strong {
font-weight: bold; font-weight: bold;
} }
@ -177,110 +130,16 @@
text-decoration: line-through; text-decoration: line-through;
} }
.cm-s-default .cm-keyword {
color: #708;
}
.cm-s-default .cm-atom {
color: #219;
}
.cm-s-default .cm-number {
color: #164;
}
.cm-s-default .cm-def {
color: #00f;
}
.cm-s-default .cm-variable, .cm-s-default .cm-variable,
.cm-s-default .cm-punctuation, .cm-s-default .cm-punctuation,
.cm-s-default .cm-property, .cm-s-default .cm-property,
.cm-s-default .cm-operator { .cm-s-default .cm-operator {
} }
.cm-s-default .cm-variable-2 {
color: #05a;
}
.cm-s-default .cm-variable-3, .cm-s-default .cm-type {
color: #085;
}
.cm-s-default .cm-comment {
color: #a50;
}
.cm-s-default .cm-string {
color: #a11;
}
.cm-s-default .cm-string-2 {
color: #f50;
}
.cm-s-default .cm-meta {
color: #555;
}
.cm-s-default .cm-qualifier {
color: #555;
}
.cm-s-default .cm-builtin {
color: #30a;
}
.cm-s-default .cm-bracket {
color: #997;
}
.cm-s-default .cm-tag {
color: #170;
}
.cm-s-default .cm-attribute {
color: #00c;
}
.cm-s-default .cm-hr {
color: #999;
}
.cm-s-default .cm-link {
color: #00c;
}
.cm-s-default .cm-error {
color: #f00;
}
.cm-invalidchar {
color: #f00;
}
.CodeMirror-composing { .CodeMirror-composing {
border-bottom: 2px solid; border-bottom: 2px solid;
} }
/* Default styles for common addons */
div.CodeMirror span.CodeMirror-matchingbracket {
color: #0b0;
}
div.CodeMirror span.CodeMirror-nonmatchingbracket {
color: #a22;
}
.CodeMirror-matchingtag {
background: rgba(255, 150, 0, .3);
}
.CodeMirror-activeline-background {
background: #e8f2ff;
}
/* STOP */ /* STOP */
/* The rest of this file contains styles related to the mechanics of /* The rest of this file contains styles related to the mechanics of
@ -289,7 +148,6 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
.CodeMirror { .CodeMirror {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
background: white;
} }
.CodeMirror-scroll { .CodeMirror-scroll {
@ -486,31 +344,10 @@ div.CodeMirror-dragcursors {
visibility: visible; visibility: visible;
} }
.CodeMirror-selected {
background: #d9d9d9;
}
.CodeMirror-focused .CodeMirror-selected {
background: #d7d4f0;
}
.CodeMirror-crosshair { .CodeMirror-crosshair {
cursor: crosshair; cursor: crosshair;
} }
.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection {
background: #d7d4f0;
}
.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection {
background: #d7d4f0;
}
.cm-searching {
background-color: #ffa;
background-color: rgba(255, 255, 0, .4);
}
/* Used to force a border model for a node */ /* Used to force a border model for a node */
.cm-force-border { .cm-force-border {
padding-right: .1px; padding-right: .1px;
@ -535,8 +372,6 @@ span.CodeMirror-selectedtext {
/* ========= show-hint.css ========= */ /* ========= show-hint.css ========= */
.cm-matchhighlight {background-color: #dedede}
.CodeMirror-hints { .CodeMirror-hints {
position: absolute; position: absolute;
z-index: 340; z-index: 340;
@ -546,13 +381,7 @@ span.CodeMirror-selectedtext {
margin: 0; margin: 0;
padding: 2px; padding: 2px;
-webkit-box-shadow: 2px 3px 5px rgba(0, 0, 0, .2);
-moz-box-shadow: 2px 3px 5px rgba(0, 0, 0, .2);
box-shadow: 2px 3px 5px rgba(0, 0, 0, .2);
border-radius: 3px; border-radius: 3px;
border: 1px solid silver;
background: white;
font-size: 90%; font-size: 90%;
font-family: monospace; font-family: monospace;
@ -565,15 +394,9 @@ span.CodeMirror-selectedtext {
padding: 0 4px; padding: 0 4px;
border-radius: 2px; border-radius: 2px;
white-space: pre; white-space: pre;
color: black;
cursor: pointer; cursor: pointer;
} }
li.CodeMirror-hint-active {
background: #08f;
color: white;
}
/* ========= lint.css ========= */ /* ========= lint.css ========= */
/* The lint marker gutter */ /* The lint marker gutter */
@ -582,10 +405,7 @@ li.CodeMirror-hint-active {
} }
.CodeMirror-lint-tooltip { .CodeMirror-lint-tooltip {
background-color: #ffd;
border: 1px solid black;
border-radius: 4px 4px 4px 4px; border-radius: 4px 4px 4px 4px;
color: black;
font-family: monospace; font-family: monospace;
font-size: 10pt; font-size: 10pt;
overflow: hidden; overflow: hidden;
@ -607,15 +427,6 @@ li.CodeMirror-hint-active {
background-position: left bottom; background-position: left bottom;
background-repeat: repeat-x; background-repeat: repeat-x;
} }
.CodeMirror-lint-mark-error {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJDw4cOCW1/KIAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAHElEQVQI12NggIL/DAz/GdA5/xkY/qPKMDAwAADLZwf5rvm+LQAAAABJRU5ErkJggg==");
}
.CodeMirror-lint-mark-warning {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJFhQXEbhTg7YAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAMklEQVQI12NkgIIvJ3QXMjAwdDN+OaEbysDA4MPAwNDNwMCwiOHLCd1zX07o6kBVGQEAKBANtobskNMAAAAASUVORK5CYII=");
}
.CodeMirror-lint-marker-error, .CodeMirror-lint-marker-warning { .CodeMirror-lint-marker-error, .CodeMirror-lint-marker-warning {
background-position: center center; background-position: center center;
background-repeat: no-repeat; background-repeat: no-repeat;
@ -633,16 +444,7 @@ li.CodeMirror-hint-active {
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.CodeMirror-lint-marker-error, .CodeMirror-lint-message-error {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAHlBMVEW7AAC7AACxAAC7AAC7AAAAAAC4AAC5AAD///+7AAAUdclpAAAABnRSTlMXnORSiwCK0ZKSAAAATUlEQVR42mWPOQ7AQAgDuQLx/z8csYRmPRIFIwRGnosRrpamvkKi0FTIiMASR3hhKW+hAN6/tIWhu9PDWiTGNEkTtIOucA5Oyr9ckPgAWm0GPBog6v4AAAAASUVORK5CYII=");
}
.CodeMirror-lint-marker-warning, .CodeMirror-lint-message-warning {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAANlBMVEX/uwDvrwD/uwD/uwD/uwD/uwD/uwD/uwD/uwD6twD/uwAAAADurwD2tQD7uAD+ugAAAAD/uwDhmeTRAAAADHRSTlMJ8mN1EYcbmiixgACm7WbuAAAAVklEQVR42n3PUQqAIBBFUU1LLc3u/jdbOJoW1P08DA9Gba8+YWJ6gNJoNYIBzAA2chBth5kLmG9YUoG0NHAUwFXwO9LuBQL1giCQb8gC9Oro2vp5rncCIY8L8uEx5ZkAAAAASUVORK5CYII=");
}
.CodeMirror-lint-marker-multiple { .CodeMirror-lint-marker-multiple {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAMAAADzjKfhAAAACVBMVEUAAAAAAAC/v7914kyHAAAAAXRSTlMAQObYZgAAACNJREFUeNo1ioEJAAAIwmz/H90iFFSGJgFMe3gaLZ0od+9/AQZ0ADosbYraAAAAAElFTkSuQmCC");
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: right bottom; background-position: right bottom;
width: 100%; width: 100%;
@ -662,47 +464,10 @@ li.CodeMirror-hint-active {
} }
.CodeMirror-dialog-top { .CodeMirror-dialog-top {
border-bottom: 1px solid #eee;
top: 0; top: 0;
} }
.CodeMirror-dialog-bottom { .CodeMirror-dialog-bottom {
border-top: 1px solid #eee;
bottom: 0;
}
.CodeMirror-dialog input {
border: none;
outline: none;
background: transparent;
width: 20em;
color: inherit;
font-family: monospace;
}
.CodeMirror-dialog button {
font-size: 70%;
}
/* ========= dialog.css ========= */
.CodeMirror-dialog {
position: absolute;
left: 0; right: 0;
background: inherit;
z-index: 15;
padding: .1em .8em;
overflow: hidden;
color: inherit;
}
.CodeMirror-dialog-top {
border-bottom: 1px solid #eee;
top: 0;
}
.CodeMirror-dialog-bottom {
border-top: 1px solid #eee;
bottom: 0; bottom: 0;
} }
@ -719,7 +484,6 @@ li.CodeMirror-hint-active {
font-size: 70%; font-size: 70%;
} }
/* ========= tern.css ========= */ /* ========= tern.css ========= */
.CodeMirror-Tern-completion { .CodeMirror-Tern-completion {
@ -738,59 +502,20 @@ li.CodeMirror-hint-active {
width: 15px; width: 15px;
line-height: 16px; line-height: 16px;
text-align: center; text-align: center;
color: white;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
} }
.CodeMirror-Tern-completion-unknown:before {
content: "?";
background: #4bb;
}
.CodeMirror-Tern-completion-object:before {
content: "O";
background: #77c;
}
.CodeMirror-Tern-completion-fn:before {
content: "F";
background: #7c7;
}
.CodeMirror-Tern-completion-array:before {
content: "A";
background: #c66;
}
.CodeMirror-Tern-completion-number:before {
content: "1";
background: #999;
}
.CodeMirror-Tern-completion-string:before {
content: "S";
background: #999;
}
.CodeMirror-Tern-completion-bool:before {
content: "B";
background: #999;
}
.CodeMirror-Tern-completion-guess {
color: #999;
}
.CodeMirror-Tern-tooltip { .CodeMirror-Tern-tooltip {
border: 1px solid silver;
border-radius: 3px; border-radius: 3px;
color: #444;
padding: 2px 5px; padding: 2px 5px;
font-size: 90%; font-size: 90%;
font-family: monospace; font-family: monospace;
background-color: white;
white-space: pre-wrap; white-space: pre-wrap;
max-width: 40em; max-width: 40em;
position: absolute; position: absolute;
z-index: 320; z-index: 320;
-webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
box-shadow: 2px 3px 5px rgba(0,0,0,.2);
transition: opacity 1s; transition: opacity 1s;
-moz-transition: opacity 1s; -moz-transition: opacity 1s;
@ -804,15 +529,10 @@ li.CodeMirror-hint-active {
margin-top: -3px; margin-top: -3px;
} }
.CodeMirror-Tern-fname { color: black; }
.CodeMirror-Tern-farg { color: #70a; }
.CodeMirror-Tern-farg-current { text-decoration: underline; } .CodeMirror-Tern-farg-current { text-decoration: underline; }
.CodeMirror-Tern-type { color: #07c; }
.CodeMirror-Tern-fhint-guess { opacity: .7; } .CodeMirror-Tern-fhint-guess { opacity: .7; }
.CodeMirror-foldmarker { .CodeMirror-foldmarker {
color: blue;
text-shadow: #b9f 1px 1px 2px, #b9f -1px -1px 2px, #b9f 1px -1px 2px, #b9f -1px 1px 2px;
font-family: arial; font-family: arial;
line-height: .3; line-height: .3;
cursor: pointer; cursor: pointer;
@ -830,11 +550,3 @@ li.CodeMirror-hint-active {
.CodeMirror-foldgutter-folded:after { .CodeMirror-foldgutter-folded:after {
content: "\25B8"; content: "\25B8";
} }
.CodeMirror-focused .cm-matchhighlight {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFklEQVQI12NgYGBgkKzc8x9CMDAwAAAmhwSbidEoSQAAAABJRU5ErkJggg==);
background-position: bottom;
background-repeat: repeat-x;
}
.cm-matchhighlight {background-color: lightgreen}
.CodeMirror-selection-highlight-scrollbar {background-color: yellowgreen}

View File

@ -6,7 +6,6 @@ html, body, div, img {
body { body {
font-family: Roboto, "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;; font-family: Roboto, "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;;
background-color: #F5F5F5;
} }
/* ::-webkit-scrollbar { /* ::-webkit-scrollbar {
@ -29,9 +28,7 @@ body {
z-index: 240; z-index: 240;
padding: 4px 6px; padding: 4px 6px;
margin-top: 6px; margin-top: 6px;
background-color: #F5F5F5;
box-sizing: border-box; box-sizing: border-box;
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2), 0 1px 5px 0 rgba(0, 0, 0, .12);
} }
#colorPicker { #colorPicker {
@ -43,7 +40,6 @@ body {
#left, #mid, #mid2, #right { #left, #mid, #mid2, #right {
border-radius: 2px; border-radius: 2px;
box-sizing: border-box; box-sizing: border-box;
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2), 0 1px 5px 0 rgba(0, 0, 0, .12);
} }
#left { #left {
@ -75,7 +71,6 @@ body {
font-size: 12.3px; font-size: 12.3px;
font-family: 'Lucida Console', Monaco, monospace; font-family: 'Lucida Console', Monaco, monospace;
white-space: pre; white-space: pre;
border: 1px solid #ddd;
border-radius: 2px; border-radius: 2px;
overflow: auto; overflow: auto;
} }
@ -176,7 +171,6 @@ body {
padding: 5px 10px 10px 10px; padding: 5px 10px 10px 10px;
margin-right: 0; margin-right: 0;
box-sizing: border-box; box-sizing: border-box;
border: 1px solid #ccc;
border-radius: 2px; border-radius: 2px;
font-size: 15px; font-size: 15px;
line-height: 18px; line-height: 18px;
@ -194,20 +188,6 @@ body {
margin-top: 15px; margin-top: 15px;
} }
.input {
display: block;
max-width: 150px;
height: 20px;
padding: 6px 12px;
font-size: 14px;
margin-top: 10px;
color: #555;
background-color: #fff;
border: 1px solid #ccc;
border-radius: 3px;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
}
#bgSelect { #bgSelect {
width: 50%; width: 50%;
height: 100px; height: 100px;
@ -223,37 +203,6 @@ body {
#printOut { #printOut {
margin-top: 10px; margin-top: 10px;
height: 20px; height: 20px;
}
.btn {
width: 80px;
border-radius: 2px;
line-height: 30px;
margin: 0;
min-width: 50px;
padding: 0 5px;
display: inline-block;
margin-top: 5px;
font-size: 14px;
font-weight: 400;
/* text-transform: uppercase; */
letter-spacing: 0;
overflow: hidden;
cursor: pointer;
text-decoration: none;
text-align: center;
vertical-align: middle;
border: 0;
background: rgba(158, 158, 158, .2);
box-shadow: 0 1px 1px 0 rgba(0, 0, 0, .14), 0 2px 1px -1px rgba(0, 0, 0, .2), 0 1px 3px 0 rgba(0, 0, 0, .12);
color: #fff;
background-color: #26A69A;
}
.btn:hover {
background-color: #009688;
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2), 0 1px 5px 0 rgba(0, 0, 0, .12);
} }
#right { #right {
@ -298,10 +247,6 @@ body {
padding: 0; padding: 0;
/* display: none; */ /* display: none; */
box-sizing: border-box; box-sizing: border-box;
background-color: rgba(255, 255, 255, 0.0);
border: 1px solid #000;
box-shadow: 0 0 0 2px #fff,
0 0 0 3px #000;
} }
#iconExpandBtn { #iconExpandBtn {
@ -314,38 +259,25 @@ body {
} }
.warnText { .warnText {
color: #D50000;
font-weight: 700; font-weight: 700;
font-size: 14px; font-size: 14px;
line-height: 1.2em; line-height: 1.2em;
} }
.infoText {
color: #2196F3;
}
.successText { .successText {
color: #00897B;
line-height: 1.2em; line-height: 1.2em;
} }
table, td { #mapColMark, #mapRowMark {
border: 1px solid #fff;
color: #fff;
cursor: crosshair; cursor: crosshair;
} }
table.col { table.col {
position: relative; position: relative;
text-align: center; text-align: center;
border-collapse: collapse; border-collapse: collapse;
} }
table.col td {
background-color: #4DB6AC;
}
#arrColMark td { #arrColMark td {
width: 16px; width: 16px;
} }
@ -376,7 +308,6 @@ table.col td {
height: 416px; height: 416px;
width: 32px; width: 32px;
z-index: 100; z-index: 100;
background-color: rgba(38, 166, 154, .5);
} }
table.row { table.row {
@ -386,10 +317,6 @@ table.row {
border-collapse: collapse; border-collapse: collapse;
} }
table.row td {
background-color: #4C221B;
}
#arrRowMark { #arrRowMark {
top: 5px; top: 5px;
left: 2px; left: 2px;
@ -416,13 +343,10 @@ table.row td {
height: 32px; height: 32px;
width: 416px; width: 416px;
z-index: 100; z-index: 100;
background-color: rgba(76, 34, 27, .5);
} }
#menuDiv * { margin: 0; padding: 0; } #menuDiv * { margin: 0; padding: 0; }
#midMenu{ #midMenu{
background: #fff;
border-color: #ccc #666 #666 #ccc;
border-style: solid; border-style: solid;
border-width: 1px; border-width: 1px;
cursor: default; cursor: default;
@ -439,7 +363,6 @@ table.row td {
border-radius: 4px; border-radius: 4px;
} }
#midMenu .menuitem{ #midMenu .menuitem{
color: #000;
font: normal 13px Arial, sans-serif; font: normal 13px Arial, sans-serif;
list-style: none; list-style: none;
margin: 0; margin: 0;
@ -451,25 +374,17 @@ table.row td {
/* padding-right: 20px; */ /* padding-right: 20px; */
} }
#midMenu .menuitem:hover{ #midMenu .menuitem:hover{
background-color: #d6e9f8;
border-color: #d6e9f8;
border-style: dotted; border-style: dotted;
border-width: 1px 0; border-width: 1px 0;
padding-bottom: 3px; padding-bottom: 3px;
padding-top: 3px; padding-top: 3px;
} }
#midMenu .menuitem-content{ #midMenu .menuitem-content{
color: #000;
font: normal 13px Arial, sans-serif; font: normal 13px Arial, sans-serif;
} }
textarea[disabled] {
color: #999999;
}
#searchBlock { #searchBlock {
width: 100px; width: 100px;
background-color: #E9EBF2;
border-radius: 10px; border-radius: 10px;
outline: none; outline: none;
padding-left: 20px; padding-left: 20px;
@ -492,7 +407,6 @@ textarea[disabled] {
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
background: rgba(127,127,127,0.6);
z-index: 2000 z-index: 2000
} }
@ -501,7 +415,6 @@ textarea[disabled] {
top: 50%; top: 50%;
left: 50%; left: 50%;
transform: translate(-50%, -60%); transform: translate(-50%, -60%);
background: white;
width: 436px; width: 436px;
} }
@ -563,8 +476,4 @@ textarea[disabled] {
padding: 0; padding: 0;
/* display: none; */ /* display: none; */
box-sizing: border-box; box-sizing: border-box;
background-color: rgba(255, 255, 255, 0.0);
border: 1px solid #000;
box-shadow: 0 0 0 2px #fff,
0 0 0 3px #000;
} }

View File

@ -0,0 +1,555 @@
/** 配色文件:此文件包含了整个编辑器的全部配色 **/
/** ======== 编辑器主界面相关 ======== **/
/** 全局属性 **/
body {
background-color: #F5F5F5;
}
input {
color: inherit;
}
button {
color: inherit;
}
/** 可自行仿照添加更多的全局属性...... */
/** 颜色选择器 */
#colorPanel {
background-color: #F5F5F5;
}
/** 所有的阴影效果(颜色选择器、数据区、地图区、素材区等) */
#colorPanel, #left, #mid, #mid2, #right, .leftTab {
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2), 0 1px 5px 0 rgba(0, 0, 0, .12);
}
/** 地图编辑的输入框 */
#pout {
border: 1px solid #ddd;
}
/** 中间的消息提示框 */
#tip {
border: 1px solid #ccc;
}
/** 选中素材区时的方框 */
#dataSelection, .appendSelection, #selectPointBox {
background-color: rgba(255, 255, 255, 0.0);
border: 1px solid #000;
box-shadow: 0 0 0 2px #fff, 0 0 0 3px #000;
}
/** 错误消息(如保存失败) */
.warnText {
color: #D50000;
}
/** 提示消息(如告知当前图块信息) */
.infoText {
color: #2196F3;
}
/** 成功消息(如保存成功) */
.successText {
color: #00897B;
}
/** 数据库的表格相关 */
table, td {
border: 1px solid #fff;
color: #fff;
}
.coltd, .rowtd {
border: 0.230vw solid #fff;
color: #fff;
}
/** 横向标尺背景色 */
table.col td, div.col .coltd {
background-color: #4DB6AC;
}
/** 横向标尺选中时的背景色 */
#mapColMark td:hover .colBlock, #mapColMark .coltd:hover .colBlock {
background-color: rgba(38, 166, 154, .5);
}
/** 纵向标尺背景色 */
table.row td, div.row .rowtd .rowtext {
background-color: #4C221B;
}
/** 纵向标尺选中时的背景色 */
#mapRowMark td:hover .rowBlock, #mapRowMark .rowtd:hover .rowBlock {
background-color: rgba(76, 34, 27, .5);
}
/** 右键菜单栏 */
#midMenu{
color: #000;
background-color: #fff;
border-color: #ccc #666 #666 #ccc;
}
#mid .tools {
border-top: 1px solid #ccc;
}
/** 右键菜单栏的当前选中项 */
#midMenu .menuitem:hover{
background-color: #d6e9f8;
border-color: #d6e9f8;
}
/** 禁用的输入方框如ID的背景色 */
textarea[disabled] {
color: #999999;
}
/** 搜索事件块的输入框 */
#searchBlock {
background-color: #E9EBF2;
}
/** 打开浮层(变量搜索等)时页面背景 */
#uieventDiv {
background: rgba(127,127,127,0.6);
}
/** 浮层的对话框 */
#uieventDialog {
background: white;
}
/** 追加素材时的编号标记 */
#appendPicSelection span {
-webkit-text-stroke: 1px red;
text-shadow: black 1px 0, black 0 1px, black -1px 0, black 0 -1px;
}
.leftTab {
background-color: #F5F5F5;
}
/** 整个事件编辑器 */
#left6 {
background-color: rgb(245, 245, 245);
}
/** 事件编辑器右边的文本框 */
#left6 .CodeMirror {
border: 1px solid #eee;
}
/** 脚本编辑器 */
#left7 {
background-color: rgb(245, 245, 245);
}
#left7 .CodeMirror {
border: 1px solid #eee;
}
/** 数据区的表格 */
.etable table, .etable table td {
color: #000;
}
/** 数据区每行效果2n代表偶数行以此类推 */
.etable table tr {
background-color: #fff;
border-top: 1px solid #c6cbd1;
}
.etable table tr:nth-child(2n) {
background-color: #f6f8fa;
}
/** 数据区表格每列效果 */
.etable table th, .etable table td {
border: 1px solid #dfe2e5;
}
/** 鼠标悬停在数据区表格上的边框效果 */
.etable tr:not(:first-child) > :nth-child(3):hover {
border: 1px solid rgb(87, 198, 232);
box-shadow: 0px 0px 3px rgb(87, 198, 232);
}
.etable tr:not(:first-child) > :nth-child(2):hover,
.etable tr:not(:first-child) > :nth-child(1):hover {
border: 1px solid rgb(87, 232, 198);
box-shadow: 0px 0px 3px rgb(87, 232, 198);
}
/** 表格编辑的按钮颜色 */
.editorTableEditBtn {
background-color: #ddf8ff;
}
.editorTableFoldBtn {
background-color: #fff4bb;
}
/** 保存地图的按钮颜色 */
#saveFloor {
background-color: inherit;
}
#saveFloor.highlight {
background-color: #ffd700;
}
/** 解析按钮颜色 */
#blocklyParse {
background-color: inherit;
}
#blocklyParse.highlight {
background-color: #ffd700;
}
.popCheckboxItem {
color: black;
}
/** ======== blockly 相关 ======== */
/**
blockly图块的的黑暗程度用opacity表示0到1之间
0表示表示纯亮色1表示纯黑色
*/
#blocklyDarkScale {
opacity: 0;
}
/** 如果需要blockly深色模式请有选择性视情况取消注释下面几条具体功能自行研究 */
/*
.blocklyToolboxDiv {
background-color: #ddd !important;
color: black;
}
.blocklySvg {
background-color: #000;
}
.blocklyNonEditableText>rect, .blocklyEditableText>rect {
fill: #000;
fill-opacity: .4;
}
.blocklyNonEditableText>text, .blocklyEditableText>text {
fill: #fff;
}
input.blocklyHtmlInput {
color: white;
background-color: black;
}
*/
/** ======== Blockly中自动补全相关 ======== */
.awesomplete > ul {
background: #fff;
background: hsla(0,0%,100%,.9);
background: linear-gradient(to bottom right, white, hsla(0,0%,100%,.8));
border: 1px solid rgba(0,0,0,.3);
box-shadow: .05em .2em .6em rgba(0,0,0,.2);
}
.awesomplete > ul:before {
background: white;
}
.awesomplete > ul > li:hover {
background: hsl(200, 40%, 80%);
color: black;
}
.awesomplete > ul > li[aria-selected="true"] {
background: hsl(205, 40%, 40%);
color: white;
}
.awesomplete mark {
background: hsl(65, 100%, 50%);
}
.awesomplete li:hover mark {
background: hsl(68, 100%, 41%);
}
.awesomplete li[aria-selected="true"] mark {
background: hsl(86, 100%, 21%);
color: inherit;
}
/** ======== 脚本编辑相关 ======== **/
/* 很多我也不知道是干嘛的,自行根据名字猜每一项作用吧 */
.CodeMirror {
color: black;
background: white;
}
.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
background-color: white;
}
.CodeMirror-gutters {
border-right: 1px solid #ddd;
background-color: #f7f7f7;
}
.CodeMirror-linenumber {
color: #999;
}
.CodeMirror-guttermarker {
color: black;
}
.CodeMirror-guttermarker-subtle {
color: #999;
}
.CodeMirror-cursor {
border-left: 1px solid black;
}
/* Shown when moving in bi-directional text */
.CodeMirror div.CodeMirror-secondarycursor {
border-left: 1px solid silver;
}
.cm-fat-cursor .CodeMirror-cursor {
background: #7e7;
}
.cm-fat-cursor-mark {
background-color: rgba(20, 255, 20, 0.5);
}
.cm-animate-fat-cursor {
background-color: #7e7;
}
.CodeMirror-ruler {
border-left: 1px solid #ccc;
}
/* DEFAULT THEME */
.cm-s-default .cm-header {
color: blue;
}
.cm-s-default .cm-quote {
color: #090;
}
.cm-negative {
color: #d44;
}
.cm-positive {
color: #292;
}
.cm-s-default .cm-keyword {
color: #708;
}
.cm-s-default .cm-atom {
color: #219;
}
.cm-s-default .cm-number {
color: #164;
}
.cm-s-default .cm-def {
color: #00f;
}
.cm-s-default .cm-variable-2 {
color: #05a;
}
.cm-s-default .cm-variable-3, .cm-s-default .cm-type {
color: #085;
}
.cm-s-default .cm-comment {
color: #a50;
}
.cm-s-default .cm-string {
color: #a11;
}
.cm-s-default .cm-string-2 {
color: #f50;
}
.cm-s-default .cm-meta {
color: #555;
}
.cm-s-default .cm-qualifier {
color: #555;
}
.cm-s-default .cm-builtin {
color: #30a;
}
.cm-s-default .cm-bracket {
color: #997;
}
.cm-s-default .cm-tag {
color: #170;
}
.cm-s-default .cm-attribute {
color: #00c;
}
.cm-s-default .cm-hr {
color: #999;
}
.cm-s-default .cm-link {
color: #00c;
}
.cm-s-default .cm-error {
color: #f00;
}
.cm-invalidchar {
color: #f00;
}
/* Default styles for common addons */
div.CodeMirror span.CodeMirror-matchingbracket {
color: #0b0;
}
div.CodeMirror span.CodeMirror-nonmatchingbracket {
color: #a22;
}
.CodeMirror-matchingtag {
background: rgba(255, 150, 0, .3);
}
.CodeMirror-activeline-background {
background: #e8f2ff;
}
.CodeMirror-selected {
background: #d9d9d9;
}
.CodeMirror-focused .CodeMirror-selected {
background: #d7d4f0;
}
.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection {
background: #d7d4f0;
}
.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection {
background: #d7d4f0;
}
.cm-searching {
background-color: #ffa;
background-color: rgba(255, 255, 0, .4);
}
/* 代码补全提示相关 */
.cm-matchhighlight {
background-color: #dedede
}
.CodeMirror-hints {
border: 1px solid silver;
background: white;
-webkit-box-shadow: 2px 3px 5px rgba(0, 0, 0, .2);
-moz-box-shadow: 2px 3px 5px rgba(0, 0, 0, .2);
box-shadow: 2px 3px 5px rgba(0, 0, 0, .2);
}
.CodeMirror-hint {
color: black;
}
li.CodeMirror-hint-active {
background: #08f;
color: white;
}
/* 代码语法检查相关相关 */
.CodeMirror-lint-tooltip {
background-color: #ffd;
border: 1px solid black;
color: black;
}
.CodeMirror-lint-mark-error {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJDw4cOCW1/KIAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAHElEQVQI12NggIL/DAz/GdA5/xkY/qPKMDAwAADLZwf5rvm+LQAAAABJRU5ErkJggg==");
}
.CodeMirror-lint-mark-warning {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJFhQXEbhTg7YAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAMklEQVQI12NkgIIvJ3QXMjAwdDN+OaEbysDA4MPAwNDNwMCwiOHLCd1zX07o6kBVGQEAKBANtobskNMAAAAASUVORK5CYII=");
}
.CodeMirror-lint-marker-error, .CodeMirror-lint-message-error {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAHlBMVEW7AAC7AACxAAC7AAC7AAAAAAC4AAC5AAD///+7AAAUdclpAAAABnRSTlMXnORSiwCK0ZKSAAAATUlEQVR42mWPOQ7AQAgDuQLx/z8csYRmPRIFIwRGnosRrpamvkKi0FTIiMASR3hhKW+hAN6/tIWhu9PDWiTGNEkTtIOucA5Oyr9ckPgAWm0GPBog6v4AAAAASUVORK5CYII=");
}
.CodeMirror-lint-marker-warning, .CodeMirror-lint-message-warning {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAANlBMVEX/uwDvrwD/uwD/uwD/uwD/uwD/uwD/uwD/uwD6twD/uwAAAADurwD2tQD7uAD+ugAAAAD/uwDhmeTRAAAADHRSTlMJ8mN1EYcbmiixgACm7WbuAAAAVklEQVR42n3PUQqAIBBFUU1LLc3u/jdbOJoW1P08DA9Gba8+YWJ6gNJoNYIBzAA2chBth5kLmG9YUoG0NHAUwFXwO9LuBQL1giCQb8gC9Oro2vp5rncCIY8L8uEx5ZkAAAAASUVORK5CYII=");
}
.CodeMirror-lint-marker-multiple {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAMAAADzjKfhAAAACVBMVEUAAAAAAAC/v7914kyHAAAAAXRSTlMAQObYZgAAACNJREFUeNo1ioEJAAAIwmz/H90iFFSGJgFMe3gaLZ0od+9/AQZ0ADosbYraAAAAAElFTkSuQmCC");
}
/* 代码补全的对话框(提供搜索功能)相关 */
.CodeMirror-dialog-top {
border-bottom: 1px solid #eee;
}
.CodeMirror-dialog-bottom {
border-top: 1px solid #eee;
}
/* 搜索项的背景色 */
.CodeMirror-focused .cm-matchhighlight {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFklEQVQI12NgYGBgkKzc8x9CMDAwAAAmhwSbidEoSQAAAABJRU5ErkJggg==);
background-position: bottom;
background-repeat: repeat-x;
}
.cm-matchhighlight {background-color: lightgreen}
.CodeMirror-selection-highlight-scrollbar {background-color: yellowgreen}
.CodeMirror-search-hint {
color: #888;
}
/* 增强的代码补全系统相关 */
/* 变量类型 */
.CodeMirror-Tern-completion:before {
color: white;
}
.CodeMirror-Tern-completion-unknown:before {
content: "?";
background: #4bb;
}
.CodeMirror-Tern-completion-object:before {
content: "O";
background: #77c;
}
.CodeMirror-Tern-completion-fn:before {
content: "F";
background: #7c7;
}
.CodeMirror-Tern-completion-array:before {
content: "A";
background: #c66;
}
.CodeMirror-Tern-completion-number:before {
content: "1";
background: #999;
}
.CodeMirror-Tern-completion-string:before {
content: "S";
background: #999;
}
.CodeMirror-Tern-completion-bool:before {
content: "B";
background: #999;
}
.CodeMirror-Tern-completion-guess {
color: #999;
}
/* 额外提示框(如文档) */
.CodeMirror-Tern-tooltip {
border: 1px solid silver;
color: #444;
background-color: white;
-webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
box-shadow: 2px 3px 5px rgba(0,0,0,.2);
}
.CodeMirror-Tern-fname { color: black; }
.CodeMirror-Tern-farg { color: #70a; }
.CodeMirror-Tern-type { color: #07c; }
.CodeMirror-foldmarker {
color: blue;
text-shadow: #b9f 1px 1px 2px, #b9f -1px -1px 2px, #b9f 1px -1px 2px, #b9f -1px 1px 2px;
}

View File

@ -12,7 +12,6 @@ html, body, div, img {
body { body {
font-family: Roboto, "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;; font-family: Roboto, "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;;
background-color: #F5F5F5;
} }
/* ::-webkit-scrollbar { /* ::-webkit-scrollbar {
@ -28,7 +27,6 @@ body {
/* border-radius: 2px; /* border-radius: 2px;
box-sizing: border-box; box-sizing: border-box;
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2), 0 1px 5px 0 rgba(0, 0, 0, .12); */ box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2), 0 1px 5px 0 rgba(0, 0, 0, .12); */
background-color: #F5F5F5;
width: 100vw; width: 100vw;
height: 100vw; height: 100vw;
} }
@ -59,7 +57,6 @@ body {
font-size: 12px; font-size: 12px;
font-family: 'Lucida Console', Monaco, monospace; font-family: 'Lucida Console', Monaco, monospace;
white-space: pre; white-space: pre;
border: 1px solid #ddd;
border-radius: 2px; border-radius: 2px;
overflow: auto; overflow: auto;
} }
@ -136,7 +133,6 @@ body {
height: 180px; height: 180px;
left: 0; left: 0;
bottom: 0; bottom: 0;
border-top: 1px solid #ccc;
padding: 10px 5px; padding: 10px 5px;
margin-left: 8px;; margin-left: 8px;;
box-sizing: border-box; box-sizing: border-box;
@ -150,7 +146,6 @@ body {
padding: 5px 10px 10px 10px; padding: 5px 10px 10px 10px;
margin-right: 0; margin-right: 0;
box-sizing: border-box; box-sizing: border-box;
border: 1px solid #ccc;
border-radius: 2px; border-radius: 2px;
font-size: 1rem; font-size: 1rem;
line-height: 1.2rem; line-height: 1.2rem;
@ -167,20 +162,6 @@ body {
margin-top: 15px; margin-top: 15px;
} }
.input {
display: block;
max-width: 150px;
height: 20px;
padding: 6px 12px;
font-size: 14px;
margin-top: 10px;
color: #555;
background-color: #fff;
border: 1px solid #ccc;
border-radius: 3px;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
}
#bgSelect { #bgSelect {
width: 50%; width: 50%;
height: 100px; height: 100px;
@ -196,37 +177,6 @@ body {
#printOut { #printOut {
margin-top: 10px; margin-top: 10px;
height: 20px; height: 20px;
}
.btn {
width: 80px;
border-radius: 2px;
line-height: 30px;
margin: 0;
min-width: 50px;
padding: 0 5px;
display: inline-block;
margin-top: 5px;
font-size: 14px;
font-weight: 400;
/* text-transform: uppercase; */
letter-spacing: 0;
overflow: hidden;
cursor: pointer;
text-decoration: none;
text-align: center;
vertical-align: middle;
border: 0;
background: rgba(158, 158, 158, .2);
box-shadow: 0 1px 1px 0 rgba(0, 0, 0, .14), 0 2px 1px -1px rgba(0, 0, 0, .2), 0 1px 3px 0 rgba(0, 0, 0, .12);
color: #fff;
background-color: #26A69A;
}
.btn:hover {
background-color: #009688;
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2), 0 1px 5px 0 rgba(0, 0, 0, .12);
} }
#right { #right {
@ -266,10 +216,6 @@ body {
padding: 0; padding: 0;
/* display: none; */ /* display: none; */
box-sizing: border-box; box-sizing: border-box;
background-color: rgba(255, 255, 255, 0.0);
border: 1px solid #000;
box-shadow: 0 0 0 2px #fff,
0 0 0 3px #000;
} }
#iconExpandBtn { #iconExpandBtn {
@ -282,24 +228,16 @@ body {
} }
.warnText { .warnText {
color: #D50000;
font-weight: 700; font-weight: 700;
font-size: 14px; font-size: 14px;
line-height: 1.2em; line-height: 1.2em;
} }
.infoText {
color: #2196F3;
}
.successText { .successText {
color: #00897B;
line-height: 1.2em; line-height: 1.2em;
} }
td, .coltd, .rowtd { td, .coltd, .rowtd {
border: 0.230vw solid #fff;
color: #fff;
cursor: crosshair; cursor: crosshair;
} }
@ -310,11 +248,6 @@ table.col, div.col {
border-collapse: collapse; border-collapse: collapse;
} }
table.col td,
div.col .coltd {
background-color: #4DB6AC;
}
#arrColMark td { #arrColMark td {
width: 16px; width: 16px;
} }
@ -358,7 +291,6 @@ div.col .coltd {
height: 96vw; height: 96vw;
width: 7.384615vw; width: 7.384615vw;
z-index: 100; z-index: 100;
background-color: rgba(38, 166, 154, .5);
} }
table.row,div.row, table.row,div.row,
@ -370,11 +302,6 @@ table.row,div.row .rowtext {
border-collapse: collapse; border-collapse: collapse;
} }
table.row td,
div.row .rowtd .rowtext{
background-color: #4C221B;
}
#arrRowMark { #arrRowMark {
top: 5px; top: 5px;
left: 0; left: 0;
@ -415,13 +342,10 @@ div.row .rowtd .rowtext{
height: 7.384615vw; height: 7.384615vw;
width: 96vw; width: 96vw;
z-index: 100; z-index: 100;
background-color: rgba(76, 34, 27, .5);
} }
#menuDiv * { margin: 0; padding: 0; } #menuDiv * { margin: 0; padding: 0; }
#midMenu{ #midMenu{
background: #fff;
border-color: #ccc #666 #666 #ccc;
border-style: solid; border-style: solid;
border-width: 1px; border-width: 1px;
cursor: default; cursor: default;
@ -438,7 +362,6 @@ div.row .rowtd .rowtext{
border-radius: 4px; border-radius: 4px;
} }
#midMenu .menuitem{ #midMenu .menuitem{
color: #000;
font: normal 2.5vw Arial, sans-serif; font: normal 2.5vw Arial, sans-serif;
list-style: none; list-style: none;
margin: 0; margin: 0;
@ -450,22 +373,15 @@ div.row .rowtd .rowtext{
/* padding-right: 20px; */ /* padding-right: 20px; */
} }
#midMenu .menuitem:hover{ #midMenu .menuitem:hover{
background-color: #d6e9f8;
border-color: #d6e9f8;
border-style: dotted; border-style: dotted;
border-width: 1px 0; border-width: 1px 0;
padding-bottom: 3px; padding-bottom: 3px;
padding-top: 3px; padding-top: 3px;
} }
#midMenu .menuitem-content{ #midMenu .menuitem-content{
color: #000;
font: normal 2.5vw Arial, sans-serif; font: normal 2.5vw Arial, sans-serif;
} }
textarea[disabled] {
color: #999999;
}
#down{ #down{
position: absolute; position: absolute;
left:0; left:0;
@ -481,9 +397,7 @@ textarea[disabled] {
z-index: 240; z-index: 240;
padding: 4px 6px; padding: 4px 6px;
margin-top: 6px; margin-top: 6px;
background-color: #F5F5F5;
box-sizing: border-box; box-sizing: border-box;
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2), 0 1px 5px 0 rgba(0, 0, 0, .12);
} }
#colorPicker { #colorPicker {
@ -499,7 +413,6 @@ textarea[disabled] {
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
background: rgba(127,127,127,0.6);
z-index: 2000 z-index: 2000
} }
@ -508,7 +421,6 @@ textarea[disabled] {
top: 50%; top: 50%;
left: 0; left: 0;
transform: translateY(-50%); transform: translateY(-50%);
background: white;
width: 100vw; width: 100vw;
} }
@ -570,8 +482,4 @@ textarea[disabled] {
padding: 0; padding: 0;
/* display: none; */ /* display: none; */
box-sizing: border-box; box-sizing: border-box;
background-color: rgba(255, 255, 255, 0.0); }
border: 1px solid #000;
box-shadow: 0 0 0 2px #fff,
0 0 0 3px #000;
}

View File

@ -1,10 +1,6 @@
.leftTab { .leftTab {
border-radius: 2px; border-radius: 2px;
box-sizing: border-box; box-sizing: border-box;
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2), 0 1px 5px 0 rgba(0, 0, 0, .12);
}
.leftTab {
overflow: auto; overflow: auto;
position: absolute; position: absolute;
bottom: 0; bottom: 0;
@ -42,16 +38,13 @@
#appendPicSelection span { #appendPicSelection span {
position: absolute; position: absolute;
font-size: 11px; font-size: 11px;
-webkit-text-stroke: 1px red; }
text-shadow: black 1px 0, black 0 1px, black -1px 0, black 0 -1px;
}
#left6 { #left6 {
left: 5px; left: 5px;
top: 5px; top: 5px;
z-index: 200; z-index: 200;
position: fixed; position: fixed;
background-color: rgb(245, 245, 245);
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
@ -68,7 +61,6 @@
} }
#left6 .CodeMirror { #left6 .CodeMirror {
border: 1px solid #eee;
float: left; float: left;
height: 95%; height: 95%;
width: 35%; width: 35%;
@ -86,7 +78,6 @@
top: 5px; top: 5px;
z-index: 200; z-index: 200;
position: fixed; position: fixed;
background-color: rgb(245, 245, 245);
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
@ -94,15 +85,12 @@
#left7 .CodeMirror { #left7 .CodeMirror {
/* border-top: 1px solid black; /* border-top: 1px solid black;
border-bottom: 1px solid black; */ border-bottom: 1px solid black; */
border: 1px solid #eee;
font-size: 14px; font-size: 14px;
height: 95%; height: 95%;
width: 95%; width: 95%;
} }
.etable table, .etable table, .etable table td {
.etable table td {
color: #000;
cursor: auto; cursor: auto;
} }
@ -131,16 +119,6 @@
.etable table th, .etable table th,
.etable table td { .etable table td {
padding: 5px; padding: 5px;
border: 1px solid #dfe2e5;
}
.etable table tr {
background-color: #fff;
border-top: 1px solid #c6cbd1;
}
.etable table tr:nth-child(2n) {
background-color: #f6f8fa;
} }
/* copy end --------------------------------------------- */ /* copy end --------------------------------------------- */
@ -170,17 +148,6 @@
overflow: visible; overflow: visible;
} }
.etable tr:not(:first-child) > :nth-child(3):hover {
border: 1px solid rgb(87, 198, 232);
box-shadow: 0px 0px 3px rgb(87, 198, 232);
}
.etable tr:not(:first-child) > :nth-child(2):hover,
.etable tr:not(:first-child) > :nth-child(1):hover {
border: 1px solid rgb(87, 232, 198);
box-shadow: 0px 0px 3px rgb(87, 232, 198);
}
.etable tr:not(:first-child) > :nth-child(3) { .etable tr:not(:first-child) > :nth-child(3) {
margin: 0; margin: 0;
padding: 0; padding: 0;
@ -212,7 +179,6 @@ div.checkboxSet {
padding: 0; padding: 0;
height: 100%; height: 100%;
width: 100%; width: 100%;
background-color: rgba(255, 255, 255, 0);
border: none; border: none;
} }

View File

@ -1,8 +1,4 @@
.leftTab { .leftTab {
/* border-radius: 2px;
box-sizing: border-box;
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2), 0 1px 5px 0 rgba(0, 0, 0, .12); */
background-color: #F5F5F5;
width: 100vw; width: 100vw;
height: 100vw; height: 100vw;
} }
@ -44,8 +40,6 @@
#appendPicSelection span { #appendPicSelection span {
position: absolute; position: absolute;
font-size: 11px; font-size: 11px;
-webkit-text-stroke: 1px red;
text-shadow: black 1px 0, black 0 1px, black -1px 0, black 0 -1px;
} }
#left6 { #left6 {
@ -53,7 +47,6 @@
top: 0; top: 0;
z-index: 200; z-index: 200;
position: fixed; position: fixed;
background-color: rgb(245, 245, 245);
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
@ -75,8 +68,6 @@
} }
#left6 .CodeMirror { #left6 .CodeMirror {
border: 1px solid #eee;
height: 38vw; height: 38vw;
width: 100%; width: 100%;
} }
@ -100,15 +91,11 @@
top: 0; top: 0;
z-index: 200; z-index: 200;
position: fixed; position: fixed;
background-color: rgb(245, 245, 245);
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
#left7 .CodeMirror { #left7 .CodeMirror {
/* border-top: 1px solid black;
border-bottom: 1px solid black; */
border: 1px solid #eee;
font-size: 14px; font-size: 14px;
height: 95%; height: 95%;
width: 95%; width: 95%;
@ -116,7 +103,6 @@
.etable table, .etable table,
.etable table td { .etable table td {
color: #000;
cursor: auto; cursor: auto;
} }
@ -145,16 +131,6 @@
.etable table th, .etable table th,
.etable table td { .etable table td {
padding: 5px; padding: 5px;
border: 1px solid #dfe2e5;
}
.etable table tr {
background-color: #fff;
border-top: 1px solid #c6cbd1;
}
.etable table tr:nth-child(2n) {
background-color: #f6f8fa;
} }
/* copy end --------------------------------------------- */ /* copy end --------------------------------------------- */
@ -184,17 +160,6 @@
overflow: visible; overflow: visible;
} }
.etable tr:not(:first-child) > :nth-child(3):hover {
border: 1px solid rgb(87, 198, 232);
box-shadow: 0px 0px 3px rgb(87, 198, 232);
}
.etable tr:not(:first-child) > :nth-child(2):hover,
.etable tr:not(:first-child) > :nth-child(1):hover {
border: 1px solid rgb(87, 232, 198);
box-shadow: 0px 0px 3px rgb(87, 232, 198);
}
.etable tr:not(:first-child) > :nth-child(3) { .etable tr:not(:first-child) > :nth-child(3) {
margin: 0; margin: 0;
padding: 0; padding: 0;

View File

@ -147,7 +147,8 @@ editor_blockly = function () {
editor_blockly.highlightParse = function (shouldHighLight) { editor_blockly.highlightParse = function (shouldHighLight) {
if (shouldNotifyParse == shouldHighLight) return; if (shouldNotifyParse == shouldHighLight) return;
shouldNotifyParse = shouldHighLight; shouldNotifyParse = shouldHighLight;
blocklyParseBtn.style.background = shouldNotifyParse ? '#ffd700' : 'unset'; if (shouldHighLight) blocklyParseBtn.classList.add('highlight');
else blocklyParseBtn.classList.remove('highlight');
} }
editor_blockly.cancel = function () { editor_blockly.cancel = function () {
@ -689,51 +690,8 @@ editor_blockly = function () {
editor_blockly.completeItems = []; editor_blockly.completeItems = [];
editor_blockly.setTheme=function (theme) { editor_blockly.setDarkScale=function (globalScale) {
var blocklyAddtionStyleNode; if (globalScale > 0) {
blocklyAddtionStyleNode=document.getElementById('blocklyAddtionStyleNode_jxzdiv2v376fvcw7v')
if (blocklyAddtionStyleNode==null) {
blocklyAddtionStyleNode=document.createElement('style')
blocklyAddtionStyleNode.setAttribute('id','blocklyAddtionStyleNode_jxzdiv2v376fvcw7v')
document.head.appendChild(blocklyAddtionStyleNode)
var updateColour = Blockly.BlockSvg.prototype.updateColour
var setShadowColour_ = Blockly.BlockSvg.prototype.setShadowColour_
var setBorderColour_ = Blockly.BlockSvg.prototype.setBorderColour_
}
if (theme==='light') {
blocklyAddtionStyleNode.innerHTML=``
Blockly.BlockSvg.prototype.updateColour=updateColour
Blockly.BlockSvg.prototype.setShadowColour_=setShadowColour_
Blockly.BlockSvg.prototype.setBorderColour_=setBorderColour_
}
if (theme=='dark') {
// 改这个调整方块黑的程度 0~1, 越大越黑
var globalScale=0.1
blocklyAddtionStyleNode.innerHTML=`
.blocklySvg {
background-color: #000;
}
.blocklyNonEditableText>rect, .blocklyEditableText>rect {
fill: #000;
fill-opacity: .4;
}
.blocklyNonEditableText>text, .blocklyEditableText>text {
fill: #fff;
}
input.blocklyHtmlInput {
color: white;
background-color: black;
}
`
Blockly.BlockSvg.prototype.updateColour = function() { Blockly.BlockSvg.prototype.updateColour = function() {
if (this.disabled) { if (this.disabled) {
// Disabled blocks don't have colour. // Disabled blocks don't have colour.
@ -744,19 +702,19 @@ editor_blockly = function () {
var colourTertiary = this.getColourTertiary(); var colourTertiary = this.getColourTertiary();
var rgb = goog.color.darken(goog.color.hexToRgb(hexColour),globalScale); var rgb = goog.color.darken(goog.color.hexToRgb(hexColour),globalScale);
hexColour = goog.color.rgbArrayToHex(rgb); hexColour = goog.color.rgbArrayToHex(rgb);
if (this.isShadow()) { if (this.isShadow()) {
hexColour = this.setShadowColour_(rgb, colourSecondary); hexColour = this.setShadowColour_(rgb, colourSecondary);
} else { } else {
this.setBorderColour_(rgb, colourTertiary); this.setBorderColour_(rgb, colourTertiary);
} }
this.svgPath_.setAttribute('fill', hexColour); this.svgPath_.setAttribute('fill', hexColour);
var icons = this.getIcons(); var icons = this.getIcons();
for (var i = 0; i < icons.length; i++) { for (var i = 0; i < icons.length; i++) {
icons[i].updateColour(); icons[i].updateColour();
} }
// Bump every dropdown to change its colour. // Bump every dropdown to change its colour.
// TODO (#1456) // TODO (#1456)
for (var x = 0, input; input = this.inputList[x]; x++) { for (var x = 0, input; input = this.inputList[x]; x++) {
@ -765,8 +723,7 @@ editor_blockly = function () {
} }
} }
} }
;
Blockly.BlockSvg.prototype.setShadowColour_ = function(a, b) { Blockly.BlockSvg.prototype.setShadowColour_ = function(a, b) {
if (b) { if (b) {
this.svgPathLight_.style.display = "none"; this.svgPathLight_.style.display = "none";
@ -780,8 +737,7 @@ editor_blockly = function () {
this.svgPathDark_.setAttribute("fill", c); this.svgPathDark_.setAttribute("fill", c);
return c return c
} }
;
Blockly.BlockSvg.prototype.setBorderColour_ = function(a, b) { Blockly.BlockSvg.prototype.setBorderColour_ = function(a, b) {
if (b) if (b)
this.svgPathLight_.setAttribute("stroke", "none"), this.svgPathLight_.setAttribute("stroke", "none"),
@ -795,12 +751,14 @@ editor_blockly = function () {
this.svgPathDark_.setAttribute("fill", d); this.svgPathDark_.setAttribute("fill", d);
this.svgPath_.setAttribute("stroke", "none") this.svgPath_.setAttribute("stroke", "none")
} }
} }
;
} }
} }
var computedStyle = window.getComputedStyle(document.getElementById('blocklyDarkScale')) || {};
editor_blockly.setDarkScale(parseFloat(computedStyle.opacity) || 0);
return editor_blockly; return editor_blockly;
} }

View File

@ -816,12 +816,12 @@ editor_mappanel_wrapper = function (editor) {
editor.uifunctions.highlightSaveFloorButton=function(){ editor.uifunctions.highlightSaveFloorButton=function(){
var saveFloor = document.getElementById('saveFloor'); var saveFloor = document.getElementById('saveFloor');
saveFloor.style.background='#ffd700'; saveFloor.classList.add('highlight');
} }
editor.uifunctions.unhighlightSaveFloorButton=function(){ editor.uifunctions.unhighlightSaveFloorButton=function(){
var saveFloor = document.getElementById('saveFloor'); var saveFloor = document.getElementById('saveFloor');
saveFloor.style.background=''; saveFloor.classList.remove('highlight');
} }
editor.uifunctions.saveFloor_func = function () { editor.uifunctions.saveFloor_func = function () {

View File

@ -53,9 +53,9 @@ editor_table_wrapper = function (editor) {
var list = []; var list = [];
if (showComment) list.push("<button onclick='editor.table.onCommentBtnClick(this)'>注释</button>"); if (showComment) list.push("<button onclick='editor.table.onCommentBtnClick(this)'>注释</button>");
if (type != 'select' && type != 'checkbox' && type != 'checkboxSet' && type != 'popCheckboxSet' && type != 'disable') if (type != 'select' && type != 'checkbox' && type != 'checkboxSet' && type != 'popCheckboxSet' && type != 'disable')
list.push("<button onclick='editor.table.onEditBtnClick(this)' style='background-color: #ddf8ff'>编辑</button>"); list.push("<button onclick='editor.table.onEditBtnClick(this)' class='editorTableEditBtn'>编辑</button>");
if (type == 'popCheckboxSet') if (type == 'popCheckboxSet')
list.push("<button onclick='editor.table.onEditBtnClick(this)' style='background-color: #ddf8ff'>多选框编辑</button>"); list.push("<button onclick='editor.table.onEditBtnClick(this)' class='editorTableEditBtn'>多选框编辑</button>");
if (type == 'disable') list.push("<button onclick='editor.table.onCopyBtnClick(this)'>复制</button>"); if (type == 'disable') list.push("<button onclick='editor.table.onCopyBtnClick(this)'>复制</button>");
return list.join(' '); return list.join(' ');
} }
@ -74,7 +74,7 @@ editor_table_wrapper = function (editor) {
<td>----</td> <td>----</td>
<td>----</td> <td>----</td>
<td>${field}</td> <td>${field}</td>
<td><button style="background: #fff4bb" onclick='editor.table.onFoldBtnClick(this)' data-fold="${ status ? "true" : "false" }">${ status ? "展开" : "折叠" }</button></td> <td><button class='editorTableFoldBtn' onclick='editor.table.onFoldBtnClick(this)' data-fold="${ status ? "true" : "false" }">${ status ? "展开" : "折叠" }</button></td>
</tr>\n` </tr>\n`
} }

View File

@ -930,7 +930,7 @@ editor_ui_wrapper = function (editor) {
if (index % 3 == 0) { if (index % 3 == 0) {
table += '<tr>'; table += '<tr>';
} }
table += `<td style='color:black'>${prefixStrings[index]}<input type="checkbox" _type="${typeof one}" key="${one}" class="uieventCheckboxSet" ${value.indexOf(one) >= 0? 'checked' : ''}/></td>`; table += `<td class='popCheckboxItem'>${prefixStrings[index]}<input type="checkbox" _type="${typeof one}" key="${one}" class="uieventCheckboxSet" ${value.indexOf(one) >= 0? 'checked' : ''}/></td>`;
if (index % 3 == 2) { if (index % 3 == 2) {
table += '</tr>'; table += '</tr>';
} }

View File

@ -24,7 +24,6 @@
list-style: none; list-style: none;
padding: 0; padding: 0;
margin: 0; margin: 0;
background: #fff;
} }
.awesomplete > ul:empty { .awesomplete > ul:empty {
@ -34,10 +33,6 @@
.awesomplete > ul { .awesomplete > ul {
border-radius: .3em; border-radius: .3em;
margin: .8em 0 0; margin: .8em 0 0;
background: hsla(0,0%,100%,.9);
background: linear-gradient(to bottom right, white, hsla(0,0%,100%,.8));
border: 1px solid rgba(0,0,0,.3);
box-shadow: .05em .2em .6em rgba(0,0,0,.2);
text-shadow: none; text-shadow: none;
} }
@ -64,7 +59,6 @@
left: 1em; left: 1em;
width: 0; height: 0; width: 0; height: 0;
padding: .4em; padding: .4em;
background: white;
border: inherit; border: inherit;
border-right: 0; border-right: 0;
border-bottom: 0; border-bottom: 0;
@ -78,26 +72,3 @@
cursor: pointer; cursor: pointer;
word-break: keep-all; word-break: keep-all;
} }
.awesomplete > ul > li:hover {
background: hsl(200, 40%, 80%);
color: black;
}
.awesomplete > ul > li[aria-selected="true"] {
background: hsl(205, 40%, 40%);
color: white;
}
.awesomplete mark {
background: hsl(65, 100%, 50%);
}
.awesomplete li:hover mark {
background: hsl(68, 100%, 41%);
}
.awesomplete li[aria-selected="true"] mark {
background: hsl(86, 100%, 21%);
color: inherit;
}

View File

@ -7,6 +7,7 @@
<link href="_server/CodeMirror/codemirror.css" rel="stylesheet"> <link href="_server/CodeMirror/codemirror.css" rel="stylesheet">
<link href="_server/thirdparty/awesomplete.css" rel="stylesheet"> <link href="_server/thirdparty/awesomplete.css" rel="stylesheet">
<link href="_server/css/editor_mode_mobile.css" rel="stylesheet"> <link href="_server/css/editor_mode_mobile.css" rel="stylesheet">
<link href="_server/css/editor_color.css" rel="stylesheet">
<link rel="icon" href="data:;base64,iVBORw0KGgo="> <link rel="icon" href="data:;base64,iVBORw0KGgo=">
</head> </head>
<body> <body>
@ -225,6 +226,7 @@
</xml> </xml>
</h3> </h3>
<div style="position: relative;height: 100%"> <div style="position: relative;height: 100%">
<div id="blocklyDarkScale" style="display: none;"></div>
<div id="blocklyArea"> <div id="blocklyArea">
<div id="blocklyDiv"></div> <div id="blocklyDiv"></div>
</div> </div>

View File

@ -6,6 +6,7 @@
<link href="_server/CodeMirror/codemirror.css" rel="stylesheet"> <link href="_server/CodeMirror/codemirror.css" rel="stylesheet">
<link href="_server/thirdparty/awesomplete.css" rel="stylesheet"> <link href="_server/thirdparty/awesomplete.css" rel="stylesheet">
<link href="_server/css/editor_mode.css" rel="stylesheet"> <link href="_server/css/editor_mode.css" rel="stylesheet">
<link href="_server/css/editor_color.css" rel="stylesheet">
<link rel="icon" href="data:;base64,iVBORw0KGgo="> <link rel="icon" href="data:;base64,iVBORw0KGgo=">
</head> </head>
<body> <body>
@ -220,6 +221,7 @@
</xml> </xml>
</h3> </h3>
<div style="position: relative;height: 100%"> <div style="position: relative;height: 100%">
<div id="blocklyDarkScale" style="display: none;"></div>
<div id="blocklyArea"> <div id="blocklyArea">
<div id="blocklyDiv"></div> <div id="blocklyDiv"></div>
</div> </div>