From 229b889ce9975d821375dab92b11425af2b224b7 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 13 Apr 2024 23:18:19 +0800 Subject: [PATCH] add some --- index.css | 39 +++++++++++++++++++++++++++---------- plugin/input/key.js | 2 +- plugin/local/code/inner.css | 14 ++++++++----- plugin/local/code/inner.js | 9 +++++---- plugin/local/code/xterm.js | 3 ++- 5 files changed, 46 insertions(+), 21 deletions(-) diff --git a/index.css b/index.css index efd518b2..f6e15265 100644 --- a/index.css +++ b/index.css @@ -7,6 +7,12 @@ body { --code-object:purple; --code-datatype:cornflowerblue; --code-package:blue; } } +body.light { + --plugin-bg-color:white; --plugin-fg-color:black; + --code-comment:green; --code-keyword:darkblue; + --code-function:darkcyan; --code-constant:gray; --code-string:brown; + --code-object:purple; --code-datatype:cornflowerblue; --code-package:blue; +} @media (prefers-color-scheme: dark) { body { --plugin-bg-color:black; --plugin-fg-color:silver; @@ -15,6 +21,12 @@ body { --code-object:silver; --code-datatype:lavender; --code-package:blue; } } +body.dark { + --plugin-bg-color:black; --plugin-fg-color:silver; + --code-comment:green; --code-keyword:royalblue; + --code-function:lightgreen; --code-constant:gray; --code-string:orange; + --code-object:silver; --code-datatype:lavender; --code-package:blue; +} body { --code-bg-color:black; --code-fg-color:silver; --notice-bg-color:blue; --notice-fg-color:white; @@ -217,8 +229,9 @@ fieldset>div.header>div { line-height:22px; padding:var(--input-padding); margin fieldset>div.header>div.avatar { padding:0; } fieldset>div.header div.online { padding:0; } fieldset>div.header img { height:var(--action-height); float:right; } -fieldset>form.option>div.item:not(.icon) { margin-right:var(--button-margin); } -fieldset>div.action>div.item:not(:last-child) { margin-right:var(--button-margin); } +fieldset>form.option>div.item:not(.icon) { margin-right:var(--input-margin); } +fieldset>div.action>div.item { margin-right:var(--input-margin); } +// fieldset>div.action>div.item:not(:last-child) { margin-right:var(--input-margin); } fieldset.input>legend { display:none; } fieldset.input.icons table { width:100%; text-align:center; } fieldset.input.key div.action { display:none; } @@ -508,7 +521,7 @@ body.mobile fieldset>legend { box-shadow:none; } body.mobile fieldset.plugin>legend>span { display:block; float:right; } fieldset>form.option>div.item:not(.icon) { box-shadow:var(--input-box-shadow); } fieldset>div.action div.item:not(.state) { box-shadow:var(--input-box-shadow); } -body:not(.mobile) fieldset>div.action div.item:first-child { margin-left:var(--input-margin); } +body:not(.mobile) fieldset>div.action div.item:first-child { margin-left:var(--button-margin); } fieldset>div.action>div.tabs { box-shadow:var(--legend-box-shadow); } fieldset>div.action>div.cmds { box-shadow:var(--legend-box-shadow); } fieldset>div.status>legend { box-shadow:var(--legend-box-shadow); } @@ -560,8 +573,8 @@ fieldset>form.option>div.item.select>input { min-width:var(--button-width); } fieldset>form.option>div.item.textarea { height:var(--textarea-height); width:100%; } fieldset>div.action div.item.filter input { padding-left:24px; } fieldset>div.action div.item { height:var(--action-height); } -fieldset>div.action>div.tabs { font-style:italic; padding:var(--input-padding) var(--button-padding); margin-left:var(--input-margin); height:var(--action-height); } -fieldset>div.action>div.cmds { font-style:italic; padding:var(--input-padding) var(--button-padding); margin-left:var(--input-margin); height:var(--action-height); +fieldset>div.action>div.tabs { font-style:italic; padding:var(--input-padding) var(--button-padding); height:var(--action-height); } +fieldset>div.action>div.cmds { font-style:italic; padding:var(--input-padding) var(--button-padding); height:var(--action-height); min-width:60px; text-align:center; justify-content:center; align-items:center; } fieldset>div.output>div.code { font-size:var(--code-font-size); } @@ -588,7 +601,7 @@ form.option>div.item.icon.goback { font-size:28px; line-height:26px; display:fle form.option>div.icon.delete { font-size:20px; line-height:32px; display:flex; align-items:flex-start; } form.option>div.item.icon.play { font-size:16px; } body.windows form.option>div.item.icon.delete { line-height:31px; display:flex; align-items:flex-start; } -body.windows form.option>div.item.icon.menu { font-size:22px; line-height:32px; } +body.windows form.option>div.item.icon.menu { font-size:22px; line-height:32px; padding:0 3px; } body.windows form.option>div.item.icon.refresh { font-size:24px; line-height:28px; } body.windows form.option>div.item.icon.goback { font-size:24px; line-height:28px; } div.item.text { position:relative; } @@ -902,15 +915,21 @@ div.scrollbar.vertical:hover { width:30px; transition:width .1s; font-size:24px div.scrollbar.horizon:hover { height:30px; transition:height .1s; font-size:24px !important; } div.scrollbar.horizon { height:10px; left:0; bottom:0; transition:height .3s 1s; } form.option>div.text>span.value::-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.project div.list::-webkit-scrollbar { width:0 !important; height:0 !important; } div.content::-webkit-scrollbar { width:0 !important; height:0 !important; } div.status::-webkit-scrollbar { width:0 !important; height:0 !important; } div.toggle::-webkit-scrollbar { width:0 !important; height:0 !important; } +div.story[data-type=spark]::-webkit-scrollbar { width:0 !important; height:0 !important; } div.toast.float div.title::-webkit-scrollbar { width:0 !important; height:0 !important; } body>div.carte::-webkit-scrollbar { width:0 !important; height:0 !important; } -fieldset.word>div.output::-webkit-scrollbar { width:0 !important; height:0 !important; } -fieldset.dream>div.output::-webkit-scrollbar { width:0 !important; height:0 !important; } -fieldset.web.code.git.search>div.output::-webkit-scrollbar { width:0 !important; height:0 !important; } fieldset.panel.River>div.output::-webkit-scrollbar { width:0 !important; height:0 !important; } fieldset.panel.Action>div.output::-webkit-scrollbar { width:0 !important; height:0 !important; } +fieldset.dream>div.output::-webkit-scrollbar { width:0 !important; height:0 !important; } +fieldset.input.key::-webkit-scrollbar { width:0 !important; height:0 !important; } +fieldset.input.key>div.output::-webkit-scrollbar { width:0 !important; height:0 !important; } +body.windows fieldset>div.output::-webkit-scrollbar { width:0 !important; height:0 !important; } +body.windows *::-webkit-scrollbar { width:0 !important; height:0 !important; } +fieldset.word>div.output::-webkit-scrollbar { width:0 !important; height:0 !important; } +fieldset.xterm div.xterm-viewport::-webkit-scrollbar { width:0 !important; height:0 !important; } +fieldset.web.code.git.search>div.output::-webkit-scrollbar { width:0 !important; height:0 !important; } diff --git a/plugin/input/key.js b/plugin/input/key.js index 02bb8f81..2c048dda 100644 --- a/plugin/input/key.js +++ b/plugin/input/key.js @@ -39,7 +39,7 @@ Volcanos(chat.ONFIGURE, {key: { sub.sup = can._fields? can.sup: can meta.msg && meta.msg.Length() > 0? sub._show(sub, meta.msg, cb, target, meta.name): sub._load(event, sub, cb, target, meta.name, target.value) }) }, - onblur: function(event, can, sub, cb) { sub && can.onmotion.delay(can, sub.close, 300) }, + // onblur: function(event, can, sub, cb) { sub && can.onmotion.delay(can, sub.close, 300) }, onkeyup: function(event, can, meta, cb, target, sub, last) { if (event.key == code.TAB) { return } if (event.key == code.ENTER) { return meta._enter && (!can.page.tagis(event.target, html.TEXTAREA) || event.ctrlKey) && meta._enter(event, target.value)? sub && sub.close(): last(event) } if (!sub) { return } can.onmotion.toggle(can, sub._target, true) diff --git a/plugin/local/code/inner.css b/plugin/local/code/inner.css index d72abb65..800b0111 100644 --- a/plugin/local/code/inner.css +++ b/plugin/local/code/inner.css @@ -38,15 +38,17 @@ fieldset.inner>div.output>div.layout>div.layout>div.profile div.status>div { pad fieldset.inner>div.output>div.layout>div.layout div.content div.tips { line-height:var(--code-line-height); color:var(--disable-fg-color); font-style:italic; position:absolute; top:0; right:10px; } fieldset.inner.cmd>div.output>div.layout>div.tabs:not(.hide) { background-color:var(--plugin-bg-color); height:var(--code-tabs-height); display:flex; } fieldset.inner.cmd>div.output>div.layout>div.tabs>div { height:var(--code-tabs-height); } -fieldset.inner.cmd>div.output>div.layout>div.tabs>div.head { flex-direction:row-reverse; } -fieldset.inner.cmd>div.output>div.layout>div.tabs>div.head>div.online { margin-left:0 !important; margin-right:0 !important; } -fieldset.inner.cmd>div.output>div.layout>div.tabs>div.head>div.online span { bottom:12px; } fieldset.inner.cmd>div.output>div.layout>div.tabs>div.icon>div.icon { font-size:26px; line-height:32px; padding:2px 5px; position:sticky; top:0; } fieldset.inner.cmd>div.output>div.layout>div.tabs>div.tabs { justify-content:flex-start; flex-grow:1; flex-wrap:wrap; overflow:auto; } fieldset.inner.cmd>div.output>div.layout>div.tabs>div.tabs:hover { background-color:unset; } fieldset.inner.cmd>div.output>div.layout>div.tabs>div.tabs>div.tabs { padding:var(--input-padding) var(--button-padding); height:var(--code-tabs-height); display:flex; align-items:center; } +fieldset.inner.cmd>div.output>div.layout>div.tabs>div.head { flex-direction:row-reverse; } fieldset.inner.cmd>div.output>div.layout>div.tabs>div.head>div { white-space:pre; padding:10px; } -fieldset.inner.cmd>div.output>div.layout>div.tabs>div.head>div.avatar { padding:0; } +fieldset.inner.cmd>div.output>div.layout>div.tabs>div.head>div { height:var(--code-tabs-height); } +fieldset.inner.cmd>div.output>div.layout>div.tabs>div.head>div.online { margin-left:0 !important; margin-right:0 !important; height:var(--code-tabs-height); } +fieldset.inner.cmd>div.output>div.layout>div.tabs>div.head>div.online span { bottom:12px; } +fieldset.inner.cmd>div.output>div.layout>div.tabs>div.head>div.qrcode i { display:block; margin-top:8px; } +fieldset.inner.cmd>div.output>div.layout>div.tabs>div.head>div.avatar { padding:0; height:var(--code-tabs-height); } fieldset.inner.cmd>div.output>div.layout>div.tabs>div.head>div.avatar>img { height:var(--code-tabs-height); clip-path:circle(40%); } fieldset.inner.cmd>div.output>div.layout>div.path:not(.hide) { display:flex; } fieldset.inner>div.output>div.layout>div.path:not(.hide) { font-style:italic; box-shadow:var(--box-shadow); cursor:pointer; justify-content:flex-start; } @@ -62,7 +64,9 @@ body.mobile fieldset.inner>div.output>div.layout>div.path span.mode { display:no body:not(.mobile) fieldset.inner>div.output>div.layout>fieldset.plug { bottom:var(--action-height); } fieldset.inner>div.output>div.layout>div.path span.space { flex-grow:1; } fieldset.inner>div.output>div.layout>div.path span.space:hover { background-color:unset; cursor:normal; } -fieldset.inner>div.output>div.layout>div.path span.view { font-size:22px; padding:0 var(--input-padding); margin-top:-5px; float:right; } +fieldset.inner>div.output>div.layout>div.path span.view { font-size:22px; font-style:normal; padding:0 var(--input-padding); margin-top:-5px; float:right; } +body.windows fieldset.inner>div.output>div.layout>div.path span.view { margin-top:0; } +body.windows fieldset.inner>div.output>div.layout>div.path span.view { font-style:normal; } fieldset.inner>div.output>div.layout>fieldset.plug.output { white-space:pre; } fieldset.inner.cmd>div.output>div.layout>div.plug { height:var(--action-height); overflow:auto; } fieldset.inner.cmd>div.output>div.layout>div.plug>legend { font-size:var(--legend-font-size); font-style:italic; padding:0 var(--input-padding); margin-right:0; float:right; } diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js index 6594a724..8aed35c7 100644 --- a/plugin/local/code/inner.js +++ b/plugin/local/code/inner.js @@ -129,11 +129,12 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, cb) { var paths = can.core.Sp }}]) }, _tabIcon: function(can) { - can.user.isWindows || can.page.Append(can, can.ui.path, can.core.Item({ - "\u271A": shy({translate: "0 2px"}, function(event) { can.onaction.open(event, can, "open") }), - "\u2756": shy({translate: "0 2px"}, function(event) { can.onaction.plug(event, can, "plug") }), + // can.user.isWindows || + can.page.Append(can, can.ui.path, can.core.Item({ + "\u271A": shy({transform: "translate(0 2px)"}, function(event) { can.onaction.open(event, can, "open") }), + "\u2756": shy({}, function(event) { can.onaction.plug(event, can, "plug") }), "\u25E7": function(event) { var show = can.onmotion.toggle(can, can.ui.project); can.onimport.layout(can), can.isCmdMode() && can.onexport.session(can, PROJECT_HIDE, show? "": html.HIDE) }, - "\u25E8": shy({translate: "0 2px", rotate: "90deg"}, function(event) { if (can.page.isDisplay(can.ui.display)) { return can.onmotion.hidden(can, can.ui.display), can.onimport.layout(can) } can.onaction.exec(event, can) }), + "\u25E8": shy({transform: "rotate(90deg) translate"+(can.user.isWindows? "(-2px)": "(1px)")}, function(event) { if (can.page.isDisplay(can.ui.display)) { return can.onmotion.hidden(can, can.ui.display), can.onimport.layout(can) } can.onaction.exec(event, can) }), "\u25E8 ": function(event) { if (can.page.isDisplay(can.ui.profile)) { return can.onmotion.hidden(can, can.ui.profile), can.onimport.layout(can) } can.onaction.show(event, can) }, }, function(text, cb) { return cb && {text: [text, html.SPAN, html.VIEW], style: cb.meta, onclick: cb} })) }, diff --git a/plugin/local/code/xterm.js b/plugin/local/code/xterm.js index cdaa5e5a..c437e3e6 100644 --- a/plugin/local/code/xterm.js +++ b/plugin/local/code/xterm.js @@ -177,6 +177,7 @@ Volcanos(chat.ONEXPORT, {list: [mdb.TIME, mdb.HASH, mdb.TYPE, mdb.NAME, "rows", return {type: target.className, name: name, list: can.page.SelectChild(can, target, can.page.Keys(html.DIV_OUTPUT, html.DIV_LAYOUT), function(target) { return show(target) })} } else { var item = target._term._item; return {type: item.type, name: name, text: item.text, hash: item.hash} } } return show(target._output) }) }, - title: function(can, term, title) { can.page.Modify(can, can.page.SelectOne(can, term._output._tabs, html.SPAN_NAME), title), can.Status(mdb.NAME, title), can.sup.onexport.title(can.sup, title) }, + title: function(can, term, title) { + term && term._output && can.page.Modify(can, can.page.SelectOne(can, term._output._tabs, html.SPAN_NAME), title), can.Status(mdb.NAME, title), can.sup.onexport.title(can.sup, title) }, }) })()