From ea16fd53134d53f65bd369d04d25682e0491aea8 Mon Sep 17 00:00:00 2001 From: shy Date: Mon, 4 Mar 2024 12:45:42 +0800 Subject: [PATCH] add some --- index.css | 13 +------------ lib/user.js | 1 + plugin/local/code/inner.css | 8 +++----- plugin/local/code/inner.js | 2 +- plugin/table.js | 4 +++- 5 files changed, 9 insertions(+), 19 deletions(-) diff --git a/index.css b/index.css index 5e261796..cf6ad627 100644 --- a/index.css +++ b/index.css @@ -211,20 +211,9 @@ div.item.online.state img:hover { background-color:var(--hover-bg-color); } div.item.online.state:not(:hover) img:not(:first-child) { margin-right:-20px; } fieldset>div.header { display:contents; } fieldset>div.header>div { line-height:22px; padding:var(--input-padding); float:right; } +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>div.action>div.online { margin-left:var(--button-margin) !important; display:block; } -fieldset>div.action>div.online.state { box-shadow:none; margin-right:var(--button-margin) !important; display:block; overflow:hidden; position:relative; } -fieldset>div.action>div.online span { background-color:var(--hover-bg-color); color:var(--hover-fg-color); font-size:var(--status-font-size); position:absolute; bottom:0; } -fieldset>div.action>div.online img { height:var(--action-height); transition:margin-right 1s; float:right; } -fieldset>div.action>div.online img:hover { background-color:var(--hover-bg-color); } -fieldset>div.action>div.online:not(:hover) img:not(:first-child) { margin-right:-20px; } - -body.mobile fieldset>div.action>div.online img:not(:first-child) { margin-right:-20px; } -body.width6 fieldset>div.action>div.online:not(:hover) img:not(:first-child) { margin-right:var(--input-margin); } -fieldset>div.action>div.online:hover img:not(:first-child) { margin-right:var(--input-margin); } -fieldset>div.action>div.online:hover { background-color:unset; } 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.input>legend { display:none; } diff --git a/lib/user.js b/lib/user.js index 91248824..5906ed51 100644 --- a/lib/user.js +++ b/lib/user.js @@ -325,6 +325,7 @@ Volcanos("user", { }}, avatar: {view: [[html.ITEM, "state", aaa.AVATAR]], list: [{img: can.user.info.avatar}], onclick: function(event) { header && header.onaction.avatar(event, header) }}, usernick: {view: [[html.ITEM, "state", aaa.USERNICK, html.FLEX], "", can.user.info.usernick], onclick: function(event) { header && header.onaction.usernick(event, header) }, _init: function(target) { + can = can._fields? can.sup: can can.ui.head = target.parentNode }}, qrcode: {view: [[html.ITEM, "state", cli.QRCODE]], list: [{icon: icon.qrcode}], onclick: function(event) { var _can = can._fields? can.sup: can; _can.onaction["生成链接"](event, _can) }}, diff --git a/plugin/local/code/inner.css b/plugin/local/code/inner.css index 4296352d..26c722ac 100644 --- a/plugin/local/code/inner.css +++ b/plugin/local/code/inner.css @@ -38,6 +38,9 @@ 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; } @@ -45,11 +48,6 @@ fieldset.inner.cmd>div.output>div.layout>div.tabs>div.tabs>div.tabs { padding:va 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.avatar>img { height:var(--code-tabs-height); clip-path:circle(40%); } -fieldset.inner.cmd>div.output>div.layout>div.tabs>div.head>div.online { margin-left:var(--button-margin) !important; display:block; float:right; position:relative; } -fieldset.inner.cmd>div.output>div.layout>div.tabs>div.head>div.online span { background-color:var(--hover-bg-color); color:var(--hover-fg-color); font-size:var(--status-font-size); position:absolute; bottom:12px; } -fieldset.inner.cmd>div.output>div.layout>div.tabs>div.head>div.online img { height:var(--action-height); transition:margin-right 1s; float:right; } -fieldset.inner.cmd>div.output>div.layout>div.tabs>div.head>div.online img:hover { background-color:var(--hover-bg-color); } -fieldset.inner.cmd>div.output>div.layout>div.tabs>div.head>div.online:not(:hover) img:not(:first-child) { margin-right:-20px; } 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; } fieldset.inner>div.output>div.layout>div.path>a { padding:var(--input-padding) var(--button-padding); } diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js index 87ec0ee1..addd71c3 100644 --- a/plugin/local/code/inner.js +++ b/plugin/local/code/inner.js @@ -65,7 +65,7 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, cb) { var paths = can.core.Sp can.onappend.style(can, html.FLEX, ui.head) can.onappend.style(can, html.FLEX, ui.tabs) can.onappend.style(can, html.FLEX, ui.icon) - can.page.Append(can, ui.head, can.user.header(can).reverse()) + can.page.Append(can, ui.head, can.user.header(can)) }, __tabPath: function(can, cache) { var target = can.ui.path; can.onappend.style(can, html.FLEX, can.ui.path) can.onimport._tabPath(can, nfs.PS, nfs.PATH, can.base.Path(can.Option(nfs.PATH), can.Option(nfs.FILE)), function(p) { diff --git a/plugin/table.js b/plugin/table.js index d09a7ada..4c02e89f 100644 --- a/plugin/table.js +++ b/plugin/table.js @@ -40,6 +40,7 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { )) var action = can.core.List(sub.Conf(ctx.INPUTS), function(item) { if (item.type == html.BUTTON && [ice.LIST, ice.BACK].indexOf(item.name) == -1) { return item.name } }) sub.onexport.output = function(_sub, msg) { + can.page.style(can, sub._output, html.MAX_HEIGHT, "", html.HEIGHT, "") zone._total(msg.Length()), cb(sub, msg) zone._menu = shy({_trans: sub._trans}, action.concat(can.base.Obj(msg.Option(ice.MSG_ACTION), [])), function(event, button, meta, carte) { sub.Update(event, [ctx.ACTION, button]), carte.close() @@ -194,7 +195,8 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { var height = can.base.Max(html.PLUG_HEIGHT, can.ConfHeight()-2*html.ACTION_HEIGHT, 240), width = can.base.Max(html.PLUG_WIDTH, can.ConfWidth()-(can.user.isMobile? 0: html.PROJECT_WIDTH)) can.core.Next(list.reverse(), function(meta, next) { can.base.isString(meta) && (meta = {index: meta}), meta.mode = html.FLOAT can.onimport.plug(can, meta, function(sub) { - sub.onexport.output = function() { can.page.style(can, sub._output, html.MAX_HEIGHT, "", html.HEIGHT, "", html.WIDTH, "", html.MAX_WIDTH, "") + sub.onexport.output = function() { + can.page.style(can, sub._output, html.MAX_HEIGHT, "", html.HEIGHT, "", html.WIDTH, "", html.MAX_WIDTH, "") sub.onimport.size(sub, height, width, false), can.onmotion.delay(can, function() { sub.onimport.size(sub, height, width, false) }) }, sub.onimport.size(sub, height, width, false) can.onmotion.hidden(can, sub._target), sub._legend._target = sub._target, sub._legend._meta = {index: meta.index}