diff --git a/frame.js b/frame.js index 30745613..51e46456 100644 --- a/frame.js +++ b/frame.js @@ -488,6 +488,7 @@ Volcanos(chat.ONLAYOUT, {help: "页面布局", _init: function(can, target) { ta if (right) { layout.bottom -= target.offsetHeight } if (layout.bottom < html.ACTION_HEIGHT) { layout.bottom = html.ACTION_HEIGHT } } + // if (can.user.isMobile && !can.user.isLandscape()) { layout.left = 0, layout.right = "" } return can.page.style(can, target, layout), can.onmotion.move(can, target, layout), layout }, diff --git a/page/index.css b/page/index.css index adc709ae..12b7257e 100644 --- a/page/index.css +++ b/page/index.css @@ -46,10 +46,10 @@ 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=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=insert] { background-color:blue; } */ input[type=button][name=trash] { background-color:red; } div.tabs { background-color:#00000038; color:white; padding:5px; margin:0 1px; } @@ -57,7 +57,6 @@ div.code { background-color:#343a3445; color:white; padding:10px; border:solid 3 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; } -body.mobile form.option>div.item { margin-right:0px; } 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; } @@ -165,9 +164,9 @@ 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=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=insert] { background-color:blue; } */ body.white input[type=button][name=delete] { background-color:red; } body.white input[type=button][name=trash] { background-color:red; } @@ -180,11 +179,8 @@ 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.4rem; } +body.mobile input { font-size:1.3rem; } body.mobile textarea { font-size:1.2rem; } -body.mobile input[type=text] { padding-top:3px; height:2.47rem; } -body.mobile.white input[type=text] { padding-top:3px; height:2.35rem; } -body.mobile select { font-size:1.4rem; margin-top:3px; height:42px; } 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; } @@ -260,15 +256,12 @@ 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; border:2px solid #FFCC33; } +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; } -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; } 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; } @@ -301,8 +294,6 @@ body.simple div.output.card div.item>div.title { border-bottom:solid 1px #e7e7e7 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.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.simple fieldset.feel.float { top:0 } @@ -311,3 +302,20 @@ 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.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.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 table.content th { padding:6px 6px; } +body.mobile fieldset.input.date div.output td { padding:8px 20px; } diff --git a/panel/action.css b/panel/action.css index d51f448e..63f87eaf 100644 --- a/panel/action.css +++ b/panel/action.css @@ -23,7 +23,6 @@ fieldset.Action>div.project.toggle { 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; } -body.mobile fieldset.panel.cmd>div.output>fieldset.plugin>legend { height:42px; } div.output.form div.item { margin:10px 40px; diff --git a/panel/header.js b/panel/header.js index 91cbf68e..5e75f68f 100644 --- a/panel/header.js +++ b/panel/header.js @@ -47,10 +47,9 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, tar can.onimport.menu(can, mdb.SEARCH, function() { can.onengine.signal(can, chat.ONOPENSEARCH, can.request(event, {type: mdb.FOREACH, word: ui.value})) }) - can.user.isMobile && can.page.style(can, ui.parentNode, {float: html.RIGHT}) }, _menus: function(can, msg, target) { - can.setHeaderMenu(can.user.mod.isPod||can.user.isExtension||can.user.isMobile? [ctx.CONFIG]: + can.setHeaderMenu(can.user.mod.isPod? [ctx.CONFIG]: can.base.Obj(msg.Option(chat.MENUS)||can.Conf(chat.MENUS), can.onaction._menus), function(event, button) { can.core.CallFunc(can.onaction[button]||function(event, can) { can.run(event, [button], function(msg) { can.user.toastSuccess(can, can.user.trans(can, button)) }) diff --git a/panel/river.js b/panel/river.js index 3d4dbe59..f98ae8e9 100644 --- a/panel/river.js +++ b/panel/river.js @@ -14,7 +14,7 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, tar can._main_river = can.misc.Search(can, chat.RIVER)||msg.Option(ice.MSG_RIVER)||Volcanos.meta.args.river||can._main_river||"project" can._main_storm = can.misc.Search(can, chat.STORM)||msg.Option(ice.MSG_STORM)||Volcanos.meta.args.storm||can._main_storm||"studio" }, - _menu: function(can, msg) { if (can.user.mod.isPod) { return } + _menu: function(can, msg) { if (can.user.mod.isPod||can.user.isMobile) { return } can.setHeaderMenu(can.base.Obj(msg.Option(chat.MENUS), can.Conf(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)]) }) diff --git a/plugin/local/code/inner.css b/plugin/local/code/inner.css index fc90d7d3..6a3b2bda 100644 --- a/plugin/local/code/inner.css +++ b/plugin/local/code/inner.css @@ -53,7 +53,7 @@ body.white fieldset.inner>div.output div.project { color:#a2dad2; } body.white fieldset.inner>div.output div.content { background-color:#013b675c; } body.white fieldset.inner>div.output div.content td.text span.string { color:#a703a7; } -body.mobile fieldset.inner.float legend { height:42px; } +body.mobile fieldset.inner.float legend { height:38px; } body.mobile fieldset.inner>form.option input[name=file] { width:90px; } body.mobile fieldset.plugin.inner div.action { display:none; } body.mobile.landscape fieldset.plugin.inner div.action { display:contents; } @@ -115,10 +115,6 @@ body.white.simple fieldset.plugin div.output.json div.item span.key { color:blue body.simple fieldset.plugin div.output.json div.item span.string { color:magenta; } body.mobile.simple fieldset.inner>div.output div.toggle { display:block; } -body.mobile.simple input[type=button] { height:45px; } -body.mobile.simple fieldset.inner>div.output div.content legend { height:45px; } body.mobile.simple fieldset.inner>div.output div.toggle { background-color:lightblue; width:30px; } body.mobile.simple fieldset.inner>div.output div.toggle.display { background-color:lightblue; margin-top:-33px; height:30px; width:100px; } -body.mobile fieldset.Action div.output fieldset.Full>legend { float:none; } -body.mobile fieldset.inner>div.output div.content legend { height:45px; }