diff --git a/index.css b/index.css index 74318160..854c1877 100644 --- a/index.css +++ b/index.css @@ -73,7 +73,7 @@ body { body.en { --card-button:3; } body.mobile { --footer-height:60px; --qrcode-height:284px; --svg-font-size:13px; } body.width1 { /* 320-640 手机竖屏 */ - --river-width:280px; --project-width:120px; --input-width:80px; --url-input-width:160px; --form-width:320px; + --river-width:280px; --project-width:120px; --input-width:80px; --url-input-width:160px; --form-width:290px; --river-margin:0; --plugin-margin:0; --button-margin:5px; --table-button:2; --card-button:3; --legend-margin:5px; diff --git a/panel/header.css b/panel/header.css index ea861217..8e1551f1 100644 --- a/panel/header.css +++ b/panel/header.css @@ -1,7 +1,7 @@ fieldset.Header>div.output { line-height:21px; height:var(--header-height); overflow:hidden; } fieldset.Header>div.output div.item { background-color:var(--panel-output-bg-color); padding:13.5px; height:var(--header-height); float:left; } fieldset.Header>div.output div.item.title:first-child { font-size:var(--legend-font-size); font-style:italic; font-weight:bold; white-space:pre; overflow:hidden; } -fieldset.Header>div.output div.item.title img { height:var(--action-height); width:var(--action-height); } +fieldset.Header>div.output div.item.title img { padding:0; height:var(--action-height); width:var(--action-height); } fieldset.Header>div.output div.item.layout>i { margin-left:var(--input-padding); } fieldset.Header>div.output div.item.layout:not(:hover)>i { visibility:hidden; } fieldset.Header>div.output div.item.layout { padding-right:0; } diff --git a/panel/river.js b/panel/river.js index 32dc82c3..03849f5b 100644 --- a/panel/river.js +++ b/panel/river.js @@ -45,6 +45,9 @@ Volcanos(chat.ONACTION, {list: [mdb.CREATE, web.SHARE, web.REFRESH], _init: func share: function(event, can) { can.core.CallFunc(can.ondetail.share, {event: event, can: can}) }, onsize: function(can, height) { var margin = 68, _margin = margin can.page.style(can, can._output, html.MARGIN, "0px", html.HEIGHT, "", html.MAX_HEIGHT, "") + if (can.user.isMobile || !can.user.isTechOrRoot(can)) { + margin = 0 + } if (can._output.offsetHeight < height-margin) { margin += (height-margin-can._output.offsetHeight)/2 } else { @@ -147,7 +150,7 @@ Volcanos(chat.ONENGINE, { if (cmds.length != 1 && cmds[1] != chat.STORM) { return false } var river = list[cmds[0]]; if (!river) { return false } can.core.ItemOrder(river.storm, mdb.ORDER, function(key, value) { if (!value) { return } if (value.nodetype && value.nodetype != can.user.info.nodetype) { return } - if (can.user.info.userrole == aaa.ROOT || can.base.isIn(value.type||"", "", aaa.VOID, can.user.info.userrole)) { + if (can.base.isIn(can.user.info.userrole, value.type||aaa.VOID, aaa.TECH, aaa.ROOT)) { msg.Push({hash: key, name: can.user.isEnglish(can)? key: value.name||(can.user.trans(can, key)+" "+key), icon: value.icon||icon[key]||"", main: value.main||false}) } }), can.base.isFunc(cb) && cb(msg); return true diff --git a/plugin/local/wiki/word.js b/plugin/local/wiki/word.js index cd077e80..b673b21e 100644 --- a/plugin/local/wiki/word.js +++ b/plugin/local/wiki/word.js @@ -44,7 +44,9 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { can.Conf(html.PADDI }); select && select.click() }, field: function(can, meta, target) { var item = can.base.Obj(meta.meta) - var padding = 2*can.Conf(html.PADDING); if (can.user.isMobile && !can.isCmdMode()) { padding *= 2 } + var padding = 2*can.Conf(html.PADDING); + // if (can.user.isMobile && !can.isCmdMode() && can.ConfIndex() == web.PORTAL) { padding *= 2 } + // if (can.user.isMobile && !can.isCmdMode()) { padding *= 2 } if (!item.width || parseInt(item.width) > can.ConfWidth()) { item.width = can.ConfWidth()-padding } var width = item.width can.onappend.plugin(can, item, function(sub) { can._plugins = (can._plugins||[]).concat([sub]) @@ -110,7 +112,7 @@ Volcanos(chat.ONACTION, { } return can.core.CallFunc([can.onimport, data.type], [sub, data, item, can.page.width()]), item }), }]) - }), can.onmotion.hidden(can, sub.ui.project), can.ondetail.show(sub, 0) + }), can.onmotion.hidden(can, sub.ui.project), can.ondetail.show(sub, 0) sub.onappend._status(sub, [mdb.PAGE, cli.FROM, cli.COST]), sub.Status(cli.FROM, can.base.Time()), sub.Status(mdb.PAGE, list.length) var from = new Date(); can.core.Timer({interval: 100}, function() { var now = new Date(); sub.Status(cli.COST, can.base.Duration(now-from)) }) }, can._root._target)