diff --git a/core/chat/macos/desktop.css b/core/chat/macos/desktop.css index 0f89e4a0..a0387eee 100644 --- a/core/chat/macos/desktop.css +++ b/core/chat/macos/desktop.css @@ -28,7 +28,7 @@ fieldset.macos.desktop>div.output>fieldset.macos.notifications>div.output>div.it fieldset.macos.desktop>div.output>fieldset.macos.notifications>div.output>div.item div.content { font-size:var(--status-font-size); } fieldset.macos.desktop>div.output>div.desktop { display:flex; flex-direction:column; flex-wrap:wrap; align-content:start; gap:10px; height:calc(100% - 125px); overflow:auto; } fieldset.macos.desktop>div.output>div.desktop:not(.select) { display:none; } -fieldset.macos.desktop>div.output>div.desktop>div.item { text-align:center; width:var(--desktop-icon-size); } +fieldset.macos.desktop>div.output>div.desktop>div.item { text-align:center; } fieldset.macos.desktop>div.output>div.desktop>div.item img { object-fit:contain; height:var(--desktop-icon-size); width:var(--desktop-icon-size); } fieldset.macos.desktop>div.output>div.desktop>div.item>div.name { font-size:var(--code-font-size); width:var(--desktop-icon-size); overflow:hidden; } fieldset.macos.desktop>div.output>div.desktop>fieldset { border-radius:var(--plugin-radius); position:absolute; } @@ -37,11 +37,14 @@ fieldset.macos.desktop>div.output>div.desktop>fieldset>div.item.button { border- fieldset.macos.desktop>div.output>div.desktop>fieldset>div.item.button:not(:hover)>span { display:none; } fieldset.macos.desktop>div.output>div.desktop>fieldset>legend { padding:0 var(--input-padding); margin:var(--button-margin); box-shadow:none; } fieldset.macos.desktop>div.output>div.desktop>fieldset>legend:not(:hover) { background-color:transparent; } -fieldset.macos.desktop>div.output>div.desktop>fieldset>form.option>*:not(.textarea) { margin:var(--button-margin); } +fieldset.macos.desktop>div.output>div.desktop>fieldset div.item.button.window span { position:absolute; left:8px; top:2px; } +fieldset.macos.desktop>div.output>div.desktop>fieldset>form.option>*:not(.textarea) { margin:var(--button-margin) var(--input-margin); } fieldset.macos.desktop>div.output>div.desktop>fieldset>form.option>div.icon { margin:var(--button-margin) 0; } +fieldset.macos.desktop>div.output>div.desktop>fieldset>form.option>div.list.icons { margin:var(--button-margin) 0; } +fieldset.macos.desktop>div.output>div.desktop>fieldset>form.option>div.back.icons { margin:var(--button-margin) 0; } fieldset.macos.desktop>div.output>div.desktop>fieldset>form.option>div.item:last-child { margin-right:100px; } fieldset.macos.desktop>div.output>div.desktop>fieldset>div.action>div.item:last-child { margin-right:100px; } -fieldset.macos.desktop>div.output>div.desktop>fieldset>div.action>* { margin:var(--button-margin); } +fieldset.macos.desktop>div.output>div.desktop>fieldset>div.action>* { margin:var(--button-margin) var(--input-margin); } fieldset.macos.desktop>div.output>div.desktop>fieldset>div.action>div.tabs { display:none; } fieldset.macos.desktop>div.output>div.desktop>fieldset>div.output>table.content { width:100%; } fieldset.macos.desktop>div.output>div.desktop>fieldset>div.output>table.content th { padding:var(--table-padding); } @@ -80,5 +83,6 @@ body:not(.mobile) fieldset.macos.dock>div.output>div.item:hover { background-col body:not(.mobile) fieldset.macos.dock>div.output>div.item img:hover { width:160px; transition:width 0.3s; } body:not(.mobile) fieldset.macos.desktop>div.output>fieldset.macos.dock:hover { margin-left:-40px; transition:margin-left 0.3s; } body:not(.mobile) fieldset.macos.desktop>div.output>div.desktop>fieldset:not(:hover)>form.option>div.icon { visibility:hidden; } +body:not(.mobile) fieldset.macos.desktop>div.output>div.desktop>div.item { margin:10px; } body.mobile fieldset.macos.desktop>div.output>div.desktop>fieldset>form.option>div.item.text>input { width:60px; } body.mobile fieldset.macos.dock>div.output { overflow-y:hidden; } diff --git a/core/chat/macos/desktop.js b/core/chat/macos/desktop.js index 22ea63d7..22dae3e8 100644 --- a/core/chat/macos/desktop.js +++ b/core/chat/macos/desktop.js @@ -78,7 +78,7 @@ Volcanos(chat.ONIMPORT, { }}])._target; sub.onmotion.hidden(sub, sub._target) }}, full: {color: "#32c840", inner: "+", onclick: function(event) { sub.onaction.full(event, sub) }}, }, function(name, item) { - can.page.insertBefore(can, [{view: [[html.ITEM, html.BUTTON, name], ""], title: name, list: [{text: item.inner}], style: {"background-color": item.color, right: 10+25*index++}, onclick: item.onclick}], sub._output) + can.page.insertBefore(can, [{view: [[html.ITEM, html.BUTTON, "window", name], ""], title: name, list: [{text: item.inner}], style: {"background-color": item.color, right: 10+25*index++}, onclick: item.onclick}], sub._output) }) sub.onexport.marginTop = function() { return 25 }, sub.onexport.marginBottom = function() { return 100 } sub.onexport.actionHeight = function(sub) { return can.page.ClassList.has(can, sub._target, html.OUTPUT)? 0: html.ACTION_HEIGHT+20 } diff --git a/misc/ssh/relay/relay.go b/misc/ssh/relay/relay.go index 55a86489..255ef154 100644 --- a/misc/ssh/relay/relay.go +++ b/misc/ssh/relay/relay.go @@ -69,7 +69,7 @@ type relay struct { dream string `name:"dream" help:"空间"` forEach string `name:"forEach machine cmd*:textarea=pwd" help:"遍历"` forFlow string `name:"forFlow machine cmd*:textarea=pwd" help:"流程"` - list string `name:"list machine auto" help:"代理"` + list string `name:"list machine auto" help:"代理" icon:"relay.png"` pushbin string `name:"pushbin" help:"部署"` adminCmd string `name:"adminCmd cmd" help:"命令"` } diff --git a/misc/wx/ide.go b/misc/wx/ide.go index 36c61bdc..1281f8b1 100644 --- a/misc/wx/ide.go +++ b/misc/wx/ide.go @@ -107,7 +107,7 @@ const IDE = "ide" func init() { Index.MergeCommands(ice.Commands{ - IDE: {Name: "ide hash auto", Help: "集成开发环境", Meta: Meta(), Actions: ice.MergeActions(ice.Actions{ + IDE: {Name: "ide hash auto", Help: "集成开发环境", Icon: "wxdev.png", Meta: Meta(), Actions: ice.MergeActions(ice.Actions{ mdb.INPUTS: {Hand: func(m *ice.Message, arg ...string) { switch mdb.HashInputs(m, arg); arg[0] { case PAGES: @@ -152,16 +152,16 @@ func init() { }) m.Cmd("", AUTO_PREVIEW) }}, - AUTO_PREVIEW: {Help: "预览", Hand: func(m *ice.Message, arg ...string) { + AUTO_PREVIEW: {Help: "预览", Icon: "bi bi-wechat", Hand: func(m *ice.Message, arg ...string) { kit.If(m.Option(mdb.HASH), func(p string) { mdb.Config(m, CURRENT, p) }) IdeCli(m, "", _ide_args_cli(m)).ProcessInner() }}, - PREVIEW: {Help: "体验", Hand: func(m *ice.Message, arg ...string) { + PREVIEW: {Help: "体验", Icon: "bi bi-qr-code-scan", Hand: func(m *ice.Message, arg ...string) { kit.If(m.Option(mdb.HASH), func(p string) { mdb.Config(m, CURRENT, p) }) p := nfs.TempName(m) IdeCli(m, "", _ide_args_cli(m), _ide_args_qrcode(m, p)).EchoImages(web.SHARE_LOCAL + p).ProcessInner() }}, - PUSH: {Name: "push weixin", Help: "推送", Hand: func(m *ice.Message, arg ...string) { + PUSH: {Name: "push weixin", Help: "推送", Icon: "bi bi-arrow-up-right-square", Hand: func(m *ice.Message, arg ...string) { defer m.ProcessHold() defer web.ToastProcess(m)() m.Cmd(web.SPACE, m.Option(web.WEIXIN), lex.PARSE, m.Cmdx("", m.Option(mdb.HASH)))