diff --git a/const.js b/const.js index 5e2e3b98..b5f00469 100644 --- a/const.js +++ b/const.js @@ -391,6 +391,7 @@ var icon = { upload: "bi bi-box-arrow-in-up", download: "bi bi-box-arrow-down", record1: "bi bi-images", record2: "bi bi-record-circle", record: "bi bi-record-circle", "export": "bi bi-box-arrow-up", "import": "bi bi-box-arrow-in-down", + "begin_time": "bi bi-clock-history", version: "bi bi-tags", compile: "bi bi-tools", diff --git a/index.css b/index.css index e6524f21..96284c39 100644 --- a/index.css +++ b/index.css @@ -52,7 +52,7 @@ body { --table-padding:var(--button-padding); --header-height:48px; --footer-height:var(--action-height); --action-height:32px; --status-height:var(--action-height); - --river-width:var(--project-width); --project-width:230px; --input-width:120px; --button-width:60px; --form-width:320px; + --river-width:var(--project-width); --project-width:230px; --input-width:140px; --button-width:60px; --form-width:320px; --url-input-width:320px; --qrcode-height:364px; --qrcode-width:360px; --iframe-height:420px; --textarea-height:96px; --card-height:160px; --card-width:320px; @@ -110,7 +110,6 @@ table.content th.select[data-asc="1"] i.bi-sort-down-alt { display:none; } table.content td.option { cursor:pointer; } table.content td { padding:var(--table-padding); } table.content td i { padding:var(--input-padding); } -/* table.content td i { padding:var(--input-padding); font-size:20px; } */ table.content.detail td { padding:var(--table-padding) 0; } table.content.detail td:first-child { text-align:center; } table.content.detail td i { display:none; } @@ -201,6 +200,7 @@ fieldset.input.key.simple td { min-width:var(--button-width); } fieldset.input.icon img { height:var(--desktop-icon-size); width:var(--desktop-icon-size); cursor:pointer; } fieldset.input.icon div.output td { font-size:28px; padding:var(--input-padding); } fieldset.input.date span.close { display:none; } +fieldset.input.date>div.action { flex-direction:column; } fieldset.input.date>div.action>div { display:flex; justify-content:space-between; } fieldset.input.date div.action>div.time div.item span { display:none; } fieldset.input.date div.action span.close { display:none; } @@ -251,6 +251,7 @@ body>div.carte div.item span.icon.next { line-height:22px; height:22px; float:ri body>div.carte.select.float>div.item { text-align:center; } body>div.carte.header.avatar img { width:370px; } body>div.input { padding:var(--plugin-padding); } +body>div.input { padding:var(--plugin-padding); } body>div.input>legend { float:right; padding:0; } body>div.input tr { margin:var(--button-margin); } body>div.input td { padding:var(--table-padding); } @@ -310,7 +311,7 @@ body>div.upload div.status div.show { float:right; } body>div.upload div.status div.size { text-align:center; } /* display */ fieldset>form.option:not(.hide), fieldset>div.action:not(.hide):not(.flex) { display:contents; } .hide, .hidden { display:none; } -body:not(.mobile) fieldset:not(.Action):not(.output):not(.cmd)>div.action:not(.hide):not(.flex) { display:flex; } +body:not(.mobile) fieldset:not(.Action):not(.output):not(.cmd)>div.action:not(.hide):not(.flex) { display:flex; overflow:hidden; } fieldset.panel>legend, fieldset.panel>div.status { display:none; } fieldset.output>legend, fieldset.output>form.option, fieldset.output>div.action:not(.flex), fieldset.output>div.status, fieldset.output>div.item { display:none; } div.action, div.output, div.status, div.project, div.content, div.profile, div.display, table.content, table.content td, div.list, div.code, div.story, div.float, fieldset.float { overflow:auto; } @@ -321,7 +322,8 @@ fieldset.auto, fieldset.full, fieldset.float { position:fixed; } fieldset.full { position:fixed; left:0; top:0; } fieldset.plug { position:sticky; bottom:0; right:0; float:right; } fieldset.vimer>div.output fieldset.plug { position:absolute; bottom:0; right:0; float:right; } -fieldset.vimer>div.output div.project fieldset.plug { position:static; float:unset;} +fieldset.vimer>div.output div.project fieldset.plug { position:static; float:unset; height:100%; } +fieldset.vimer>div.output div.project fieldset.plug>div.output { height:100%; } fieldset.vimer>div.output div.project fieldset.plug div.output.card>div.item { min-width:120px; width:calc(100% - 2*var(--input-margin)); } div.float { position:fixed; } div.output { position:relative; } div.content { position:relative; } @@ -366,7 +368,7 @@ table.content th:hover { background-color:var(--hover-bg-color); color:var(--hov table.content td:hover { background-color:var(--td-hover-bg-color); color:var(--hover-fg-color); } table.content td.select { background-color:var(--td-hover-bg-color); color:var(--hover-fg-color); } table.content td i:hover { background-color:var(--hover-bg-color); color:var(--hover-fg-color); } -table.content td.action:not(:hover) { background-color:var(--th-bg-color); color:var(--th-fg-color); } +table.content td.action { background-color:var(--th-bg-color); color:var(--th-fg-color); } table.content.checkbox td:first-child { background-color:var(--th-bg-color); } table.content:hover td.option:not(:hover) { background-color:var(--tr-hover-bg-color); color:var(--hover-fg-color); } hr, td.hr { border-bottom:var(--plugin-border-color) dashed 1px; margin:var(--input-margin); } @@ -402,7 +404,7 @@ div.tabs div:hover { background-color:var(--hover-bg-color); color:var(--hover-f div.tabs div.select { background-color:var(--hover-bg-color); color:var(--hover-fg-color); } div.plug legend { background-color:var(--output-bg-color); } div.plug legend:hover { background-color:var(--hover-bg-color); } -div.plug legend.select { background-color:var(--plugin-bg-color); border-bottom:var(--notice-bg-color) solid 3px; border-bottom-width:2px; } +div.plug legend.select { background-color:var(--plugin-bg-color); border-left:var(--notice-bg-color) solid 5px; } div.complete>table { background-color:var(--plugin-bg-color); } fieldset>form.option>div.item.text.cmd>input { background-color:var(--code-bg-color); color:var(--code-fg-color); } fieldset>div.action div.item.select.cmds { border-bottom:var(--notice-bg-color) solid 3px; } @@ -515,10 +517,11 @@ fieldset>div.action>div.cmds { font-style:italic; padding:var(--input-padding) v fieldset>div.output>div.code { font-size:var(--code-font-size); } fieldset>div.output { width:100%; } fieldset>div.status { width:100%; } fieldset>div.status { font-family:var(--status-font-family); font-style:italic; font-size:var(--status-font-size); line-height:20px; max-height:var(--action-height); } -fieldset>div.status>div.item { padding:var(--input-padding); height:31px; } +fieldset>div.status>div.item { padding:var(--input-padding); height:30px; } fieldset>div.status>div.item>label { font-size:var(--status-font-size); } fieldset>div.status>div.item>span { margin-left:var(--input-padding); } -fieldset>div.status>legend { font-style:italic; height:31px; } +fieldset>div.status>legend { font-style:italic; height:30px; } +fieldset>div.status>legend.select { border-left:var(--notice-bg-color) solid 5px; border-radius:0; } fieldset.plug>div.status { height:31px; } /* icon */ i.bi.bi-toggle-on { color:var(--notice-bg-color); } @@ -543,7 +546,7 @@ div.item.select._icon:hover i:first-child { color:unset; } div.item.text>input { width:var(--input-width); height:var(--action-height); } div.item.text.id>input { width:80px; } div.item.text.url>input { width:var(--river-width); } -div.item.text.line>input { width:var(--button-width) !important; } +div.item.text.line>input { width:80px; } div.item.text.limit>input { width:var(--button-width); } div.item.text.offend>input { width:var(--button-width); } body:not(.width2) div.item.text.path>input { width:var(--project-width); } @@ -622,6 +625,8 @@ svg rect:hover { stroke:var(--hover-fg-color); fill:var(--hover-bg-color); } svg line { stroke-width:var(--svg-stroke-width); stroke:var(--body-fg-color); } svg line:hover { stroke:var(--hover-fg-color); } svg path { stroke-width:var(--svg-stroke-width); stroke:var(--body-fg-color); } +svg path[stroke-width] { stroke-width:unset; } +svg path[stroke] { stroke:unset; } svg path:hover { stroke:var(--hover-fg-color); } svg g[font-size] text { font-size:unset; } svg g[stroke-width] rect { stroke-width:unset; } diff --git a/panel/header.css b/panel/header.css index 0adf03c2..14656924 100644 --- a/panel/header.css +++ b/panel/header.css @@ -23,7 +23,7 @@ fieldset.Header>div.output div.search>input { padding-left:25px; } fieldset.Header>div.output div.search>span.icon { padding:var(--input-padding) var(--button-padding); } fieldset.Header>div.output div.Action>div.tabs { padding-left:40px; height:100%; overflow:auto; } fieldset.Header>div.output div.Action>div.tabs div.item { font-style:italic; } -fieldset.Header>div.output div.Action>div.tabs div.item.select { border-bottom:var(--notice-bg-color) solid 3px; } +fieldset.Header>div.output div.Action>div.tabs div.item.select { border-bottom:var(--notice-bg-color) solid 5px; } fieldset.Header>div.output div.Action>div.tabs div.item:only-child { display:none; } body:not(.mobile) fieldset.Header>div.output div.title:first-child { width:var(--river-width); } body:not(.mobile) fieldset.Header>div.output div.title img { margin-right:var(--button-margin); } diff --git a/panel/river.css b/panel/river.css index bc5bb902..24fe0e32 100644 --- a/panel/river.css +++ b/panel/river.css @@ -6,7 +6,7 @@ fieldset.River>div.output { transition:all .3s; } /* fieldset.River>div.output { display:flex; flex-direction:column; align-items:center; } */ fieldset.River>div.output div.item { font-family:var(--legend-font-family); padding:var(--legend-padding); border-left:#00ffae solid 3px; } fieldset.River>div.output div.item:hover { color:var(--panel-hover-fg-color); } -fieldset.River>div.output div.item.select { color:var(--panel-hover-fg-color); border-right:var(--notice-bg-color) solid 3px; } +fieldset.River>div.output div.item.select { color:var(--panel-hover-fg-color); border-right:var(--notice-bg-color) solid 5px; } fieldset.River>div.output div.item>i:first-child { margin-right:var(--button-margin); } fieldset.River>div.output div.list div.item { border-left:#ccdc4c solid 3px; } fieldset.River>div.output div.list { margin-left:var(--legend-padding); } diff --git a/plugin/local/code/inner.css b/plugin/local/code/inner.css index 624a99e8..621873ed 100644 --- a/plugin/local/code/inner.css +++ b/plugin/local/code/inner.css @@ -63,9 +63,9 @@ fieldset.inner>div.output>div.layout>div.path span.view { font-size:22px; paddin 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); position:fixed; right:0; bottom:0; overflow:auto; } */ 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; float:right; } -fieldset.inner.cmd>div.output>div.layout>div.plug>legend { padding:0 var(--input-padding); } -fieldset.inner.cmd>div.output>div.layout>div.plug>legend>span.remove { padding:var(--input-padding); } +fieldset.inner.cmd>div.output>div.layout>div.plug>legend { font-size:var(--legend-font-size); font-style:italic; float:right; padding:0 var(--input-padding); } +fieldset.inner.cmd>div.output>div.layout>div.plug>legend:hover { color:unset; } +fieldset.inner.cmd>div.output>div.layout>div.plug>legend>span.remove { padding:0 var(--input-padding); height:30px; } fieldset.inner.cmd>div.output>div.layout>div.plug>legend>span.remove:hover { background-color:var(--hover-bg-color); } fieldset.inner.cmd>div.output>div.layout>div.plug>legend:not(:hover)>span.remove { visibility:hidden; } fieldset.inner>div.output>div.layout>div.layout>div.profile fieldset.xterm.story>form.option>div.item.hash input { width:120px; } diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js index 4b6ac64d..3e91feb8 100644 --- a/plugin/local/code/inner.js +++ b/plugin/local/code/inner.js @@ -52,8 +52,8 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, cb) { var paths = can.core.Sp link.cmd == web.CODE_VIMER? can.onimport.tabview(can, link.path, link.file, link.line): can.onimport.tabview(can, link.path, link.cmd, ctx.INDEX) } }, can.base.isFunc(cb) && cb(msg) }, - _tabs: function(can) { if (!can.isCmdMode()) { return can.ui.tabs = can._action } - var ui = can.page.Append(can, can.ui.tabs, ["icon", "tabs", "head"]); can.ui.tabs = ui.tabs + _tabs: function(can) { if (!can.isCmdMode()) { return can.ui._tabs = can._action } + var ui = can.page.Append(can, can.ui.tabs, ["icon", "tabs", "head"]); can.ui._tabs = ui.tabs can.page.Append(can, ui.icon, can.core.List([ {name: can.page.unicode.menu, onclick: function() { can.user.carte(event, can, can.onaction, can.onaction.list) }}, {name: can.page.unicode.refresh, style: {"font-size": 26, "padding-top": 2}, onclick: function() { location.reload() }}, @@ -141,7 +141,7 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, cb) { var paths = can.core.Sp function show(skip) { can._msg && can._msg.Option && can._msg.Option(nfs.LINE, can.Option(nfs.LINE)), can._msg = can.db.tabview[key] can.Option(can.onimport.history(can, {path: path, file: file, line: line||can.onexport.session(can, SELECT_LINE+nfs.DF+path+file)||can._msg.Option(nfs.LINE)||1})) can.onsyntax._init(can, can._msg, function(content) { var msg = can._msg; can.onexport.hash(can) - can.isCmdMode() && can.onexport.title(can, (isIndex()||isSpace()? "": path)+file), can.onmotion.select(can, can.ui.tabs, html.DIV_TABS, msg._tab), can.isCmdMode() && msg._tab.scrollIntoView() + can.isCmdMode() && can.onexport.title(can, (isIndex()||isSpace()? "": path)+file), can.onmotion.select(can, can.ui._tabs, html.DIV_TABS, msg._tab), can.isCmdMode() && msg._tab.scrollIntoView() if (isSpace()) { can.ui.path.innerHTML = can.page.Format(html.A, can.base.trimPrefix(can.misc.MergePodCmd(can, {pod: can.Option(nfs.FILE)}), location.origin)) } else if (isIndex()) { @@ -177,7 +177,7 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, cb) { var paths = can.core.Sp can.ui._profile._cache && delete(can.ui._profile._cache[key]), can.ui._display._cache && delete(can.ui._display._cache[key]) delete(can.db.tabview[key]), can._cache_data && delete(can._cache_data[key]) can.onmotion.delay(can, function() { can.user.isWebview && can.onexport.recover(can) }) - }, can.ui.tabs); tabs._list = [path, file, line], can.user.isWebview && can.onexport.recover(can) + }, can.ui._tabs); tabs._list = [path, file, line], can.user.isWebview && can.onexport.recover(can) } if (can.db.tabview[key]) { return !can._msg._tab && !can.isSimpleMode()? load(can.db.tabview[key]): show() } isIndex()||isSpace()? load(can.request({}, {index: file, line: line})): can.run({}, [path, file], load, true) @@ -275,8 +275,9 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, cb) { var paths = can.core.Sp if (can.isSimpleMode()) { can.page.style(can, can._output, html.MAX_HEIGHT, "") } if (can.isSimpleMode() || can.Conf(ctx.STYLE) == html.OUTPUT) { return can.page.style(can, can.ui.content, html.WIDTH, can.ConfWidth()) } if (can.isCmdMode()) { can.ConfHeight(can.page.height()) } var content = can.ui.content; if (!content) { return } if (content._root) { can.ui.content = content._root } can.ui.size = {profile: can._msg.Option(html.WIDTH), display: can._msg.Option(html.HEIGHT)} - can.ui.layout(can.ConfHeight(), can.ConfWidth(), 0, function(height, width) { can.ui.content = content, can.onlayout.layout(can, height, width) - can.ui.tabs.style.width = "" + can.ui.layout(can.ConfHeight(), can.ConfWidth(), 0, function(height, width) { + can.ui._tabs.style.width = "" + can.ui.content = content, can.onlayout.layout(can, height, width) var sub = can.ui.profile._plugin; sub && can.page.isDisplay(can.ui.profile) && sub.onimport && sub.onimport.size(sub, can.ui.profile.offsetHeight, can.ui.profile.offsetWidth-1, true) var sub = can.ui.content._plugin; if (!sub) { return } if (height == sub.ConfHeight()+sub.onexport.actionHeight(sub)+sub.onexport.statusHeight(sub) && width == sub.ConfWidth()) { return } content._root || sub.onimport.size(sub, height, width, true), can.onlayout.layout(can, height, width) diff --git a/plugin/local/wiki/word.js b/plugin/local/wiki/word.js index 5aa2692e..cd077e80 100644 --- a/plugin/local/wiki/word.js +++ b/plugin/local/wiki/word.js @@ -1,4 +1,4 @@ -Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { can.Conf(html.PADDING, 5) +Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { can.Conf(html.PADDING, 10) can.page.Modify(can, target, msg.Results()), can.onimport._content(can, target) can.onmotion.delay(can, function() { can.onappend.scroll(can, can._output) }) },