diff --git a/frame.js b/frame.js index bb930ce8..e437d324 100644 --- a/frame.js +++ b/frame.js @@ -475,7 +475,9 @@ Volcanos(chat.ONLAYOUT, {help: "页面布局", _init: function(can, target) { ta can.page.style(can, target||can._root._target, html.BACKGROUND, url == "" || url == "void"? "": 'url("'+url+'")') }, - figure: function(event, can, target, right) { var rect = event.target.getBoundingClientRect() + figure: function(event, can, target, right) { + if (!event || !event.target) { return {} } + var rect = event.target.getBoundingClientRect() target = target||can._fields||can._target var layout = right? {left: rect.right, top: rect.top}: {left: rect.left, top: rect.bottom} can.getActionSize(function(left, top, width, height) { diff --git a/lib/user.js b/lib/user.js index fa23fb98..66772d6c 100644 --- a/lib/user.js +++ b/lib/user.js @@ -60,12 +60,11 @@ Volcanos("user", {help: "用户操作", info: {}, agent: { if (window.webview) { return title(text) } return text && (document.title = Volcanos.meta.args.name||text), document.title }, - topic: function(can, name) { - can.base.isArray(name) && (name = can.base.join(name)) - can.user.mod.isCmd && (name += " simple") - can.Conf("display") && (name += " "+can.Conf("display")) + topic: function(can, name) { can.base.isArray(name) && (name = can.base.join(name)) can.user.isMobile && (name += " mobile") && can.user.isLandscape() && (name += " landscape") can.user.language(can) && (name += " "+can.user.language(can)) + can.Conf("display") && (name += " "+can.Conf("display")) + can.user.mod.isCmd && (name += " simple") can.page.styleClass(can, can._root._target, name) }, language: function(can) { return can.misc.Search(can, "language") }, @@ -234,7 +233,7 @@ Volcanos("user", {help: "用户操作", info: {}, agent: { } }] }: can.base.isArray(item)? {view: html.ITEM, list: [{text: can.user.trans(can, item[0])+" -> "}], onmouseenter: function(event) { var sub = can.user.carte(event, can, meta, item.slice(1), cb, carte) carte._float && can.page.Remove(can, carte._float._target), carte._float = sub - can.page.style(can, sub._target, can.onlayout.figure(event, can, sub._target, true)) + can.onlayout.figure(event, can, sub._target, true) } }: {view: html.ITEM, list: [{text: can.user.trans(can, item.name), onclick: function(event) { can.user.isMobile && can.page.Remove(can, ui._target) can.base.isFunc(cb) && cb(event, item.name, meta, index) @@ -244,18 +243,12 @@ Volcanos("user", {help: "用户操作", info: {}, agent: { }) }] ) ui._target.onmouseover = function(event) { can.onkeymap.prevent(event) } - can.page.style(can, ui._target, can.onlayout.figure(event, can, ui._target)) var carte = {_target: ui._target, _parent: parent, layout: can.onlayout.figure(event, can, ui._target)} return can.onkeymap.prevent(event), carte }, carteRight: function(event, can, meta, list, cb, parent) { var carte = can.user.carte(event, can, meta, list, cb, parent) - can.page.style(can, carte._target, { - left: event.clientX-event.offsetX+event.target.offsetWidth-3, - top: carte._target.offsetTop-(carte.layout.bottom? -event.target.offsetHeight: event.target.offsetHeight)+5, - bottom: "", - }) - return carte + return can.page.style(can, carte._target, can.onlayout.figure(event, can, carte._target, true)), carte }, carteClient: function(event, can, meta, list, cb, parent) { var ui = can.user.carte(event, can, meta, list, cb, parent) @@ -281,6 +274,7 @@ Volcanos("user", {help: "用户操作", info: {}, agent: { if (item.name != "action" && item.name) { target.value = msg.Option(item.name)||can.Option(item.name)||target.value||"" } + item.mode = "simple" can.onappend.figure(can, item, target) } @@ -290,7 +284,7 @@ Volcanos("user", {help: "用户操作", info: {}, agent: { ]}]) var layout = can.onlayout.figure(event, can, ui._target) - can.page.style(can, ui._target, layout), can.page.ClassList.add(can, ui._target, chat.FLOAT) + can.page.ClassList.add(can, ui._target, chat.FLOAT) var action = can.onappend._action(can, button||[html.SUBMIT, html.CANCEL], ui.action, { focus: function(event) { can.page.Select(can, ui.first, html.INPUT_ARGS)[0].focus() }, diff --git a/page/index.css b/page/index.css index f72248e0..f7dfbfc8 100644 --- a/page/index.css +++ b/page/index.css @@ -1,30 +1,28 @@ body, fieldset, table, tr, th, td { padding:0; border:0; margin:0; } -body { background-color:black; color:cyan; font-size:14px; font-family:sans-serif; } - -body { overflow:-moz-scrollbars-none; -ms-overflow-style:none; } -body::-webkit-scrollbar { width:0 !important; height:0 !important; } -fieldset.panel.Action>div.output::-webkit-scrollbar { width:0 !important; height:0 !important; } -div.story[data-type=spark]::-webkit-scrollbar { width:0 !important; height:0 !important; } -div.project::-webkit-scrollbar { width:0 !important; height:0 !important; } -div.content::-webkit-scrollbar { width:0 !important; height:0 !important; } - -legend { background-color:#339999; color:white; padding:0px 20px; margin-top:4px 5px; } -select { background-color:black; color:cyan; padding:0 10px; height:1.92rem; } -textarea { background-color:cyan; height:60px; width:400px; } -input[type=button] { background-color:black; color:cyan; height:31px; } -input[name=cmd] { background-color:black; color:white; width:240px; } -input[type=text] { background-color:cyan; color:black; padding:0 4px; height:27px; width:90px; } -input[type=password] { background-color:cyan; color:black; padding:0 4px; height:27px; width:90px; } -input[name=where] { width:320px; } +body { background-color:black; color:cyan; } +legend { background-color:#339999; color:white; padding:0px 20px; } +select { background-color:black; color:cyan; padding:0 10px; } +textarea { background-color:cyan; width:400px; } +input[type=password] { background-color:cyan; color:black; padding:0 4px; width:90px; } +input[type=text] { background-color:cyan; color:black; padding:0 4px; width:90px; } +input[name=cmd] { background-color:black; color:white; width:320px; } +input[name=url] { width:320px; } +input[name=text] { width:160px; } input[name=date] { width:150px; } input[name=path] { width:160px; } input[name=line] { width:40px; } -input[name=limit] { width:50px; } -input[name=offend] { width:50px; } -input[name=text] { width:160px; } -input[name=url] { width:320px; } +input[name=limit] { width:48px; } +input[name=offend] { width:48px; } +input[name=id] { width:48px; } +input[name=ID] { width:48px; } +input[type=button] { background-color:black; color:cyan; } +input[type=button][name=start] { background-color:#52ce78; } +input[type=button][name=open] { background-color:blue; } +input[type=button][name=stop] { background-color:red; } +input[type=button][name=trash] { background-color:red; } +input[type=button][name=delete] { background-color:red; } +input[type=button][name=remove] { background-color:red; } -fieldset.plugin.config form.option input[name=key] { width:240px; } table.layout { border-spacing:0; } table.layout td { vertical-align:top; } table.layout td.content { position:relative; } @@ -34,45 +32,21 @@ table.layout div.toggle.project { padding-top: 50px; height:100px; width:15px; t table.layout div.toggle.profile { padding-top: 50px; height:100px; width:15px; top:20%; right:0px; border-top-left-radius:10px; border-bottom-left-radius:10px; } table.layout div.toggle.display { overflow:hidden; margin-top:-14px; height:15px; width:100px; position:sticky; left:40%; border-top-left-radius:10px; border-top-right-radius:10px; } table.layout div.toggle.display>div { color:white; text-align:center; height:15px; width:100px; } -fieldset.Action.cmd>div.toggle.project { display:none; } -table.content tr { background-color:#04272f45; } -table.content tr.show { background-color:red; } +table.content thead { position:sticky; top:2px; } table.content th { background-color:#0fbd45; padding:2px 6px; } table.content td { padding:2px 6px; } -table.content.action td:last-child, table.content.action th:last-child { background-color:#7dc6d7eb; position:sticky; right:0; } -table.content thead { position:sticky; top:-1px; } - -input[type=button][name=start] { background-color:#52ce78; } -input[type=button][name=open] { background-color:blue; } -input[type=button][name=stop] { background-color:red; } -/* input[type=button][name=create] { background-color:blue; } */ -input[type=button][name=remove] { background-color:red; } -input[type=button][name=delete] { background-color:red; } -/* input[type=button][name=insert] { background-color:blue; } */ -input[type=button][name=trash] { background-color:red; } +table.content.action th:last-child { background-color:#7dc6d7eb; position:sticky; right:0; } +table.content.action td:last-child { background-color:#7dc6d7eb; position:sticky; right:0; } div.tabs { background-color:#00000038; color:white; padding:5px; margin:0 1px; } div.code { background-color:#343a3445; color:white; padding:10px; border:solid 3px green; } div.story[data-type=spark] { background-color:#2169a9a6; color:white; padding:4px 10px; border-left:solid 4px blue; margin:10px; } -fieldset.panel.Search div.story[data-type=spark] { padding:0px; margin:0px; } +div.story[data-type=spark] { box-shadow:4px 4px 10px 1px #626bd0; } +div.story[data-type=spark] span:hover { background-color:deepskyblue; box-shadow:4px 4px 20px 4px #29318e; } -form.option>div.item { margin-right:0px; margin-right:5px; } -form.option>div.item.select { background-color:#0000; } -form.option>div.item input.args.char { width:20px; } -form.option>div.item input.args.tiny { width:40px; } -form.option>div.item input.args.long { width:240px; } -form.option>div.item input.args.full { width:480px; } -form.option>div.item input.args[name=ID] { width:48px; } -form.option>div.item input.args[name=id] { width:48px; } -form.option>div.item input.args[name=limit] { width:48px; } -form.option>div.item input.args[name=offset] { width:48px; } -form.option>div.item input.args[name=offend] { width:48px; } -form.option>div.item.textarea { margin-top:4px; } - -div.action>div.item { margin-right:3px; height:31px; } -div.action>div.item.select { background:none; } -div.action>div.item.space { width:10px; } +form.option>div.item { margin-right:5px; } +div.action>div.item { margin-right:5px; } div.output { position:relative; } div.output td.project { background-color:#435f8c8c; } div.output td.project div.project { min-width:88px; max-width:360px; } @@ -81,48 +55,45 @@ div.output td.project div.project div.list { margin-left:10px; } div.output td.project div.project div.switch { color:#0d1bc2; width:12px; float:left; transform: rotate(90deg) translate(2px, 0px); } div.output td.project div.project div.switch.open { transform: rotate(180deg) translate(-4px, 1px); } div.output td.profile { background-color:#71909c91; } -div.status>div.item { padding:4px; height:18px; } -fieldset.Action>div.output>fieldset.plugin { background-color:#061c3c9e; padding:10px; margin:10px; } +fieldset.plugin { background-color:#061c3c9e; padding:10px; margin:10px; } fieldset.plugin div.status { border-top:1px solid darkcyan; } fieldset.story div.status { border-top:1px solid darkcyan; } -/* fieldset.story>legend { height:30px; margin-right:5px; float:left; } */ -fieldset.story>legend { padding:0 20px; margin:5px 0; } +fieldset.story>legend { margin:5px 0; } fieldset.float { background-color:#023531cf; } -fieldset.float input[type="button"][name="close"]{ display:block; } -fieldset.Full input[type="button"][name="close"]{ display:block; } -fieldset.plug input[type="button"][name="close"]{ display:block; } -fieldset input[type="button"][name="close"]{ display:none; } -/* fieldset.float>div.action { display:block; height:2.3rem; } */ -fieldset.float table { color:white; } +fieldset.float input[type=button][name=close]{ display:block; } +fieldset.Full input[type=button][name=close]{ display:block; } +fieldset.plug input[type=button][name=close]{ display:block; } +fieldset input[type=button][name=close]{ display:none; } fieldset.output>form.option { display:none; } fieldset.output>div.action { display:none; } fieldset.output div.status { display:none; } fieldset.output div.toggle { display:none; } -fieldset.input { background-color:#0d4142a6; } -fieldset.input.key.float div.action { display:none; } -fieldset.input.key.float.simple div.status { display:none; } -fieldset.input.key.float.simple th { display:none; } -fieldset.input.key.float.simple td { min-width:40px; text-align:center; } -fieldset.input div.output { max-height:400px; } -fieldset.input table { color:white; } -fieldset.input td { word-break:keep-all; } +fieldset.input.key { overflow:auto; } +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; text-align:center; } +fieldset.input.date div.action div.space { width:0; clear:both; } +fieldset.input.date div.output td.prev { color:gray; } +fieldset.input.date div.output td.next { color:gray; } +fieldset.input.date div.output td { padding:2px 11px; } +fieldset.input.date table { text-align:center; width:280px; } -body>div.toast { background-color:#0e3369b3; color:yellow; padding:5px; } +body>div.float { background-color:#0e3369b3; padding:5px; } body>div.toast div.title { color:#cae850; word-break:break-all; float:left; } body>div.toast div.duration { color:gray; float:right; } -body>div.toast div.content { text-align:center; } +body>div.toast div.content { text-align:center; color:yellow; } body>div.toast div.progress { border:solid 2px green; margin-left:-2px; height:10px; clear:both; } body>div.toast div.progress div.current { background-color:red; height:10px; } body>div.toast div.action { display:block; } -body>div.carte { background-color:#295b61; color:white; padding:4px; min-width:80px; } +body>div.carte { background-color:#295b61; padding:4px; min-width:80px; } body>div.carte div.item { padding:3px 12px; } body>div.input { background-color:#0d4142a6; padding:5px; } body>div.input div.item { float:left; } -body>div.input tr td:first-child { text-align:center; } body>div.input div.content { overflow:auto; } body>div.input select { width:183px; margin:5px; } body>div.input input[type=text] { width:171px; margin:5px; } @@ -131,7 +102,6 @@ body>div.input input[name=password] { width:171px; margin:5px; } body>div.input textarea { background-color:cyan; padding:4px; margin:5px; border:2px inset #14a58e; height:120px; width:171px; } body>div.input.login { padding:10px; } -body>div.upload { background-color:black; color:yellow; padding:5px; } body>div.upload div.item { float:left; } body>div.upload div.output { border:solid 1px red; } body>div.upload div.progress { background-color:red; height:10px; width:0; } @@ -140,88 +110,16 @@ 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:240px; } -body.white { background-color:rgba(5,34,56,0.75); color:white; } -body.white fieldset.Action { color:black; } -body.white fieldset.Action>div.action { color:white; } -body.white fieldset.Action fieldset.plugin { background-color:#ffffff78; } -body.white fieldset.Action fieldset.plugin.full { background-color:#ffffffff; } -body.white fieldset.Action fieldset.plugin.Full { background-color:#cce0f4eb; color:white; z-index:10; } -body.white fieldset.Action fieldset.story.Full { background-color:#cce0f4eb; color:white; z-index:10; } -body.white fieldset.Action fieldset.plugin.Full table.content { color:white; } -body.white fieldset.Action fieldset.story.Full table.content { color:white; } -body.white fieldset.Search table { color:white; } -body.white fieldset.word.float { background-color:#3d5569; color:black; } - -body.white legend { border-radius:10px 10px 10px 10px; } -body.white select { background-color:#99CC66; color:white; border:2px solid #99CC66; border-radius:10px 10px 10px 10px; } -body.white input[type=button] { background-color:#FF9900; color:white; border:none; border-radius:10px; } -body.white input[type=text] { background-color:white; color:black; border:2px solid #14a58e; border-radius:6px; } -body.white input[type=password] { background-color:white; color:black; border:2px solid #14a58e; border-radius:6px; } -body.white input[name=cmd] { background-color:black; color:white; width:240px; } - -body.white table.content { color:black; } -body.white table.content tr { background-color:#e1f1ff1f; } -body.white table.content th { background-color:#99CCFF; } - -body.white input[type=button][name=结束] { background-color:red; } -body.white input[type=button][name=stop] { background-color:red; } -body.white input[type=button][name=open] { background-color:blue; } -body.white input[type=button][name=start] { background-color:#52ce78; } -/* body.white input[type=button][name=create] { background-color:blue; } */ -body.white input[type=button][name=remove] { background-color:red; } -/* body.white input[type=button][name=insert] { background-color:blue; } */ -body.white input[type=button][name=delete] { background-color:red; } -body.white input[type=button][name=trash] { background-color:red; } - -body.print { background-color:white; color:black; } -body.print legend, body.print select, body.print input[type=text] { box-shadow:0px 0px 0px 0px #626bd0; } -body.print fieldset.Header, body.print fieldset.River, body.print fieldset.Action, body.print fieldset.Footer { background-color:white; color:black; } -body.print fieldset.River>div.output div.item.select { background-color:white; border:solid 2px red; } -body.print fieldset.River>div.output div.list div.item { background-color:white; } - -body.mobile>div.input input[name=username] { width:264px; } -body.mobile>div.input input[name=password] { width:264px; } -body.mobile legend { font-size:1.6rem; } -body.mobile input { font-size:1.3rem; } -body.mobile textarea { font-size:1.2rem; } -body.mobile>div.carte { font-size:1.6rem; } -body.mobile>div.carte div.item { font-size:1.6rem; } -body.mobile>div.input.login input { font-size:1.4rem; } -body.mobile fieldset.Header.head { width:-webkit-fill-available; } -body.mobile fieldset.Header.head { background-color:#000000b8; font-size:1.6rem; height:3rem; position:fixed; top:0; } -body.mobile fieldset.Header.head div.output { height:3rem; } -body.mobile fieldset.Header.head>div.output div.menu { height:2.6rem; } -body.mobile fieldset.Header.head div.state.time { display:none; } -body.mobile fieldset.Header>div.output>div.search>input { height:38px; } -body.mobile.landscape fieldset.Header>div.output>div.search>input { width:240px; } -body.mobile fieldset.River.left { background-color:#243950bf; font-size:2rem; 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; } -body.mobile fieldset.Action.main.cmd { margin-top:0; margin-bottom:0; } -body.mobile fieldset.Footer.foot { width:-webkit-fill-available; } -body.mobile fieldset.Footer.foot { background-color:#000000b8; font-size:1.6rem; height:3rem; position:fixed; bottom:0; } -body.mobile fieldset.Footer.foot div.output { height:3rem; } -body.mobile fieldset.Footer.foot>div.output div { height:2.6rem; } -body.mobile fieldset.Footer>div.output input[name=cmd] { height:38px; } -body.mobile.landscape fieldset.Footer>div.output input[name=cmd] { width:240px; } -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 fieldset.draw.spide div.action { display:none; } -body.mobile fieldset.draw.trend div.action { display:none; } -body.mobile.landscape fieldset.draw.spide div.action { display:block; } -body.mobile.landscape fieldset.draw.trend div.action { display:block; } - /* font */ * { tab-size:4; } -textarea { tab-size:2; } +textarea { tab-size:2; height:60px; } legend { font-size:1.2rem; height:31px; } -select, input { font-size:1.1rem; } +select { font-size:1.1rem; height:31px; } +input { font-size:1.1rem; height:27px; } +input[type=button] { height:31px; } table.content th, table.content td, div.item, div.tabs, div.code, code.story, div.story[data-type=spark] { font-size:1.1rem; font-family:monospace; } div.status>div.item>label { font-size:0.6rem; font-family:monospace; } +div.status>div.item { padding:4px; height:22px; } svg { font-family:monospace; } /* display */ @@ -243,34 +141,29 @@ fieldset.plugin { box-shadow:2px 2px 10px 4px #626bd0; } fieldset.plugin:hover { box-shadow:4px 4px 12px 6px #626bd0; } fieldset.story { clear:both; float:left; box-shadow:4px 4px 10px 1px #626bd0; } fieldset.story:hover { box-shadow:12px 12px 12px 6px #5764efd1; } -div.story[data-type=spark] { box-shadow:4px 4px 10px 1px #626bd0; } -div.story[data-type=spark] span:hover { background-color:deepskyblue; box-shadow:4px 4px 20px 4px #29318e; } -legend, select, textarea, input[type=text], div.code { box-shadow:4px 4px 20px 4px #626bd0; } +legend, select, textarea, input[type=text], div.code, div.story[data-type=spark] { box-shadow:4px 4px 20px 4px #626bd0; } /* hover */ .select, div.item.select, div.item:hover, table.content th:hover, table.content td.select, table.content td:hover { background-color:cornflowerblue; } div.tabs.select, div.tabs:hover, table.content tr.select, table.content tr:hover, h1:hover, h2:hover, h3:hover { background-color:steelblue; } - input[type=text]:hover { background-color:white; } input[name=cmd]:hover { background-color:white; color:black; } input[type=button]:hover { background-color:gray; color:cyan; } -body.black a { color:yellow; } -body.white legend:hover { background-color:skyblue; } -body.white input[type=text]:hover { background-color:cyan; } -body.white input[name=cmd]:hover { background-color:white; color:black; } -body.white input[type=button]:hover { background-color:#FFCC33; } -body.white table.content th:hover, body.white table.content td.select, body.white table.content td:hover { background-color:#6495ed63; } -body.white table.content tr:hover { background-color:#4682b46b; } -body.white div.item.select, body.white div.item:hover { background-color:steelblue; } -body.white fieldset.float table { color:white; } +/* scrollbar */ +body { overflow:-moz-scrollbars-none; -ms-overflow-style:none; } +body::-webkit-scrollbar { width:0 !important; height:0 !important; } +fieldset.panel.Action>div.output::-webkit-scrollbar { width:0 !important; height:0 !important; } +div.story[data-type=spark]::-webkit-scrollbar { width:0 !important; height:0 !important; } +div.project::-webkit-scrollbar { width:0 !important; height:0 !important; } +div.content::-webkit-scrollbar { width:0 !important; height:0 !important; } div.output.card div.item { padding:10px; border:solid 1px #e7e7e7; margin:10px; height:120px; width:240px; float:left; position:relative; } 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:24px; } div.output.card div.item.stop { color:gray; } -body.simple { background-color:white; } +/* body.simple { background-color:white; } */ body.simple fieldset.Header { border-bottom:solid 1px #e7e7e7; height:60px; display:block; } body.simple fieldset.River { border-right:solid 1px #e7e7e7; } body.simple fieldset.River>div.output { padding:10px 10px; width:200px; } @@ -281,7 +174,6 @@ body.simple fieldset.River>div.output div.list div.item { background-color:white body.simple fieldset.River>div.output div.list div.item.select { background-color:#0152d9; color:white; } body.simple fieldset.River>div.output div.list div.item:hover { background-color:#0152d9; color:white; } -body.white.simple fieldset.Action { background-color:white; } body.simple fieldset.Action>div.action { background:white; padding:10px; border-bottom: solid 1px red; height:38px; width:600px; } body.simple fieldset.Action>div.action div.tabs { padding:10px; margin:10px; } body.simple fieldset.Action.tabs>div.output { margin-top:58px; } @@ -294,31 +186,108 @@ body.simple fieldset.Action>div.output>fieldset.plugin.inner>div.status { displa body.simple div.output.card div.item { min-width:240px; border-radius:5px; box-shadow:2px 2px 6px 1px gray; } body.simple div.output.card div.item:hover { background-color:white; box-shadow:5px 5px 10px 5px gray; } body.simple div.output.card div.item>div.title { border-bottom:solid 1px #e7e7e7; } +body.simple fieldset.feel.float { top:0 } + +body.white.simple fieldset.Action { background-color:white; } body.white.simple div.output.card input[type=button]:hover { box-shadow:2px 2px 8px 2px gray; } body.white.simple div.output.card input[type=button] { box-shadow:2px 2px 6px 1px gray; color:white; } body.white.simple div.output.card input[type=button] { background-color:#0152d9; font-size:0.8rem; padding:5px 10px; border:none; border-radius:5px; } - -body.simple fieldset.feel.float { top:0 } - -body.white.simple>div.carte { background-color:white; color:black; border:solid 1px #e7e7e7; } +body.white.simple>div.carte { background-color:white; border:solid 1px #e7e7e7; } body.white.simple>div.carte div.item { font-size:1rem; } -body.white.simple>div.carte div.item:hover { background-color:#0152d9; color:white; } -body.white.simple input[type=button] { background-color:#0152d9; border:none; border-radius:5px; height:31px; box-shadow:2px 2px 6px 1px gray; } +body.white.simple>div.carte div.item:hover { background-color:#0152d9; } +body.white.simple input[type=button] { background-color:#0152d9; border:none; border-radius:5px; box-shadow:2px 2px 6px 1px gray; } -body.mobile legend { height:40px; } -body.mobile input[type=button] { height:31px; } -body.mobile form.option>div.item { margin-right:0px; height:38px; } -body.mobile div.output div.code { font-size:12px; } -body.mobile div.output.card div.item { height:160px; float:none; } -body.mobile.landscape div.output.card div.item { width:auto; float:left; } -body.mobile.simple div.output.card div.item { width:-webkit-fill-available; } -body.mobile.landscape.simple div.output.card div.item { width:auto; float:left; } -body.mobile fieldset.Action div.output fieldset.Full>legend { float:left; } -body.mobile input[type=text] { padding-top:3px; height:31px; } -body.mobile.white input[type=text] { padding-top:3px; height:31px; } -body.mobile div.action>div.item { margin-right:3px; height:38px; } +body.white { background-color:rgba(5,34,56,0.75); color:white; } +body.white legend { border-radius:10px 10px 10px 10px; } +body.white select { background-color:#99CC66; color:white; border:2px solid #99CC66; border-radius:10px 10px 10px 10px; } +body.white input[type=password] { background-color:white; color:black; border:2px solid #14a58e; border-radius:6px; } +body.white input[type=text] { background-color:white; color:black; border:2px solid #14a58e; border-radius:6px; } +body.white input[name=cmd] { background-color:black; color:white; } +body.white input[type=button] { background-color:#FF9900; color:white; border:none; border-radius:10px; } +body.white input[type=button][name=start] { background-color:#52ce78; } +body.white input[type=button][name=open] { background-color:blue; } +body.white input[type=button][name=stop] { background-color:red; } +body.white input[type=button][name=trash] { background-color:red; } +body.white input[type=button][name=delete] { background-color:red; } +body.white input[type=button][name=remove] { background-color:red; } + +body.white table.content th { background-color:#99CCFF; } +body.white fieldset.panel.Action { color:black; } +body.white fieldset.panel.Action div.action { color:white; } +body.white fieldset.plugin { background-color:#ffffff78; } +body.white fieldset.Full { background-color:#cce0f4eb; color:white; z-index:10; } + +body.white legend:hover { background-color:skyblue; } +body.white input[type=text]:hover { background-color:cyan; } +body.white input[name=cmd]:hover { background-color:white; color:black; } +body.white input[type=button]:hover { background-color:#FFCC33; } +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; } +body.white table.content td.select { background-color:#6495ed63; } +body.white div.item:hover { background-color:steelblue; } + +body.print { background-color:white; color:black; } +body.print legend, body.print select, body.print input[type=text] { box-shadow:0px 0px 0px 0px #626bd0; } +body.print div.item.select { background-color:white; border:solid 2px red; } +body.print div.list div.item { background-color:white; } +body.print fieldset.Header, body.print fieldset.River, body.print fieldset.Action, body.print fieldset.Footer { background-color:white; color:black; } +body.black a { color:yellow; } + +body.mobile textarea { font-size:1.2rem; } +body.mobile legend { font-size:1.6rem; height:38px; } body.mobile select { font-size:1.4rem; height:38px; } -body.mobile fieldset.panel.cmd>div.output>fieldset.plugin>legend { height:38px; } -/* div.action>div.item { margin-right:3px; height:31px; } */ +body.mobile input[type=button] { height:31px; margin-top:-2px; } +body.mobile input[type=text] { padding-top:3px; height:31px; } 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.output div.code { font-size:12px; } +body.mobile fieldset.word.float>div.output>div.project { top:38px; } + +body.mobile>div.carte div.item { font-size:2rem; } +body.mobile>div.input.login input { font-size:1.4rem; } +body.mobile>div.input.login input[name=username] { width:264px; } +body.mobile>div.input.login input[name=password] { width:264px; } body.mobile fieldset.input.date div.output td { padding:8px 20px; } + +body.mobile fieldset.Header.head { width:-webkit-fill-available; } +body.mobile fieldset.Header.head { background-color:#000000b8; font-size:1.6rem; height:3rem; position:fixed; top:0; } +body.mobile fieldset.Header.head div.output { height:3rem; } +body.mobile fieldset.Header.head div.state.time { display:none; } +body.mobile fieldset.Header.head div.search>input { height:38px; } +body.mobile fieldset.Header.head div.output div { height:38px; } +body.mobile fieldset.River.left { background-color:#243950bf; font-size:2rem; 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:2rem; } +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:-webkit-fill-available; } +body.mobile fieldset.Footer.foot { background-color:#000000b8; font-size:1.6rem; height:3rem; position:fixed; bottom:0; } +body.mobile fieldset.Footer.foot div.output { height:3rem; } +body.mobile fieldset.Footer.foot div.output div { height:2.6rem; } +body.mobile fieldset.Footer.foot input[name=cmd] { height:38px; } + +body.mobile.landscape fieldset.Header.head { position:unset; } +body.mobile.landscape fieldset.Header.head div.search>input { width:240px; } +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; } + +body.mobile div.output.card div.item { height:160px; float:none; } +body.mobile.simple div.output.card div.item { width:-webkit-fill-available; } +body.mobile.landscape div.output.card div.item { width:auto; float:left; } +body.mobile.landscape.simple div.output.card div.item { width:auto; float:left; } + +body.mobile fieldset.draw.spide div.action { display:none; } +body.mobile fieldset.draw.trend div.action { display:none; } +body.mobile.landscape fieldset.draw.spide div.action { display:block; } +body.mobile.landscape fieldset.draw.trend div.action { display:block; } + +fieldset.panel.Search div.story[data-type=spark] { padding:0px; margin:0px; } +fieldset.panel.Action.cmd>div.toggle.project { display:none; } +fieldset.plugin.config form.option input[name=key] { width:240px; } +body.mobile fieldset.plan>div.action { display:none; } + diff --git a/panel/action.css b/panel/action.css index 63f87eaf..c48e5044 100644 --- a/panel/action.css +++ b/panel/action.css @@ -1,33 +1,25 @@ fieldset.Action { background-color:rgba(114, 153, 162, 0.54); min-width:160px; } -fieldset.Action>div.action { background-color:#159cc7b0; padding:0; margin:0; height:29px; display:none; position:absolute; } - +fieldset.Action>div.action { background-color:#159cc7b0; width:inherit; display:none; } fieldset.Action.tabs>div.action { display:block; } -fieldset.Action.tabs>div.output { margin-top:28px; } fieldset.Action.tabs>div.output>fieldset>legend { display:none; } -fieldset.Action.tabs>div.output fieldset.plugin { display:none; float:left; } +fieldset.Action.tabs>div.output fieldset.plugin { display:none; } fieldset.Action.tabs>div.output fieldset.plugin.select { display:block; } + fieldset.Action.grid>div.output fieldset.plugin { overflow:auto; float:left; } fieldset.Action.grid>div.output fieldset.plugin>div.output { overflow:auto; } + fieldset.Action.free>div.output fieldset.plugin { position:absolute; } fieldset.Action.free>div.output fieldset.plugin.select { display:block; } fieldset.Action.flow>div.output fieldset.plugin { float:left; } -fieldset.Action div.output fieldset.plugin.Full { background-color:#073947f2; padding:0; margin:0; position:fixed; left:0; top:0; overflow:auto; z-index:10; } -fieldset.Action div.output fieldset.plugin.Full>legend { float:left; display:block; } -fieldset.Action div.output fieldset.story.Full { background-color:#073947f2; padding:0; margin:0; position:fixed; left:0; top:0; overflow:auto; z-index:10; } -fieldset.Action div.output fieldset.story.Full>legend { margin:0px; float:left; } +fieldset.Action>div.output fieldset.Full { background-color:#073947f2; padding:0; margin:0; position:fixed; left:0; top:0; overflow:auto; z-index:10; } +fieldset.Action>div.output fieldset.Full>legend { margin:0px; float:left; } + +fieldset.panel.cmd>div.output>fieldset.plugin { padding:0; margin:0; } +fieldset.panel.cmd>div.output>fieldset.plugin>legend { padding:0 10px; margin-right:3px; float:left; } + fieldset.Action>div.project.toggle { background-color:cornsilk; opacity:0.4; color:teal; font-size: 28px; padding-top: 50px; height: 100px; width:20px; position: fixed; top: 30%; border-top-right-radius:20px; border-bottom-right-radius:20px; } -fieldset.panel.cmd>div.output>fieldset.plugin { padding:0; margin:0; } -fieldset.panel.cmd>div.output>fieldset.plugin>legend { background-color:darkcyan; padding:0 10px; margin-right:3px; height:31px; float:left; } - -div.output.form div.item { - margin:10px 40px; -} -div.output.form div.item div.label { - margin:5px 0px; -} - diff --git a/panel/action.js b/panel/action.js index afcad4ff..cd794399 100644 --- a/panel/action.js +++ b/panel/action.js @@ -266,12 +266,10 @@ Volcanos(chat.ONEXPORT, {help: "导出数据", }) }, size: function(can, msg) { - msg.Option(html.TOP, can._target.offsetTop) - msg.Option(html.LEFT, can._target.offsetLeft) - msg.Option(html.WIDTH, can._target.offsetWidth) - if (msg.Option(html.HEIGHT, can._target.offsetHeight-can._action.offsetHeight) > can._root._height) { - msg.Option(html.HEIGHT, can._root._height-2*html.ACTION_HEIGHT) - } + msg.Option(html.TOP, can._output.offsetTop) + msg.Option(html.LEFT, can._output.offsetLeft) + msg.Option(html.WIDTH, can._output.offsetWidth) + msg.Option(html.HEIGHT, can._output.offsetHeight) msg.Option(html.SCROLL, can.user.isMobile? can._target.parentNode.parentNode.scrollTop: can._output.scrollTop) msg.Option(html.MARGIN_X, can.Conf(html.MARGIN_X)) msg.Option(html.MARGIN_Y, can.Conf(html.MARGIN_Y)) diff --git a/panel/footer.css b/panel/footer.css index 3ac8b915..2ea614fb 100644 --- a/panel/footer.css +++ b/panel/footer.css @@ -1,9 +1,9 @@ -fieldset.Footer { padding:0 5px; height:31px; clear:both; } -fieldset.Footer>div.output { height:31px; overflow:hidden; } -fieldset.Footer>div.output>div { padding:5px; height:22px; cursor:pointer; } -fieldset.Footer>div.output>div:hover { background-color:#2e515f; border-top:solid 2px red; } +fieldset.Footer { font-size:1.1rem; padding:0 5px; clear:both; } +fieldset.Footer>div.output { overflow:hidden; } +fieldset.Footer>div.output div { padding:5px; height:21px; cursor:pointer; } +fieldset.Footer>div.output div:hover { background-color:#2e515f; } fieldset.Footer>div.output div.title { float:left; } -fieldset.Footer>div.output div.state { float:right; font-family:monospace; } +fieldset.Footer>div.output div.state { font-family:monospace; float:right; } 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 input[name=cmd] { height:25px; width:120px; border-radius:0; } diff --git a/panel/header.css b/panel/header.css index b2d9b558..0108ffaa 100644 --- a/panel/header.css +++ b/panel/header.css @@ -1,14 +1,13 @@ -fieldset.Header { font-size:1.2em; padding:0 5px; height:31px; overflow:hidden; z-index:10; } -fieldset.Header>div.output { height:31px; overflow:hidden; } -fieldset.Header>div.output>div { padding:5px; height:22px; cursor:pointer; } -fieldset.Header>div.output>div:hover { background-color:#2e515f; border-bottom:solid 2px red; } -fieldset.Header>div.output>div.title { float:left; } -fieldset.Header>div.output>div.state { float:right; } -fieldset.Header>div.output>div.state.avatar>img { height:1.4em; } -fieldset.Header>div.output>div.search { margin-left:20px; float:left; } -fieldset.Header>div.output>div.search>input { margin-top:-5px; height:25px; border-radius:0; } -fieldset.Header>div.output div.menu { padding:5px; height:21px; cursor:pointer; float:left; } -fieldset.Header>div.output div.menu:hover { background-color:#2e515f; border-bottom:solid 2px red; } +fieldset.Header { font-size:1.1rem; height:31px; overflow:auto; padding:0 5px; z-index:10; } +fieldset.Header>div.output { overflow:hidden; } +fieldset.Header>div.output div { padding:5px; height:21px; float:left; cursor:pointer; } +fieldset.Header>div.output div:hover { background-color:#2e515f; } +fieldset.Header>div.output div.title { float:left; } +fieldset.Header>div.output div.state { float:right; } +fieldset.Header>div.output div.state.avatar { padding:0; } +fieldset.Header>div.output div.state.avatar>img { height:31px; } +fieldset.Header>div.output div.search { margin-left:20px; float:left; } +fieldset.Header>div.output div.search>input { margin-top:-5px; border-radius:0; } div.head { background-color:#404040; padding:5px; height:42px; clear:both; diff --git a/panel/header.js b/panel/header.js index 12c293df..67c5ed24 100644 --- a/panel/header.js +++ b/panel/header.js @@ -72,7 +72,9 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, tar }) }, topic: function(can, topic) { topic && (can._topic = topic) - can.user.topic(can, can._topic || can.misc.Search(can, chat.TOPIC) || Volcanos.meta.args.topic || (can.base.isNight()? chat.BLACK: chat.WHITE)) + topic = can._topic || can.misc.Search(can, chat.TOPIC) || Volcanos.meta.args.topic || (can.base.isNight()? chat.BLACK: chat.WHITE) + can.require(["/chat/topic/"+topic+".css"]) + can.user.topic(can, topic) }, background: function(event, can, background) { if (can.user.isExtension || can.user.isLocalFile) { return } can.runAction(event, aaa.BACKGROUND, [background], function(msg) { diff --git a/panel/river.css b/panel/river.css index 85363166..83572e6e 100644 --- a/panel/river.css +++ b/panel/river.css @@ -1,9 +1,5 @@ fieldset.River { overflow:auto; float:left; } fieldset.River>div.output { width:180px; } fieldset.River>div.output div.item { padding:3px 16px; border-left:solid 3px #00ffae; } -fieldset.River>div.output div.item.select { background-color:#2e515f; } -fieldset.River>div.output div.item:hover { background-color:#2e515f; } +fieldset.River>div.output div.list div.item { border-left:solid 3px #ccdc4c; } fieldset.River>div.output div.list { padding-left:5px; margin-left:8px; } -fieldset.River>div.output div.list div.item { background-color:#073540b5; border-left:solid 3px #ccdc4c; } -fieldset.River>div.output div.list div.item.select { background-color:steelblue; } -fieldset.River>div.output div.list div.item:hover { background-color:steelblue; } diff --git a/panel/search.css b/panel/search.css index cba7a0df..d38f22cc 100644 --- a/panel/search.css +++ b/panel/search.css @@ -1,5 +1,4 @@ -fieldset.Search { background:#041a25bd; padding:10px; position:fixed; left:0px; top:26px; display:none; } +fieldset.Search { background:#041a25bd; padding:10px; position:fixed; left:0px; top:31px; display:none; } fieldset.Search input.word { width:-webkit-fill-available; } -fieldset.Search div.output div.content table { min-width:400px; } -fieldset.Search div.output div.display { max-height:200px; } -fieldset.Search div.output a { color:yellow; } +fieldset.panel.Search>div.status { border-top:1px solid darkcyan; } +fieldset.panel.Search fieldset legend { float:left; margin:0; } diff --git a/panel/search.js b/panel/search.js index c8d9423d..f0d02b8f 100644 --- a/panel/search.js +++ b/panel/search.js @@ -8,10 +8,6 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, list, c return list.indexOf(item) })); table && can.page.styleWidth(can, can.ui.display, table.offsetWidth) - can.getActionSize(function(msg, height) { - can.page.style(can, can.ui.profile, html.MAX_HEIGHT, can.base.Min(height-(table&&table.offsetHeight||0), height/2)) - }) - can.page.Select(can, can._output, html.A, function(item) { item.onclick = function(event) { can.user.open(item.href), can.onkeymap.prevent(event) } }), can.onmotion.story.auto(can) @@ -45,10 +41,13 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, list, c }, can.onimport._word(can, msg, cmds, fields) can.getActionSize(function(msg, top, left, width, height) { + can.ConfHeight(height-2*html.ACTION_HEIGHT-2*html.PLUGIN_MARGIN) + can.ConfWidth(width-2*html.PLUGIN_MARGIN) can.page.style(can, can._target, {top: top, left: left}) - can.page.style(can, can._output, html.MAX_HEIGHT, height-71, html.MAX_WIDTH, width-2*html.PLUGIN_MARGIN) - can.page.style(can, can.ui.content, html.MAX_WIDTH, width-2*html.PLUGIN_MARGIN) - can.page.style(can, can.ui.display, html.MAX_WIDTH, width-2*html.PLUGIN_MARGIN) + can.page.style(can, can._output, html.MAX_HEIGHT, can.ConfHeight(), html.MAX_WIDTH, can.ConfWidth()) + can.page.style(can, can.ui.content, html.MAX_WIDTH, can.ConfWidth()) + can.page.style(can, can.ui.display, html.MAX_WIDTH, can.ConfWidth()) + can.page.style(can, can.ui.profile, html.MAX_WIDTH, can.ConfWidth()) }) }, }) @@ -115,14 +114,9 @@ Volcanos(chat.ONACTION, {help: "交互操作", list: [cli.CLOSE, cli.CLEAR, cli. var cmd = line.cmd == ctx.COMMAND? can.core.Keys(line.type, line.name.split(ice.SP)[0]): can.core.Keys(line.ctx, line.cmd) can.onappend.plugin(can, {type: chat.STORY, index: cmd||msg.Option(mdb.INDEX), mode: "plug"}, function(sub, meta) { - can.getActionSize(function(msg, height, width) { height = can.base.Min(height - can.ui.content.offsetHeight+204, height/2) - can.page.style(can, sub._output, html.MAX_HEIGHT, height-26, html.MAX_WIDTH, width-40) - sub.ConfHeight(height+28), sub.ConfWidth(width-60) - }) - - sub.run = function(event, cmds, cb) { - can.runActionCommand(event, meta.index, cmds, cb) - }, sub.Focus() + sub.run = function(event, cmds, cb) { can.runActionCommand(event, meta.index, cmds, cb) } + sub.ConfHeight(can.ConfHeight()-2*html.ACTION_HEIGHT), sub.ConfWidth(can.ConfWidth()) + sub.Focus() }, can.ui.profile) }, }) diff --git a/plugin/input/date.css b/plugin/input/date.css deleted file mode 100644 index c3510f58..00000000 --- a/plugin/input/date.css +++ /dev/null @@ -1,10 +0,0 @@ -fieldset.input.date div.action { height:4rem; } -fieldset.input.date div.action div.space { width:0; clear:both; } -fieldset.input.date div.output td.prev { color:gray; } -fieldset.input.date div.output td.next { color:gray; } -fieldset.input.date div.output td { padding:2px 11px; } -fieldset.input.date table { text-align:center; width:280px; } -fieldset.input.date table td.select { background-color:blue; } -fieldset.input.date table td:hover { background-color:blue; } -body.white fieldset.input.date table { color:white; } - diff --git a/plugin/input/date.js b/plugin/input/date.js index 4d89f4b2..293d8cbe 100644 --- a/plugin/input/date.js +++ b/plugin/input/date.js @@ -57,4 +57,4 @@ Volcanos(chat.ONFIGURE, {help: "控件详情", date: {onclick: function(event, c return now } show(now), can.onlayout.figure(event, can) -})}} }, [""]) +})}} }) diff --git a/plugin/input/key.js b/plugin/input/key.js index 6312c8dd..07167919 100644 --- a/plugin/input/key.js +++ b/plugin/input/key.js @@ -3,6 +3,9 @@ Volcanos(chat.ONFIGURE, {help: "控件详情", key: { can.onmotion.clear(can), can.onappend.table(can, msg, function(value) { return {text: [value, html.TD], onclick: function(event) { can.base.isFunc(cbs) && cbs(can, value, target.value) }} }), can.onappend._status(can, [mdb.TOTAL, mdb.INDEX]), can.Status(mdb.TOTAL, msg.Length()) + can.getActionSize(function(left, top, width, height) { + can.page.style(can, can._target, html.MAX_HEIGHT, top+height-can._target.offsetTop) + }) }, _show: function(event, can, cbs, target, name, value) { can.runAction(event, mdb.INPUTS, [name, value||target.value], function(msg) { diff --git a/plugin/local/code/inner.css b/plugin/local/code/inner.css index 6a3b2bda..33b6580e 100644 --- a/plugin/local/code/inner.css +++ b/plugin/local/code/inner.css @@ -32,7 +32,6 @@ fieldset.inner>div.output fieldset.toolkit>div.output>fieldset>legend { float:le fieldset.inner>div.output fieldset.toolkit>div.status>legend { background:#0d969f8a; padding:4px 4px; border-left:solid 2px red; float:right; } fieldset.inner>div.output fieldset.toolkit>div.status>legend.select { background:green; } fieldset.inner>div.output fieldset.toolkit>div.status>legend:hover { background:green; } -fieldset.inner>div.status { height:26px; } fieldset.inner>div.status legend { background:#0d969f8a; font-size:1.1rem; padding:0px 10px; border-left:solid 2px red; cursor:pointer; float:right; } fieldset.inner>div.status legend.select { background:green; } fieldset.inner>div.status legend:hover { background:green; } diff --git a/plugin/local/team/plan.css b/plugin/local/team/plan.css index 828b07eb..448722d0 100644 --- a/plugin/local/team/plan.css +++ b/plugin/local/team/plan.css @@ -5,4 +5,3 @@ fieldset.plan>div.output div.prepare { background-color:blue; color:white; } fieldset.plan>div.output div.process { background-color:green; color:white; } fieldset.plan>div.output div.cancel { background-color:yellow; color:white; } fieldset.plan>div.output div.finish { background-color:red; color:white; } -body.mobile fieldset.plan>div.action { display:none; } diff --git a/plugin/local/team/plan.js b/plugin/local/team/plan.js index 990e8820..3346b5ac 100644 --- a/plugin/local/team/plan.js +++ b/plugin/local/team/plan.js @@ -167,7 +167,7 @@ Volcanos(chat.ONACTION, {help: "组件交互", list: [ _trans: {"task": "任务", "hour": "时间", "month": "月份"}, insertTask: function(event, can, time) { var msg = can.sup.request(event, {begin_time: time}) can.user.input(event, can, can.Conf([ctx.FEATURE, mdb.INSERT]), function(args) { - can.runAction(event, mdb.INSERT, ["begin_time", time].conat(args)) + can.runAction(event, mdb.INSERT, ["begin_time", time].concat(args)) }) }, modifyTask: function(event, can, task, key, value) { diff --git a/plugin/local/wiki/draw.css b/plugin/local/wiki/draw.css index 00d951d3..c6f1626f 100644 --- a/plugin/local/wiki/draw.css +++ b/plugin/local/wiki/draw.css @@ -1,3 +1,2 @@ fieldset.draw div.output { background-color:#1b5b738c; font-size:20px; } fieldset.draw div.output div.content svg { background-color:#1b5b738c; } -fieldset.draw div.output div.display { max-height:400px; } diff --git a/plugin/local/wiki/feel.css b/plugin/local/wiki/feel.css index b7f837d6..5d02a550 100644 --- a/plugin/local/wiki/feel.css +++ b/plugin/local/wiki/feel.css @@ -1,4 +1,2 @@ fieldset.feel div.output img { display:block; float:left; } fieldset.feel div.output video { display:block; float:left; } -fieldset.feel.float { background-color:#4eaad0c2; position:absolute; } -fieldset.feel.float>legend { display:none; } diff --git a/plugin/local/wiki/word.css b/plugin/local/wiki/word.css index 6248efa2..b1c94d9a 100644 --- a/plugin/local/wiki/word.css +++ b/plugin/local/wiki/word.css @@ -2,10 +2,10 @@ fieldset.word form.option input[name=path] { width:127px; } fieldset.word>div.navmenu { background-color:inherit; overflow:auto; min-width:120px; clear:both; float:left; } fieldset.word>div.navmenu div.list { margin-left:20px; } -fieldset.word>div.navmenu div.item { font-size:1.6em; font-weight:bold; font-family:cursive; padding:4px 10px; } -fieldset.word>div.navmenu>div.item { font-size:2em; } +fieldset.word>div.navmenu div.item { font-size:1.4em; font-weight:bold; font-family:cursive; padding:4px 20px; } +fieldset.word>div.navmenu>div.item { font-size:1.6em; } -fieldset.word a { word-break:break-word; } +fieldset.word a { word-break:break-all; } fieldset.word br.story { clear:both; } fieldset.word ul.story { font-family:monospace; } fieldset.word ul.story li.H2 { font-size:1.4em; font-weight:bold; } @@ -15,27 +15,14 @@ fieldset.word ul.story[data-type=premenu] li:hover { background:cyan; color:blue fieldset.word ul.story[data-type=endmenu] { clear:both; } fieldset.word p.story[data-name=inner] { background-color:#4b6c8a7a; padding:4px 10px; border-left:solid 4px blue; margin:10px 0px; } fieldset.word p.story[data-name=inner]:hover { background-color:#c10c8a; cursor:copy; } -fieldset.word svg.story { display:block; float:left; } -fieldset.word svg.story { font-family:fangsong; } -fieldset.word video.story { max-height:320px; } fieldset.word fieldset.story { margin:10px; } -fieldset.word div.story[data-type=spark][data-name=field]>div.menu { - float:left; overflow:auto; -} -fieldset.word div.story[data-type=spark][data-name=field]>div.list { - float:left; overflow:auto; -} -fieldset.word div.story[data-type=spark][data-name=field]>div.menu div.list div.item { - padding:0 20px; -} - fieldset.word.float { padding:0; margin:0; width:-webkit-fill-available; position:fixed; left:0; top:0; z-index:10; } fieldset.word.float>div.action { display:contents; } fieldset.word.float>div.status { clear:none; } fieldset.word.float>div.output { background-color:#f0f8ff80; padding:20px; overflow:auto; } -fieldset.word.float>div.output>div.project { background:cornsilk; padding:10px; position:fixed; right:0; top:25px; z-index:100; } -fieldset.word.float div.content div.page { margin-top:30px; display:none; } +fieldset.word.float>div.output>div.project { background:darkcyan; padding:10px; position:fixed; right:0; top:31px; z-index:10; } +fieldset.word.float div.content div.page { margin-top:31px; display:none; } fieldset.word.float div.content div.page.show { display:block; } fieldset.word.float div.content.grid div.page { background-color:#a4cbecb5; margin:10px; height:200px; width:200px; overflow:auto; display:block; float:left; } fieldset.word.float h1 { text-align:center; } @@ -47,6 +34,10 @@ fieldset.panel.cmd fieldset.word>form.option { display:none; } fieldset.panel.cmd fieldset.word>div.action { display:none; } fieldset.panel.cmd fieldset.word>div.status { display:none; } +div.story[data-type=spark][data-name=field]>div.menu { float:left; overflow:auto; } +div.story[data-type=spark][data-name=field]>div.list { float:left; overflow:auto; } +div.story[data-type=spark][data-name=field]>div.menu div.list div.item { padding:0 20px; } + div.story[data-type=spark][data-name=shell] label { -moz-user-select:none; /*火狐*/ -webkit-user-select:none; /*webkit浏览器*/ diff --git a/plugin/state.js b/plugin/state.js index 5d5f2a5e..a6fc0ac6 100644 --- a/plugin/state.js +++ b/plugin/state.js @@ -86,7 +86,7 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, conf, cb, ta }) Volcanos(chat.ONACTION, {help: "交互操作", list: [ "刷新数据", "切换全屏", "共享工具", "打开链接", "生成链接", "生成脚本", "生成图片", [ - "其它", "刷新页面", "保存参数", "清空参数", "扩展参数", "复制数据", "下载数据", "清空数据", "删除工具","摄像头", + "其它", "刷新页面", "保存参数", "清空参数", "扩展参数", "复制数据", "下载数据", "清空数据", "删除配置", "删除工具","摄像头", ], ], _engine: function(event, can, button) { can.Update(event, [ctx.ACTION, button].concat(can.Input([], true))) }, @@ -142,6 +142,7 @@ Volcanos(chat.ONACTION, {help: "交互操作", list: [ }, "清空数据": function(event, can) { can.onmotion.clear(can, can._output) }, "删除工具": function(event, can) { can.page.Remove(can, can._target) }, + "删除配置": function(event, can) { can.runAction(event, "config", ["reset"]) }, "打包页面": function(event, can) { can.onengine.signal(can, "onwebpack", can.request(event)) }, diff --git a/plugin/story/json.js b/plugin/story/json.js index cd269cf5..ace7990b 100644 --- a/plugin/story/json.js +++ b/plugin/story/json.js @@ -44,12 +44,12 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, tar }, [""]) Volcanos(chat.ONACTION, {help: "组件菜单", list: ["展开", "折叠", "复制"], "展开": function(event, can) { - can.page.Select(can, can._output, "div.list div.list", function(list) { + can.page.Select(can, can._output, [html.DIV_LIST, html.DIV_LIST], function(list) { can.onmotion.toggle(can, list, true) }) }, "折叠": function(event, can) { - can.page.Select(can, can._output, "div.list div.list", function(list) { + can.page.Select(can, can._output, [html.DIV_LIST, html.DIV_LIST], function(list) { can.onmotion.hidden(can, list) }) }, diff --git a/plugin/story/spide.css b/plugin/story/spide.css index adecc35a..12f9f1b8 100644 --- a/plugin/story/spide.css +++ b/plugin/story/spide.css @@ -1,2 +1 @@ fieldset.draw.spide div.output div.toggle { display:none; } -fieldset.draw.spide div.output div.toggle.project { display:block; } diff --git a/plugin/story/trend.js b/plugin/story/trend.js index 6d754448..01c288e4 100644 --- a/plugin/story/trend.js +++ b/plugin/story/trend.js @@ -116,6 +116,7 @@ Volcanos(chat.ONDETAIL, {help: "用户交互", Volcanos(chat.ONEXPORT, {help: "导出数据", list: ["from", "commit", "total", "max", "date", "text", "add", "del"], height: function(can) { var height = can.Action(html.HEIGHT) if (height == ice.AUTO) { height = can.ConfHeight() } + if (height < 200) { height = 200 } return parseInt(height||can._root._height/2) }, }) diff --git a/proto.js b/proto.js index 09ac61fa..589d03ae 100644 --- a/proto.js +++ b/proto.js @@ -235,7 +235,7 @@ var html = { SCROLL: "scroll", HEIGHT: "height", WIDTH: "width", LEFT: "left", TOP: "top", RIGHT: "right", BOTTOM: "bottom", SPEED: "speed", PADDING: "padding", MIN_HEIGHT: "min-height", MAX_HEIGHT: "max-height", MAX_WIDTH: "max-width", MIN_WIDTH: "min-width", MARGIN_TOP: "margin-top", MARGIN_X: "margin-x", MARGIN_Y: "margin-y", - PLUGIN_MARGIN: 10, ACTION_HEIGHT: 29, ACTION_MARGIN: 200, + PLUGIN_MARGIN: 10, ACTION_HEIGHT: 31, ACTION_MARGIN: 200, TEXT_ANCHOR: "text-anchor", TOGGLE: "toggle",