diff --git a/frame.js b/frame.js index c3cf2a5b..8ff256f9 100644 --- a/frame.js +++ b/frame.js @@ -17,10 +17,10 @@ Volcanos(chat.ONENGINE, {_init: function(can, meta, list, cb, target) { can.onengine.listen(can, chat.ONSEARCH, function(msg, arg) { arg[0] == ctx.COMMAND && can.run(msg, ["can.command"]) }) can.onengine.signal(can, chat.ONMAIN, can.request()), can.base.isFunc(cb) && cb(can) }) - can.onappend.topic(can, "dark", {topic: "#0d1117", plugin: "#030507", input: "#212121", output: "#0d1117", table: "#030507", - hover: "#3f3f46", border: "#3a3f47", label: "#c9d1d9", text: "white", warn: "red", notice: "blue"}), - can.onappend.topic(can, "light", {topic: "white", plugin: "#f3f5f6", input: "white", output: "white", table: "#f3f5f6", - hover: "#E1F2F4", border: "#0000", label: "black", text: "black", warn: "red", notice: "blue"}) + can.onappend.topic(can, "dark", {topic: "black", plugin: "black", input: "#212121", output: "#0d1117", table: "black", + hover: "#212121", border: "gray", label: "silver", text: "white", warn: "red", notice: "blue"}), + can.onappend.topic(can, "light", {topic: "white", plugin: "aliceblue", input: "white", output: "white", table: "aliceblue", + hover: "aliceblue", border: "transparent", label: "black", text: "black", warn: "red", notice: "blue"}) can.onappend.icon(can, { 16: { open: [-27, -158], @@ -365,7 +365,7 @@ Volcanos(chat.ONAPPEND, {_init: function(can, meta, list, cb, target, field) { }).join(ice.NL) }).join(ice.NL) can.page.Append(can, document.head, ctx.STYLE, {"innerText": text}), console.log("icon", text) }, - topic: function(can, topic, color, style, list) { const SOLID = " solid 1px", GLASS = "#0000" + topic: function(can, topic, color, style, list) { const SOLID = " solid 1px", GLASS = "transparent" const INPUT_STYLE = "input-style", INPUT_HOVER_STYLE = "input-hover-style", OUTPUT_STYLE = "output-style", GLASS_STYLE = "glass-style" const TABLE_HEAD_STYLE = "table-head-style", TABLE_HEAD_HOVER_STYLE = "table-head-hover-style", TABLE_ROW_HOVER_STYLE = "table-row-hover-style", TABLE_CELL_HOVER_STYLE = "table-cell-hover-style" const ITEM_HOVER_STYLE = "item-hover-style", CARTE_ITEM_HOVER_STYLE = "carte-item-hover-style", CARTE_ITEM_STYLE = "carte-item-style" @@ -377,7 +377,7 @@ Volcanos(chat.ONAPPEND, {_init: function(can, meta, list, cb, target, field) { INPUT_STYLE, _bg(color.input, html.COLOR, color.label, html.BORDER, color.border+SOLID, "border-radius", "5px", "outline", html.NONE, "box-shadow", html.NONE), INPUT_HOVER_STYLE, _fg(color.text, html.BORDER, color.text+SOLID), OUTPUT_STYLE, _bg(color.output), GLASS_STYLE, _bg(GLASS), TABLE_HEAD_STYLE, _bg(color.table, html.COLOR, color.label), TABLE_HEAD_HOVER_STYLE, _bg(color.table, html.COLOR, text), - TABLE_ROW_HOVER_STYLE, _bg(color.table), TABLE_CELL_HOVER_STYLE, _bg(color.hover), ITEM_HOVER_STYLE, _bg(color.hover, html.COLOR, color.text), CARTE_ITEM_HOVER_STYLE, _bg(color.hover, html.COLOR, color.text), + TABLE_ROW_HOVER_STYLE, _bg(color.table), TABLE_CELL_HOVER_STYLE, _bg(color.hover), ITEM_HOVER_STYLE, _bg(color.hover, html.COLOR, color.text), CARTE_ITEM_HOVER_STYLE, _bg(color.input, html.COLOR, color.text), PANEL_STYLE, _bg(color.topic, html.COLOR, color.label), PLUGIN_STYLE, _bg(color.plugin, "border-radius", "10px"), ), list = list||[ {type: "", style: _fg(color.label)}, @@ -391,6 +391,18 @@ Volcanos(chat.ONAPPEND, {_init: function(can, meta, list, cb, target, field) { {type: html.DIV_ACTION, list: [{type: html.DIV_ITEM, name: [html.SELECT], style: [GLASS_STYLE]}]}, {type: html.DIV_ACTION, list: [{type: html.DIV_ITEM, name: [html.HOVER], style: [GLASS_STYLE]}]}, {type: html.DIV_OUTPUT, style: [OUTPUT_STYLE]}, {type: html.DIV_STATUS, style: _fg(color.label)}, + {type: html.DIV_ITEM, name: [html.SELECT], style: [ITEM_HOVER_STYLE]}, {type: html.DIV_ITEM, style: [ITEM_HOVER_STYLE]}, + {type: html.DIV_TABS, list: [{type: html.DIV, style: _bg(color.plugin)}]}, + {type: html.DIV_TABS, list: [{type: html.DIV, name: [html.SELECT], style: [OUTPUT_STYLE]}]}, + {type: html.DIV_TABS, list: [{type: html.DIV, name: [html.HOVER], style: [OUTPUT_STYLE]}]}, + {type: html.DIV_TABS, list: [{type: html.DIV, name: [html.HOVER], style: _fg(color.text)}]}, + {type: html.DIV_PATH, style: [OUTPUT_STYLE]}, {type: html.DIV_CODE, style: {border: color.border+SOLID}}, + {type: html.DIV_PATH, list: [{type: html.SPAN, style: [ITEM_HOVER_STYLE]}]}, + {type: "div.zone>div.name", style: [TABLE_HEAD_STYLE]}, {type: "div.zone>div.name", style: [TABLE_HEAD_HOVER_STYLE]}, + {type: "div.zone>div.list>div.zone>div.name", style: [TABLE_HEAD_STYLE]}, + {type: "div.zone>div.list>div.zone>div.name", style: [TABLE_HEAD_HOVER_STYLE]}, + {type: "div.zone div.item>div.name", name: [html.HOVER], style: _fg(color.text)}, + {type: "tr.line.select", style: [ITEM_HOVER_STYLE]}, {type: "tr.line", style: [ITEM_HOVER_STYLE]}, {type: "tr.line>td.line", style: [OUTPUT_STYLE]}, {type: html.TABLE_LAYOUT, list: [{type: html.DIV_TOGGLE, style: [ITEM_HOVER_STYLE]}]}, {type: html.TABLE_CONTENT, list: [{type: html.TR, style: [TABLE_ROW_HOVER_STYLE]}]}, {type: html.TABLE_CONTENT, list: [{type: html.TH, style: [TABLE_HEAD_STYLE]}]}, @@ -399,21 +411,6 @@ Volcanos(chat.ONAPPEND, {_init: function(can, meta, list, cb, target, field) { {type: html.TABLE_CONTENT, list: [{type: html.TD, style: [TABLE_CELL_HOVER_STYLE]}]}, {type: html.H1, style: [ITEM_HOVER_STYLE]}, {type: html.H2, style: [ITEM_HOVER_STYLE]}, {type: html.H3, style: [ITEM_HOVER_STYLE]}, {type: html.LABEL, style: _fg(color.label)}, {type: html.A, style: _fg(color.notice)}, - {type: "tr.line.select", style: [ITEM_HOVER_STYLE]}, {type: "tr.line", style: [ITEM_HOVER_STYLE]}, {type: "tr.line>td.line", style: [OUTPUT_STYLE]}, - {type: "div.zone>div.name", style: [TABLE_HEAD_STYLE]}, {type: "div.zone>div.name", style: [TABLE_HEAD_HOVER_STYLE]}, - {type: "div.zone>div.list>div.zone>div.name", style: [TABLE_HEAD_STYLE]}, - {type: "div.zone>div.list>div.zone>div.name", style: [TABLE_HEAD_HOVER_STYLE]}, - {type: "div.zone div.item>div.name", name: [html.HOVER], style: _fg(color.text)}, - {type: html.DIV_ITEM, name: [html.SELECT], style: [ITEM_HOVER_STYLE]}, {type: html.DIV_ITEM, style: [ITEM_HOVER_STYLE]}, - {type: html.DIV_TABS, list: [{type: html.DIV, style: _bg(color.plugin)}]}, - {type: html.DIV_TABS, list: [{type: html.DIV, name: [html.SELECT], style: [OUTPUT_STYLE]}]}, - {type: html.DIV_TABS, list: [{type: html.DIV, name: [html.HOVER], style: [OUTPUT_STYLE]}]}, - {type: html.DIV_TABS, list: [{type: html.DIV, name: [html.HOVER], style: _fg(color.text)}]}, - {type: html.DIV_PATH, style: [OUTPUT_STYLE]}, {type: html.DIV_CODE, style: {border: color.border+SOLID}}, - {type: html.DIV_PATH, list: [{type: html.SPAN, style: [ITEM_HOVER_STYLE]}]}, - {type: html.DIV_CARTE, list: [{type: html.DIV_ITEM, style: [TABLE_HEAD_STYLE, CARTE_ITEM_STYLE]}]}, - {type: html.DIV_CARTE, list: [{type: html.DIV_ITEM, style: [CARTE_ITEM_HOVER_STYLE]}]}, - {type: html.DIV_FLOAT, style: [PLUGIN_STYLE]}, {type: html.FIELDSET_FLOAT, style: [PLUGIN_STYLE]}, {type: html.FIELDSET_PANEL, style: [PANEL_STYLE]}, {type: html.FIELDSET_PANEL, list: [{type: ">"+html.DIV_OUTPUT, style: [PANEL_STYLE]}]}, {type: html.FIELDSET_PANEL, name: [chat.HEADER], list: [{type: html.DIV_OUTPUT, list: [{type: html.DIV, style: [ITEM_HOVER_STYLE]}], }]}, @@ -422,6 +419,9 @@ Volcanos(chat.ONAPPEND, {_init: function(can, meta, list, cb, target, field) { {type: html.FIELDSET_PLUGIN, style: [PLUGIN_STYLE]}, {type: html.FIELDSET_PLUGIN, list: [{type: html.DIV_STATUS, style: {"border-top": color.border+SOLID}}]}, {type: html.FIELDSET_STORY, style: [PLUGIN_STYLE]}, {type: html.FIELDSET_STORY, list: [{type: html.DIV_STATUS, style: {"border-top": color.border+SOLID}}]}, {type: html.FIELDSET_INPUT, style: [PLUGIN_STYLE]}, {type: html.FIELDSET_INPUT, style: _b_r(0)}, + {type: html.DIV_CARTE, list: [{type: html.DIV_ITEM, style: [TABLE_HEAD_STYLE, CARTE_ITEM_STYLE]}]}, + {type: html.DIV_CARTE, list: [{type: html.DIV_ITEM, style: [CARTE_ITEM_HOVER_STYLE]}]}, + {type: html.DIV_FLOAT, style: [PLUGIN_STYLE]}, ] function render(pre, list) { return can.core.List(list, function(item) { var type = item.type+can.core.List(item.name, function(name) { return (name==html.HOVER? ice.DF: ice.PT)+name }).join("") if (!item.name && type.indexOf(".select") == -1 && type.indexOf(":hover") == -1 && can.base.isArray(item.style) && item.style.join(",").indexOf("-hover-") > -1) { type += ":hover" } diff --git a/page/index.css b/page/index.css index 7d6f4db5..f3c3007a 100644 --- a/page/index.css +++ b/page/index.css @@ -4,14 +4,12 @@ legend { background-color:cadetblue; color:white; padding:0 20px; margin-right:5 select { background-color:black; color:cyan; padding:0 10px; margin-right:5px; } input:not([type=file]) { background-color:cyan; padding:0 5px; margin-right:5px; } input:not([type=button]) { width:120px; } -input[name=date] { width:150px; } -input[name=text] { width:160px; } input[name=path] { width:160px; } input[name=line] { width:40px; } input[name=limit] { width:48px; } input[name=offend] { width:48px; } -input[name=ID] { width:48px; } input[name=id] { width:48px; } +input[name=ID] { width:48px; } input[name=url] { width:320px; } input[name=cmd] { background-color:black; color:white; width:320px; } input[type=button] { background-color:black; color:cyan; } @@ -24,35 +22,31 @@ input[type=button][name=delete] { background-color:red; } input[type=button][name=remove] { background-color:red; } textarea { background-color:cyan; padding:5px; width:600px; resize:vertical; } /* output */ -div.output { position:relative; } div.layout.flex>* { float:left; } +div.output { position:relative; } div.project div.list { margin-left:10px; } div.project div.item { padding:2px 10px; } div.project div.item>div.name { padding-left:20px; } div.project div.switch { margin-top:2px; width:12px; float:left; rotate:90deg; } div.project div.switch.open { translate:3px -3px; rotate:180deg; } div.project div.zone>div.name { background-color:steelblue; color:white; text-align:center; padding:3px; clear:both; } -div.project div.zone>div.list>div.zone>div.name { background-color:#09466fc2; text-align:left; padding-left:20px; } -div.project div.zone>div.list>div.zone>div.name:hover { background-color:#3c7da8d9; } +div.project div.zone>div.list>div.zone>div.name { text-align:left; padding-left:20px; } +// div.project div.zone>div.list>div.zone>div.name:hover { background-color:#3c7da8d9; } div.project div.zone>div.action>div.item { float:right; clear:none; } -div.project div.zone>div.action>div.item input[type=text] { background-color:#ff000000; color:white; padding-left:10px; } table.content thead { position:sticky; top:2px; } table.content th { background-color:steelblue; padding:2px 5px; } table.content td { padding:2px 5px; } table.content.action th:last-child { position:sticky; right:2px; } table.content.action td:last-child { background-color:steelblue; position:sticky; right:2px; } div.code { background-color:#343a3445; font-size:12px; padding:10px; border:green solid 1px; } -div.story[data-type=spark] { background-color:#2169a9a6; color:white; padding:5px 10px; border-left:solid 5px blue; margin:10px; } +div.story[data-type=spark] { background-color:#2169a9a6; color:white; padding:5px 10px; border-left:blue solid 5px; margin:10px; } /* fieldset */ -div.tabs div:hover { background-color:#0000; } -div.tabs div.select { background-color:#0000; } -fieldset.plugin { background-color:#061c3c9e; padding:10px; margin:10px; } -fieldset.plugin:not(.cmd):not(.full):not(.float)>legend { float:none; } -fieldset.plugin>div.status { border-top:1px solid darkcyan; } -fieldset.story>div.status { border-top:1px solid darkcyan; } -fieldset.panel>div.status { display:none; } -fieldset.panel>legend { display:none; } fieldset.contexts { position:fixed; } +fieldset.panel>legend { display:none; } +fieldset.panel>div.status { display:none; } +fieldset.plugin { background-color:#061c3c9e; } +fieldset.plugin>div.status { border-top:darkcyan solid 1px; } +fieldset.story>div.status { border-top:darkcyan solid 1px; } fieldset.output { padding:0; margin:0; } fieldset.output>legend { display:none; } fieldset.output>form.option { display:none; } @@ -63,9 +57,8 @@ fieldset.simple>legend { display:none; } fieldset.simple>form.option { display:none; } fieldset.simple>div.status { display:none; } fieldset.simple div.toggle { display:none; } -fieldset.float { padding:0; margin:0; } -fieldset.full { padding:0; margin:0; overflow:auto; position:absolute; left:0; top:0; } -fieldset.cmd { padding:0; margin:0; } +fieldset.float { background-color:#061c3c9e; } +fieldset.full { position:fixed; left:0; top:0; } /* input */ fieldset.input>legend { display:none; } fieldset.input.key { overflow:auto; } @@ -73,12 +66,11 @@ fieldset.input.key div.action { display:none; } fieldset.input.key.simple div.status { display:none; } fieldset.input.key.simple th { display:none; } fieldset.input.key.simple td { min-width:40px; } -fieldset.input.date select { width:87px; } -fieldset.input.date select { margin-right:0; } -fieldset.input.date input:not([type=file]) { margin-right:0; } +fieldset.input.date select { margin-right:0; width:87px; } fieldset.input.date select[name=year] { width:128px; } fieldset.input.date select[name=month] { width:102px; } -fieldset.input.date table { text-align:center; width:350px; } +fieldset.input.date input:not([type=file]) { margin-right:0; } +fieldset.input.date table.content { text-align:center; width:350px; } fieldset.input.date div.action div.space { width:0; clear:both; } fieldset.input.date div.output td { padding:2px 10px; } fieldset.input.date div.output td.prev { color:gray; } @@ -89,24 +81,24 @@ fieldset.input.date div.output td span.lunar.fest { color:red; } fieldset.input.date div.status { text-align:center; } /* float */ body div.float { background-color:#0e3369b3; padding:5px; } -body>div.toast div.title { color:yellow; float:left; } +body>div.toast div.title { color:blue; float:left; } body>div.toast div.duration { color:gray; float:right; } -body>div.toast div.content { color:yellow; text-align:center; } +body>div.toast div.content { color:blue; text-align:center; } body>div.toast div.progress { border:green solid 1px; margin-left:-2px; height:20px; clear:both; } body>div.toast div.progress div.current { background-color:red; height:18px; } body>div.toast div.action { display:block; } body>div.toast div.action>div.item.space { height:unset; } body>div.carte { padding:0; } -body>div.carte div.item { padding:3px 12px; } -body>div.carte div.space { border-bottom:solid 1px gray; } +body>div.carte div.item { padding:5px 10px; } +body>div.carte div.space { border-bottom:gray solid 1px; } body>div.input div.content { overflow:auto; } body>div.input td { padding:5px; } -body>div.input select { width:171px; } -body>div.input textarea { height:120px; width:171px; } -body>div.input input:not([type=button]) { width:171px; } -body>div.input div.action input[type=button] { width:80px; } +body>div.input select { width:200px; } +body>div.input textarea { height:120px; width:200px; } +body>div.input input:not([type=button]) { width:200px; } +body>div.input div.action input[type=button] { width:90px; } body>div.input div.action div { margin:5px; float:right; } -body>div.input.login { padding:10px; background-color:steelblue; min-width:240px; } +body>div.input.login { background-color:steelblue; padding:10px; min-width:240px; } body>div.input.login input[type=button] { width:90px; } body>div.upload div.item { float:left; } body>div.upload div.output { border:red solid 1px; } @@ -115,46 +107,43 @@ body>div.upload div.status div.cost { float:left; } body>div.upload div.status div.show { float:right; } body>div.upload div.status div.size { text-align:center; } body>div.upload input[type=file] { width:320px; } -div.tabs > img { height:16px; width:16px; margin-bottom:-3px; margin-left:10px; } -div.tabs > img:hover { background-color:gray; } /* font */ -textarea { tab-size:2; height:62px; } legend { font-size:1.2rem; height:31px; } -select, input { font-size:1.0rem; height:31px; } +select, input { font-size:1rem; height:31px; } textarea { tab-size:2; height:93px; } table.content, div.project, div.item, div.code, div.story[data-type=spark], svg { font-family:monospace; white-space:pre; text-align:left; } +h1 { text-align:center; margin:20px 0; } h2 { margin:20px 0; } h3 { margin:20px 0; } ul { padding-left:40px; margin:20px 0; } div.action>div.tabs { padding:5px; height:31px; } div.status>div.item { padding:5px; height:30px; } div.status>div.item>label { font-size:0.6rem; } -h1 { text-align:center; margin:20px 0; } -h2 { margin:20px 0; } -h3 { margin:20px 0; } -ul { padding-left:40px; margin:20px 0; } -/* hover */ -legend:hover { background-color:skyblue; } -select:hover { background-color:gray; color:cyan; } -span.item:hover, div.item:hover, div.item.select, table.content tr:hover, table.content tr.select, h1:hover, h2:hover, h3:hover { background-color:steelblue; } -table.content th:hover, table.content td:hover, table.content td.select { background-color:cornflowerblue; } -div.story[data-type=spark] span:hover { background-color:deepskyblue; box-shadow:4px 4px 20px 4px #29318e; } -body>div.carte div.item:hover { background-color:cornflowerblue; } -select, input[type=text], textarea { box-shadow:4px 4px 20px 4px #626bd0; } -legend, select, input[type=button], div.tabs, div.item, div.zone>div.name, th, td, h1, h2, h3 { cursor:pointer; } -div.title, div.story[data-type=spark] { cursor:copy; } +div.status>legend { margin-left:2px; margin-right:0; float:right; clear:none; } +div.code { position:sticky; left:0; } /* display */ form.option, div.action { display:contents; } form.option>div.item>label, div.action>div.item>label, .hidden, .hide { display:none; } -fieldset:not(.float):not(.plug):not(.full):not(.cmd)>form.option input[type=button][name=close] { display:none; } legend, form.option, form.option>div.item, div.action, div.action>div.item, div.action>div.tabs, div.status>div.item { float:left; } -div.output, div.status, div.project div.item, div.content, div.item.textarea, div.code, div.story[data-type=spark] { clear:both; } -div.action, div.output, div.status, div.project, div.display, div.profile, div.content, div.code, div.story, table.content, table.content td, body>div.toast { overflow:auto; } +div.output, div.status, div.item.textarea, div.project div.item, div.content, div.code, div.story[data-type=spark] { clear:both; } +div.action, div.output, div.status, div.project, div.display, div.profile, div.content, table.content, table.content td, div.code, div.story, body>div.toast { overflow:auto; } +fieldset.plugin:not(.float):not(.full):not(.cmd) { padding:10px; margin:10px; } +fieldset.plugin:not(.float):not(.full):not(.cmd)>legend { float:none; } +fieldset:not(.float):not(.plug):not(.full)>form.option input[type=button][name=close] { display:none; } fieldset.auto, fieldset.full, fieldset.float, div.float { position:fixed; z-index:10; } -div.status>legend { margin-left:2px; margin-right:0; float:right; clear:none; } -div.code { position:sticky; left:0; } +/* hover */ +legend:hover { background-color:skyblue; } +select:hover { background-color:gray; color:cyan; } +div.tabs div:hover, div.tabs div.select { background-color:transparent; } +div.item:hover, div.item.select, span.item:hover, table.content tr:hover, table.content tr.select, h1:hover, h2:hover, h3:hover { background-color:steelblue; } +table.content th:hover, table.content td:hover, table.content td.select { background-color:cornflowerblue; } +div.story[data-type=spark] span:hover { background-color:deepskyblue; box-shadow:4px 4px 20px 4px #29318e; } +div.carte div.item:hover { background-color:cornflowerblue; } +select, input[type=text], textarea { box-shadow:4px 4px 20px 4px #626bd0; } +legend, select, input[type=button], div.tabs, div.item, span.item, div.zone>div.name, th, td, h1, h2, h3 { cursor:pointer; } +div.title, div.story[data-type=spark] { cursor:copy; } /* white */ -body.dark { overflow:hidden; } body.black a { color:yellow; } +body.black div.project div.zone>div.list>div.zone>div.name { background-color:#09466fc2; } body.white { background-color:rgba(5,34,56,0.75); color:white; } body.white select { background-color:yellowgreen; color:white; } -body.white input { background-color:white; } +body.white input:not([type=button]) { background-color:white; } body.white input[name=cmd] { background-color:black; color:white; } body.white input[type=button] { background-color:cornflowerblue; color:white; } body.white input[type=button][name=restart] { background-color:blue; } @@ -167,20 +156,21 @@ body.white input[type=button][name=remove] { background-color:red; } body.white textarea { background-color:white; } body.white table.content th { background-color:skyblue; } body.white table.content.action td:last-child { background-color:skyblue; } -body.white div.zone>div.list>div.zone>div.name { background-color:whitesmoke; color:black; } -body.white div.float { background-color:whitesmoke; color:black; } -body.white div.toast div.title { color:blue; } -body.white div.toast div.content { color:blue; } +body.white div.zone>div.list>div.zone>div.name { background-color:aliceblue; color:black; } +body.white div.float { background-color:aliceblue; color:black; } body.white fieldset.panel.Search a { color:yellow; } body.white fieldset.panel.Action { color:black; } body.white fieldset.panel.Action div.action { color:white; } body.white fieldset.plugin { background-color:#ffffffa1; } -body.white fieldset.float { background-color:whitesmoke; color:black; } -body.white fieldset.full { background-color:white; } +body.white fieldset.float { background-color:aliceblue; color:black; } +body.white fieldset.full { background-color:white; color:black; } body.white legend:hover { background-color:skyblue; } body.white select:hover { background-color:#99cc667d; } body.white input[name=cmd]:hover { background-color:white; color:black; } body.white input[type=button]:hover { background-color:#1b7acc8c; } +body.white div.project div.zone>div.list>div.zone>div.name:hover { background-color:#4682b46b; } +body.white div.item:hover, body.white span.item:hover { background-color:#4682b46b; } +body.white div.item.select { background-color:#4682b46b; } body.white table.content tr:hover { background-color:#4682b46b; } body.white table.content th:hover { background-color:#6495ed63; } body.white table.content td:hover { background-color:#6495ed63; } @@ -188,62 +178,55 @@ body.white table.content td.select { background-color:#6495ed63; } body.white h1:hover { background-color:#4682b46b; } body.white h2:hover { background-color:#4682b46b; } body.white h3:hover { background-color:#4682b46b; } -body.white div.item:hover { background-color:#4682b46b; } -body.white div.item.select { background-color:#4682b46b; } /* print */ body.print { -webkit-filter: grayscale(100%); } body.print { background-color:white; color:black; } -body.print legend, body.print select, body.print input, body.print input[type=button] { background-color:white; color:black; } +body.print legend, body.print select, body.print input, body.print input[type=button], body.print textarea { background-color:snow; color:black; } +body.print div.item { background-color:white; } +body.print div.carte div.item { background-color:snow; } +body.print div.item.select { background-color:lightgray; } +body.print div.zone>div.name { background-color:lightgray; color:black; } body.print table.content th { background-color:lightgray; } body.print table.content.action td:last-child { background-color:lightgray; } +body.print table.content td.select { background-color:lightgray; } +body.print a { color:black; } body.print div.story[data-type=spark] { background-color:lightgray; } -body.print div.zone>div.name { background-color:lightgray; } -body.print div.item.select { background-color:lightgray; } -body.print div.list div.item { background-color:white; } body.print fieldset.panel { background-color:white; color:black; } +body.print fieldset.panel.Footer>div.output div.toast { background-color:lightgray; } body.print fieldset.plugin { background-color:white; color:black; } +body.print fieldset.float { background-color:snow; } +body.print div.float { background-color:snow; } +body.print select, body.print input[type=text], body.print textarea { box-shadow:4px 4px 20px 4px lightgray; } body.print fieldset.draw div.output { background-color:lightgray; } body.print fieldset.draw div.output div.content svg { background-color:lightgray; } /* mobile */ -body.mobile * { border-radius:0; overflow:auto; } body.mobile legend { font-size:1.6rem; height:38px; } body.mobile select { font-size:1.4rem; height:38px; } body.mobile input { font-size:1.2rem; height:38px; } body.mobile textarea { font-size:1.2rem; } -body.mobile table.content th { padding:6px 6px; } body.mobile form.option>div.item { margin:0; height:38px; } body.mobile div.action>div.item { margin:0; height:38px; } body.mobile>div.carte div.item { font-size:1.6rem; } body.mobile>div.input.login input { font-size:1.4rem; width:264px; } -body.mobile fieldset.plugin { margin:10px 0; } -body.mobile fieldset.plugin.full { margin:0; } -body.mobile fieldset.cmd>div.output { overflow:auto; } -body.mobile fieldset.Header.head { background-color:#000000b8; font-size:1.6rem; height:3rem; width:100%; position:fixed; top:0; } -body.mobile fieldset.Header.head div.output { height:3rem; } -body.mobile fieldset.Header.head div.output div { height:3rem; margin-left:0; } -body.mobile fieldset.Header.head div.state.time { display:none; } -body.mobile fieldset.Header.head div.search { height:3rem; width:100%; } -body.mobile fieldset.Header.head div.search>input { background-color:#21181838; color:white; margin:0; width:100%; height:42px; } -body.mobile fieldset.River { font-size:1.6rem; min-width:240px; position:fixed; top:3rem; z-index:10; } -body.mobile fieldset.River>div.output { width:320px; } -body.mobile fieldset.River>div.output div.item { font-size:1.6rem; } -body.mobile fieldset.Action.main { margin-top:3rem; margin-bottom:3rem; overflow:hidden; } +body.mobile table.content th { padding:6px 6px; } +body.mobile fieldset:not(.panel):not(.input)>div.action { display:none; } +body.mobile fieldset.plugin:not(.float):not(.full):not(.cmd) { margin:10px 0; } +body.mobile fieldset.Header.head { font-size:1.6rem; padding:0; height:3rem; width:100%; position:fixed; top:0; } +body.mobile fieldset.Header.head div.search { padding:0; height:3rem; width:100%; margin:0; } +body.mobile fieldset.Header.head div.search>input { background-color:#21181838; color:white; height:53px; width:100%; } +body.mobile fieldset.River { min-width:240px; position:fixed; top:3rem; z-index:10; } +body.mobile fieldset.River>div.output { font-size:1.6rem; width:320px; } +body.mobile fieldset.Action.main { margin-top:3rem; margin-bottom:3rem; } body.mobile fieldset.Action.main.cmd { margin-top:0; margin-bottom:0; } -body.mobile fieldset.Footer.foot { width:100%; } -body.mobile fieldset.Footer.foot { font-size:1.6rem; height:3rem; position:fixed; bottom:0; } +body.mobile fieldset.Footer.foot { font-size:1.6rem; height:3rem; width:100%; position:fixed; bottom:0; } body.mobile fieldset.Footer.foot div.output { height:3rem; } body.mobile fieldset.Footer.foot div.output div { height:3rem; } body.mobile fieldset.Footer.foot input[name=cmd] { height:3rem; } body.mobile fieldset.input.date div.output td { padding:8px 20px; } body.mobile fieldset.word.float>div.output>div.project { top:38px; } -body.mobile.landscape fieldset.Header.head { position:unset; } -body.mobile.landscape fieldset.Header.head div.state.time { display:block; } -body.mobile.landscape fieldset.Action.main { margin-top:0; margin-bottom:0; } -body.mobile.landscape fieldset.Footer.foot { position:unset; } -body.mobile.landscape fieldset.Footer.foot input[name=cmd] { width:240px; } /* misc */ fieldset.panel.Action.cmd>div.toggle.project { display:none; } -fieldset.panel.Search div.story[data-type=spark] { padding:0px; margin:0px; } +fieldset.panel.Search div.story[data-type=spark] { padding:0; margin:0; } fieldset.plugin.location>div.action input[type=text] { width:40px; } fieldset.plugin.config form.option input[name=key] { width:240px; } fieldset.plugin.parse.cmd>legend { display:none; } @@ -259,8 +242,8 @@ table.layout { border-spacing:0; } table.layout td { vertical-align:top; } table.layout td.content div.toggle { background-color:#4682b46b; color:white; font-size:24px; position:absolute; } table.layout td.content div.toggle>div { display:table-cell; } -table.layout td.content div.toggle.project { padding-top:50px; height:130px; width:15px; top:20%; left:0px; border-top-right-radius:10px; border-bottom-right-radius:10px; } -table.layout td.content div.toggle.profile { padding-top:50px; height:130px; width:15px; top:20%; right:0px; border-top-left-radius:10px; border-bottom-left-radius:10px; } +table.layout td.content div.toggle.project { padding-top:50px; height:130px; width:15px; top:20%; left:0; border-top-right-radius:10px; border-bottom-right-radius:10px; } +table.layout td.content div.toggle.profile { padding-top:50px; height:130px; width:15px; top:20%; right:0; border-top-left-radius:10px; border-bottom-left-radius:10px; } table.layout td.content div.toggle.display { margin-top:-15px; height:15px; width:130px; left:40%; border-top-left-radius:10px; border-top-right-radius:10px; } table.layout td.content div.toggle.display>div { text-align:center; width:130px; rotate:-90deg; translate:5px -5px; } body.mobile table.layout div.toggle { font-size:48px; } @@ -288,7 +271,7 @@ div.output.card div.item.stop { color:gray; } div.output.card div.item { padding:10px; border:#e7e7e7 solid 1px; margin:10px; width:240px; float:left; } div.output.card div.item>div.title { font-size:1.2rem; font-weight:bold; padding:10px; border-bottom:solid 1px #e7e7e7; } div.output.card div.item>div.content { padding:10px; height:45px; } -body.white div.output.card div.item input[type=button] { background-color:#ff000000; } +body.white div.output.card div.item input[type=button] { background-color:transparent; } body.mobile div.output.card div.item { height:160px; float:none; } body.mobile.simple div.output.card div.item { width:100%; } body.mobile.landscape div.output.card div.item { width:auto; float:left; } diff --git a/panel/action.css b/panel/action.css index 1c482ddc..8af7d9c6 100644 --- a/panel/action.css +++ b/panel/action.css @@ -68,8 +68,8 @@ div.main fieldset.plugin form.option { display:block; clear:both; } div.main fieldset.plugin form.option div.item { margin:5px; } div.main fieldset.plugin div.action div.item { margin:5px; } div.main fieldset.plugin table.content tr { border:lightgray solid 1px; } -div.main fieldset.plugin table.content tr:hover { background-color:whitesmoke; } -div.main fieldset.plugin table.content th { background-color:whitesmoke; padding:10px; } +div.main fieldset.plugin table.content tr:hover { background-color:aliceblue; } +div.main fieldset.plugin table.content th { background-color:aliceblue; padding:10px; } div.main fieldset.plugin table.content td { background-color:white; padding:10px; } div.foot { background-color:#404040; color:white; padding:5px; height:42px; clear:both; } div.foot div.username { float:right; margin-right:10px; } diff --git a/panel/footer.css b/panel/footer.css index 9ad1a7a1..21b87932 100644 --- a/panel/footer.css +++ b/panel/footer.css @@ -6,7 +6,7 @@ fieldset.Footer>div.output div.title { float:left; } fieldset.Footer>div.output div.state { font-family:monospace; float:right; } fieldset.Footer>div.output div.state label { font-size:12px; } fieldset.Footer>div.output div.toast { background-color:darkcyan; float:right; } -fieldset.Footer>div.output div.cmd { padding:0px; float:left; } +fieldset.Footer>div.output div.cmd { padding:0; float:left; } fieldset.Footer>div.output input[name=cmd] { margin-left:40px; width:120px; transition:all 0.5s; } fieldset.Footer>div.output input[name=cmd]:focus { width:320px; transition:all 0.5s; } fieldset.Footer>div.output input[name=cmd]:hover { width:320px; transition:all 0.5s; } diff --git a/panel/header.js b/panel/header.js index f6478b6a..2b39cfc6 100644 --- a/panel/header.js +++ b/panel/header.js @@ -124,7 +124,7 @@ Volcanos(chat.ONPLUGIN, { }), topic: shy("界面主题", { _init: function(can) { can.Option(chat.TOPIC, can.getHeader(chat.TOPIC)) }, - }, ["topic:select=dark,light,white,black", ice.RUN], function(can, msg, arg) { + }, ["topic:select=dark,light,white,black,print", ice.RUN], function(can, msg, arg) { msg.Echo(can.onimport.topic(can, arg[0])) }), location: shy("请求地址", { diff --git a/panel/river.js b/panel/river.js index 87e3f33f..9d9e9909 100644 --- a/panel/river.js +++ b/panel/river.js @@ -6,7 +6,7 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg) { var select; can.page.Append can._main_river = can.misc.Search(can, chat.RIVER)||msg.Option(ice.MSG_RIVER)||Volcanos.meta.args.river||can._main_river||ls[0]||"project" can._main_storm = can.misc.Search(can, chat.STORM)||msg.Option(ice.MSG_STORM)||Volcanos.meta.args.storm||can._main_storm||ls[1]||"studio" }, - _menu: function(can, msg) { if (can.user.mod.isPod||can.user.isMobile) { return } + _menu: function(can, msg) { if (can.user.mod.isPod) { return } can.setHeaderMenu(can.base.Obj(can.Conf(chat.MENUS)||msg.Option(chat.MENUS), can.ondetail._menus), function(event, button) { can.core.CallFunc([can.ondetail, button], [event, can, button, can.Conf(chat.RIVER), can.Conf(chat.STORM)]) }), can.onappend._action(can, can.Conf(ctx.ACTION)||can.onaction.list) diff --git a/panel/search.css b/panel/search.css index 2dfe3ad5..ff867371 100644 --- a/panel/search.css +++ b/panel/search.css @@ -1,4 +1,4 @@ -fieldset.Search { background-color:#041a25bd; padding:10px; display:none; position:fixed; left:0px; top:31px; } +fieldset.Search { background-color:#041a25bd; padding:10px; display:none; position:fixed; left:0; top:31px; } fieldset.Search input.word { width:100%; } fieldset.Search>div.output table { width:100%; } fieldset.Search>div.status { display:block; } diff --git a/plugin/local/code/inner.css b/plugin/local/code/inner.css index 7da8f01b..a0270cd4 100644 --- a/plugin/local/code/inner.css +++ b/plugin/local/code/inner.css @@ -22,17 +22,17 @@ fieldset.inner.cmd>div.output>div.layout.flow>div.tabs div.time { float:right; } fieldset.inner.cmd>div.output>div.layout.flow>div.path { padding:5px; display:block; } fieldset.inner.cmd>div.output>div.layout.flow>div.path span.func { margin-left:20px; } -body.white div.path span.item:hover { background-color:whitesmoke; } -body.white div.carte.path.float div.item:hover { background-color:white; } -body.white fieldset.inner.cmd>div.output { background-color:whitesmoke; } +// body.white div.path span.item:hover { background-color:aliceblue; } +// body.white div.carte.path.float div.item:hover { background-color:white; } +body.white fieldset.inner.cmd>div.output { background-color:aliceblue; } body.white fieldset.inner.cmd>div.output div.content { background-color:white; } body.white fieldset.inner.cmd>div.output>div.layout.flow>div.tabs div.select { background-color:white; } body.white fieldset.inner.cmd>div.output>div.layout.flow>div.tabs div:hover { background-color:white; } body.white fieldset.inner.cmd>div.output>div.layout.flow>div.path { background-color:white; } -body.white fieldset.inner>div.output div.content tr:hover { background-color:whitesmoke; } -body.white fieldset.inner>div.output div.content tr.select { background-color:whitesmoke; } +body.white fieldset.inner>div.output div.content tr:hover { background-color:aliceblue; } +body.white fieldset.inner>div.output div.content tr.select { background-color:aliceblue; } body.white fieldset.inner>div.output div.content tr.select td.line { background-color:steelblue; color:white; } -body.white fieldset.inner>div.output div.content td.text span.comment { color:darkgrey; } +body.white fieldset.inner>div.output div.content td.text span.comment { color:darkgray; } body.white fieldset.inner>div.output div.content td.text span.keyword { color:blue; } body.white fieldset.inner>div.output div.content td.text span.package { color:brown; } body.white fieldset.inner>div.output div.content td.text span.datatype { color:darkgreen; } @@ -54,21 +54,23 @@ tr.line>td.line { text-align:right; padding:0 10px; position:sticky; left:0; } tr.line>td.text { line-height:20px; white-space:pre; padding-left:10px; cursor:text; } body.white tr.line.select { background-color:dimgray; } body.white tr.line:hover { background-color:dimgray; } body.black tr.line.select { background-color:darkblue; } body.black tr.line:hover { background-color:darkblue; } -fieldset>div.output>fieldset.plug { position:absolute; bottom:0px; right:0px; display:none; } +fieldset>div.output>fieldset.plug { position:absolute; bottom:0; right:0; display:none; } fieldset>div.output>fieldset.plug.select { display:block; } body.mobile fieldset.plugin>legend { border:none; } .unselectable { -webkit-touch-callout:none; -webkit-user-select:none; -khtml-user-select:none; -moz-user-select:none; -ms-user-select:none; -o-user-select:none; user-select:none; } body.dark fieldset.inner>div.output div.content td.text span.comment { color:green; } -body.dark fieldset.inner>div.output div.content td.text span.keyword { color:#5e99c9; } -body.dark fieldset.inner>div.output div.content td.text span.datatype { color:#d2d2d2; } -body.dark fieldset.inner>div.output div.content td.text span.constant { color:#bed3af; } -body.dark fieldset.inner>div.output div.content td.text span.string { color:#d19b81; } -body.light fieldset.inner>div.output div.content td.text span.comment { color:darkgrey; } -body.light fieldset.inner>div.output div.content td.text span.keyword { color:#3d45ff; } -body.light fieldset.inner>div.output div.content td.text span.package { color:darkblue; } -body.light fieldset.inner>div.output div.content td.text span.datatype { color:darkblue; } +body.dark fieldset.inner>div.output div.content td.text span.keyword { color:royalblue; } +body.dark fieldset.inner>div.output div.content td.text span.datatype { color:lavender; } +body.dark fieldset.inner>div.output div.content td.text span.function { color:lightgreen; } +body.dark fieldset.inner>div.output div.content td.text span.constant { color:gray; } +body.dark fieldset.inner>div.output div.content td.text span.string { color:orange; } +body.dark fieldset.inner>div.output div.content td.text span.object { color:gold; } +body.light fieldset.inner>div.output div.content td.text span.comment { color:darkgray; } +body.light fieldset.inner>div.output div.content td.text span.keyword { color:darkblue; } +body.light fieldset.inner>div.output div.content td.text span.package { color:blue; } +body.light fieldset.inner>div.output div.content td.text span.datatype { color:cornflowerblue; } body.light fieldset.inner>div.output div.content td.text span.function { color:darkcyan; } -body.light fieldset.inner>div.output div.content td.text span.constant { color:#a8120e; } -body.light fieldset.inner>div.output div.content td.text span.string { color:#a8120e; } -body.light fieldset.inner>div.output div.content td.text span.object { color:darkblue; } +body.light fieldset.inner>div.output div.content td.text span.constant { color:gray; } +body.light fieldset.inner>div.output div.content td.text span.string { color:brown; } +body.light fieldset.inner>div.output div.content td.text span.object { color:purple; } diff --git a/plugin/local/code/inner/syntax.js b/plugin/local/code/inner/syntax.js index f010fc71..3cbd5a82 100644 --- a/plugin/local/code/inner/syntax.js +++ b/plugin/local/code/inner/syntax.js @@ -482,31 +482,47 @@ Volcanos(chat.ONSYNTAX, { "pointer": code.CONSTANT, "center": code.CONSTANT, "monospace": code.CONSTANT, + + "dark": code.CONSTANT, + "light": code.CONSTANT, + "transparent": code.CONSTANT, "black": code.CONSTANT, "white": code.CONSTANT, - "gray": code.CONSTANT, - "cyan": code.CONSTANT, + "yellow": code.CONSTANT, "blue": code.CONSTANT, "red": code.CONSTANT, + "green": code.CONSTANT, - "brown": code.CONSTANT, - "yellow": code.CONSTANT, - "magenta": code.CONSTANT, - "skyblue": code.CONSTANT, - "darkblue": code.CONSTANT, - "royalblue": code.CONSTANT, - "cadetblue": code.CONSTANT, - "lightblue": code.CONSTANT, - "aliceblue": code.CONSTANT, - "steelblue": code.CONSTANT, - "cornflowerblue": code.CONSTANT, - "lightgray": code.CONSTANT, - "darkgrey": code.CONSTANT, - "darkcyan": code.CONSTANT, - "darkgreen": code.CONSTANT, - "lightgreen": code.CONSTANT, - "whitesmoke": code.CONSTANT, + "purple": code.CONSTANT, + "silver": code.CONSTANT, + "gray": code.CONSTANT, + "navy": code.CONSTANT, + "teal": code.CONSTANT, + + "gold": code.CONSTANT, + "orange": code.CONSTANT, + "lavender": code.CONSTANT, + "chocolate": code.CONSTANT, "dimgray": code.CONSTANT, + "brown": code.CONSTANT, + "snow": code.CONSTANT, + + "skyblue": code.CONSTANT, + "aliceblue": code.CONSTANT, + "cadetblue": code.CONSTANT, + "cornflowerblue": code.CONSTANT, + "royalblue": code.CONSTANT, + "steelblue": code.CONSTANT, + "darkblue": code.CONSTANT, + "darkcyan": code.CONSTANT, + "darkgray": code.CONSTANT, + "darkgreen": code.CONSTANT, + "lightblue": code.CONSTANT, + "lightgray": code.CONSTANT, + "lightgreen": code.CONSTANT, + + "cyan": code.CONSTANT, + "magenta": code.CONSTANT, }, keyword0: { "word-break": code.FUNCTION, diff --git a/plugin/local/code/repos.css b/plugin/local/code/repos.css index 19883ec7..cb8f85ff 100644 --- a/plugin/local/code/repos.css +++ b/plugin/local/code/repos.css @@ -72,7 +72,7 @@ fieldset.repos div.output>div.info div.button:first-child { fieldset.repos div.output>div.info div.button { left:30px; position:absolute; - bottom:0px; + bottom:0; display:flex; justify-content: center; height:40px; diff --git a/plugin/local/code/vimer.css b/plugin/local/code/vimer.css index a5c4c8d2..8ae85c82 100644 --- a/plugin/local/code/vimer.css +++ b/plugin/local/code/vimer.css @@ -2,12 +2,12 @@ fieldset.vimer>div.output div.project div.zone.create>div.action { display:none; fieldset.vimer>div.output div.project div.zone.create>div.list div.item { padding:2px; float:left; clear:none; } fieldset.vimer>div.output div.project div.zone.create>div.list div.item input { letter-spacing:2px; } fieldset.vimer>div.output div.project div.zone.recent>div.list { min-width:200px; max-height:240px; overflow:auto; } -fieldset.vimer>div.output input.current { background-color:#0000; color:#0000; padding-left:10px; height:20px; position:absolute; } +fieldset.vimer>div.output input.current { background-color:transparent; color:transparent; padding-left:10px; height:20px; position:absolute; } fieldset.vimer>div.output input.current.insert { caret-color:black; } fieldset.vimer>div.output input.current.normal { caret-color:lightgray; } fieldset.vimer>div.output div.complete { padding-top:0; display:none; overflow:auto; position:absolute; } fieldset.vimer>div.output div.complete.insert:not(.hide) { display:block; } -fieldset.vimer>div.output div.complete div.prefix { color:#0000; white-space:pre; float:left; } +fieldset.vimer>div.output div.complete div.prefix { color:transparent; white-space:pre; float:left; } fieldset.vimer>div.output div.complete table.content thead { display:none; } body.black fieldset.vimer>div.output input.current.normal { caret-color:gray; } body.black fieldset.vimer>div.output input.current.insert { caret-color:yellow; } diff --git a/plugin/local/code/vimer.js b/plugin/local/code/vimer.js index 38e28ccc..9d4db121 100644 --- a/plugin/local/code/vimer.js +++ b/plugin/local/code/vimer.js @@ -48,9 +48,10 @@ Volcanos(chat.ONFIGURE, { }) }, source: function(can, target, zone, path) { var total = 0 + var hash = location.hash; if (can.isCmdMode() && hash) { var args = can.core.Split(decodeURIComponent(hash).slice(1), ice.DF) } else { args = [] } function show(target, path) { can.run(can.request({}, {dir_root: path, dir_deep: true}), [nfs.PWD], function(msg) { var node; function add(list) { - can.core.List(list, function(item) { item._menu = shy({ + can.core.List(list, function(item) { if (path == args[0] && args[1].indexOf(item.path) == 0) { item.expand = true } item._menu = shy({ create: function(event) { can.user.input(event, can, ["filename"], function(list) { can.base.endWith(item.path, ice.PS)? can.request(event, {path: path+item.path, file: list[0]}): can.request(event, {path: path+item.path.split(ice.PS).slice(0, -1).join(ice.PS)+ice.PS, file: list[0]}) @@ -64,8 +65,8 @@ Volcanos(chat.ONFIGURE, { } node = add(msg.Table(), node), can.Status("目录", zone._total(total += msg.Length())) }, true) } if (path.length == 1) { return show(target, path[0]) } can.onimport.zone(can, can.core.List(path, function(path) { return {name: path, _init: function(target, zone) { - can.onmotion.hidden(can, zone._action), can.onmotion.hidden(can, zone._target) - }, _delay_show: function(target) { show(target, path) } }}), target), can.page.Remove(can, target.previousSibling) + if (path == args[0]) { show(target, path) } else { can.onmotion.hidden(can, zone._action), can.onmotion.hidden(can, zone._target) } + }, _delay_show: function(target) { path != args[0] && show(target, path) } }}), target), can.page.Remove(can, target.previousSibling) }, dream: function(can, target, zone) { var call = arguments.callee can.runAction({}, ice.RUN, [web.DREAM], function(msg) { msg.Table(function(item) { var color = item.status == cli.START? "": "gray" @@ -86,8 +87,7 @@ Volcanos(chat.ONFIGURE, { can.onimport.tree(can, can.core.ItemKeys(can.onengine.plugin.meta, function(key) { return total++, {index: key} }), ctx.INDEX, ice.PT, function(event, item) { can.onimport.tabview(can, can.Option(nfs.PATH), can.core.Keys(ice.CAN, item.index), ctx.INDEX) }, target), zone._total(total) - can.onmotion.hidden(can, target) - can.onmotion.hidden(can, target.previousSibling) + can.onmotion.hidden(can, target), can.onmotion.hidden(can, target.previousSibling) }, module: function(can, target, zone) { can.runAction(can.request({}, {fields: ctx.INDEX}), ctx.COMMAND, [mdb.SEARCH, ctx.COMMAND], function(msg) { diff --git a/plugin/local/wiki/word.css b/plugin/local/wiki/word.css index 4f1caad6..a61fe2a5 100644 --- a/plugin/local/wiki/word.css +++ b/plugin/local/wiki/word.css @@ -21,8 +21,8 @@ fieldset.word p.story[data-name=inner]:hover { background-color:#c10c8a; cursor: fieldset.word table.content { display:block; max-height:400px; } fieldset.word>div.output>fieldset.story:not(.full) { margin:10px; } // fieldset.word>div.output>fieldset.story { margin:10px; background-color:#58a4d37d; } -fieldset.word fieldset.story.full { margin:0px; } -fieldset.word fieldset.story.float { margin:0px; } +fieldset.word fieldset.story.full { margin:0; } +fieldset.word fieldset.story.float { margin:0; } fieldset.word svg.story.auto defs marker { stroke:red; fill:red; } fieldset.word svg.story.auto rect { stroke:yellow; fill:black; } diff --git a/plugin/local/wiki/word.js b/plugin/local/wiki/word.js index 76f50a12..83536555 100644 --- a/plugin/local/wiki/word.js +++ b/plugin/local/wiki/word.js @@ -114,6 +114,7 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { can.onmotion.clear( audio: function(can, meta, target) {}, layout: function(can) { + can.isCmdMode() && can.ConfHeight(can.page.height()) && can.page.styleHeight(can, can._output, "") can.core.List(can._plugins, function(sub) { sub.ConfHeight(can.base.Min(300, can.ConfHeight()-300)), sub.ConfWidth(can.ConfWidth()-(can.user.isWindows? 40: 20)) sub.onaction._resize(sub, true, sub.ConfHeight(), sub.ConfWidth()) diff --git a/plugin/story/json.css b/plugin/story/json.css index 5e9eb617..b5efc87c 100644 --- a/plugin/story/json.css +++ b/plugin/story/json.css @@ -1,9 +1,8 @@ -div.output.json div.item:hover { background-color:#0000; } +div.output.json div.item:hover { background-color:transparent; } div.output.json div.item div.item { padding-left:15px; border:#0000000d solid 1px; border-left:lightblue dashed 1px; margin-left:5px; } div.output.json div.item div.item:hover { border:red solid 1px; } div.output.json div.item span.nonce { color:#9cbeca4f; cursor:pointer; } -div.output.json div.item span.key { color:yellow; } div.output.json div.item span.string { color:magenta; } -div.output.json div.item span.const { color:cyan; } +div.output.json div.item span.key { color:yellow; } body.white div.output.json div.item span.key { color:blue; } - +body.light div.output.json div.item span.key { color:blue; } diff --git a/plugin/table.js b/plugin/table.js index 46945a15..f5ea780c 100644 --- a/plugin/table.js +++ b/plugin/table.js @@ -90,7 +90,7 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, cb, target) { can.onmotion.cl node = node||{"": target}; can.core.List(list, function(item) { item[field] && can.core.List(item[field].split(split), function(value, index, array) { if (!value) { return } var last = array.slice(0, index).join(split), name = array.slice(0, index+1).join(split); if (node[name]) { return } - var ui = can.page.Append(can, node[last], [{view: html.ITEM, list: [{view: ["switch", html.DIV, (index==array.length-1?"":"⌃")]}, {view: [mdb.NAME, html.DIV, value+(index==array.length-1?"":"")], _init: item._init, oncontextmenu: function(event) { if (!item._menu) { return } + var ui = can.page.Append(can, node[last], [{view: html.ITEM, list: [{view: ["switch"+(item.expand? " open": ""), html.DIV, (index==array.length-1?"":"⌃")]}, {view: [mdb.NAME, html.DIV, value+(index==array.length-1?"":"")], _init: item._init, oncontextmenu: function(event) { if (!item._menu) { return } can.user.carteRight(event, can, item._menu.meta, item._menu.list||can.core.Item(item._meta.meta), function(event, button) { (item._menu.meta[button]||item._menu)(event, can, button) }) diff --git a/proto.js b/proto.js index 58a1d170..b0dcc106 100644 --- a/proto.js +++ b/proto.js @@ -126,7 +126,7 @@ var cli = { PWD: "pwd", SYSTEM: "system", DAEMON: "daemon", ORDER: "order", BUILD: "build", BEGIN: "begin", START: "start", OPEN: "open", CLOSE: "close", STOP: "stop", END: "end", RESTART: "restart", COLOR: "color", WHITE: "white", BLACK: "black", RED: "red", GREEN: "green", BLUE: "blue", - YELLOW: "yellow", CYAN: "cyan", PURPLE: "purple", MAGENTA: "magenta", GLASS: "#0000", + YELLOW: "yellow", CYAN: "cyan", PURPLE: "purple", MAGENTA: "magenta", GLASS: "transparent", MAKE: "make", MAIN: "main", EXEC: "exec", DONE: "done", COST: "cost", FROM: "from", CLEAR: "clear", } var log = {