diff --git a/core/chat/flows.css b/core/chat/flows.css index cee5e0ac..a9701963 100644 --- a/core/chat/flows.css +++ b/core/chat/flows.css @@ -1,11 +1,11 @@ body { --web-flows-done:lightgreen; --web-flows-fail:var(--danger-bg-color); } fieldset.web.flows>div.output>div.layout>div.layout>div.content svg line.fail { stroke:var(--web-flows-fail); } fieldset.web.flows>div.output>div.layout>div.layout>div.content svg line.done { stroke:var(--web-flows-done); } -fieldset.web.flows>div.output>div.layout>div.layout>div.content svg line.select { stroke:var(--notice-fg-color); } +fieldset.web.flows>div.output>div.layout>div.layout>div.content svg line.select { stroke:var(--notice-bg-color); } fieldset.web.flows>div.output>div.layout>div.layout>div.content svg rect.fail { stroke:var(--web-flows-fail); } fieldset.web.flows>div.output>div.layout>div.layout>div.content svg rect.done { stroke:var(--web-flows-done); } -fieldset.web.flows>div.output>div.layout>div.layout>div.content svg rect.select { stroke:var(--notice-fg-color); } +fieldset.web.flows>div.output>div.layout>div.layout>div.content svg rect.select { stroke:var(--notice-bg-color); } fieldset.web.flows>div.output>div.layout>div.layout>div.content svg text { dominant-baseline:middle; } fieldset.web.flows>div.output>div.layout>div.layout>div.content svg text.fail { stroke:var(--web-flows-fail); fill:var(--web-flows-fail); } fieldset.web.flows>div.output>div.layout>div.layout>div.content svg text.done { stroke:var(--web-flows-done); fill:var(--web-flows-done); } -fieldset.web.flows>div.output>div.layout>div.layout>div.content svg text.select { stroke:var(--notice-fg-color); fill:var(--notice-fg-color); } +fieldset.web.flows>div.output>div.layout>div.layout>div.content svg text.select { stroke:var(--notice-bg-color); fill:var(--notice-bg-color); } diff --git a/core/chat/macos/desktop.css b/core/chat/macos/desktop.css index 79e84e12..77e233a6 100644 --- a/core/chat/macos/desktop.css +++ b/core/chat/macos/desktop.css @@ -30,7 +30,8 @@ fieldset.macos.desktop>div.output>div.desktop>fieldset>div.output>table.content fieldset.macos.desktop>div.output>div.desktop>fieldset>div.output>table.content td { padding:10px; } fieldset.macos.desktop>div.output>div.desktop>fieldset>div.output>table.content td>input { margin:5px; } fieldset.macos.desktop>div.output>div.desktop>fieldset>div.item.button { border-radius:20px; height:20px; width:20px; scale:0.7; position:absolute; top:16px; right:10px; } -fieldset.macos.desktop>div.output>div.desktop>fieldset>legend { background-color:unset; padding-right:10px; margin:10px 0; box-shadow:none; } +fieldset.macos.desktop>div.output>div.desktop>fieldset>legend { padding-right:10px; margin:10px 0; box-shadow:none; } +fieldset.macos.desktop>div.output>div.desktop>fieldset>legend:not(:hover) { background-color:unset; } fieldset.macos.desktop>div.output>div.desktop>fieldset>form.option>*:not(.textarea) { margin:10px 0px 10px 10px; } fieldset.macos.desktop>div.output>div.desktop>fieldset>form.option>div.icon { margin-left:0; margin-top:10px; margin-bottom:8px; } fieldset.macos.desktop>div.output>div.desktop>fieldset>form.option>div.item.button>span.icon { font-size:26px; line-height:28px; } @@ -39,7 +40,7 @@ fieldset.macos.desktop>div.output>div.desktop>fieldset>form.option>div.item.icon fieldset.macos.desktop>div.output>div.desktop>fieldset>form.option>div.item:last-child { margin-right:20px; } fieldset.macos.desktop>div.output>div.desktop>fieldset>form.option>div.item:last-child { margin-right:80px; } fieldset.macos.desktop>div.output>div.desktop>fieldset>div.action>* { margin:10px 0px 10px 10px; } -fieldset.macos.desktop>div.output>div.desktop>fieldset>div.action>div.item.icons>span.icon { margin-top:10px; } +// fieldset.macos.desktop>div.output>div.desktop>fieldset>div.action>div.item.icons>span.icon { margin-top:10px; } fieldset.macos.desktop>div.output>div.desktop>fieldset>div.action>div.item:last-child { margin-right:120px; } fieldset.macos.desktop>div.output>div.desktop>fieldset.web.wiki.feel>div.status { display:none; } fieldset.macos.desktop>div.output>div.desktop>fieldset.web.code.vimer>div.status { display:none; } @@ -73,7 +74,8 @@ body.light fieldset.macos.desktop>div.output>fieldset.macos { background-color:# body.light fieldset.macos.desktop>div.output>fieldset.macos.notifications { background-color:transparent; } body.light fieldset.macos.desktop>div.output>fieldset.macos.notifications div.item { background-color:#daefff99; } body.light fieldset.macos.desktop>div.output>div.desktop>fieldset { background-color:#dee1e6; } -body.light fieldset.macos.desktop>div.output>div.desktop fieldset input { background-color:white; border:#e4e5e5 solid 1px; } +body.light fieldset.macos.desktop>div.output>div.desktop fieldset input:not(:hover) { background-color:white; } +// body.light fieldset.macos.desktop>div.output>div.desktop fieldset input:not(:hover) { background-color:white; border:#e4e5e5 solid 1px; } body.light fieldset.macos.desktop>div.output>div.desktop fieldset table.content tbody tr:nth-child(odd) { background-color:#f4f5f5; } body.light fieldset.macos.desktop>div.output>div.desktop fieldset table.content tbody tr:nth-child(even) { background-color:white; } body.light fieldset.macos.desktop>div.output>div.desktop fieldset>div.output.card>div.item { border:#d3d4d4 solid 1px; } diff --git a/core/code/xterm.go b/core/code/xterm.go index 2e632336..b000836f 100644 --- a/core/code/xterm.go +++ b/core/code/xterm.go @@ -86,6 +86,8 @@ func init() { }}, mdb.INPUTS: {Hand: func(m *ice.Message, arg ...string) { switch mdb.HashInputs(m, arg); arg[0] { + case mdb.HASH: + fallthrough case mdb.TYPE: m.Push(arg[0], "/bin/ish", kit.Select("/bin/sh", os.Getenv("SHELL"))) m.Cmd(mdb.SEARCH, mdb.FOREACH, ssh.SHELL, ice.OptionFields("type,name,text"), func(value ice.Maps) { diff --git a/misc.go b/misc.go index d6b3ecfe..79afa7fe 100644 --- a/misc.go +++ b/misc.go @@ -40,12 +40,10 @@ func (m *Message) Split(str string, arg ...string) *Message { for i, v := range indexs { if v >= len(l) { m.Push(kit.Select(SP, fields, i), "") - continue - } - if i == len(indexs)-1 { - m.Push(kit.Select(SP, fields, i), strings.TrimSpace(l[v:])) - } else { + } else if i+1 < len(indexs) && indexs[i+1] < len(l) { m.Push(kit.Select(SP, fields, i), strings.TrimSpace(l[v:indexs[i+1]])) + } else { + m.Push(kit.Select(SP, fields, i), strings.TrimSpace(l[v:])) } } continue @@ -64,6 +62,9 @@ func (m *Message) Split(str string, arg ...string) *Message { func (m *Message) SplitIndex(str string, arg ...string) *Message { return m.Split(str, kit.Simple(INDEX, arg)...) } +func (m *Message) SplitIndexReplace(str string, arg ...string) *Message { + return m.SplitIndex(kit.Replace(str, arg...)) +} func (m *Message) SetAppend(arg ...string) *Message { kit.If(len(arg) == 0, func() { m.OptionFields("") }) return m.Set(MSG_APPEND, arg...)