diff --git a/index.css b/index.css index ea689c9f..7c41412d 100644 --- a/index.css +++ b/index.css @@ -867,7 +867,7 @@ fieldset.cmd>div.item.avatar { padding:0; height:var(--action-height); } fieldset.cmd>div.item.avatar>img { height:var(--action-height); } fieldset.cmd>div.action>div.tabs.select { border-bottom:var(--notice-bg-color) solid 2px; } // fieldset.cmd>div.status>legend.select { border-top:var(--notice-bg-color) solid 2px; } -fieldset.cmd>div.output>div.project div.item.select { border-right:var(--notice-bg-color) solid 4px; } +fieldset.cmd>div.output>div.project div.item.select { border-right:var(--notice-bg-color) solid 3px; } fieldset.Search div.story[data-type=spark] { margin:0; } fieldset.Search>div.output>div.profile { border-left:none; width:unset; } fieldset.Search>div.output>div.content>table.content td { cursor:pointer; } diff --git a/lib/misc.js b/lib/misc.js index 1d4321c5..0207a3d2 100644 --- a/lib/misc.js +++ b/lib/misc.js @@ -192,7 +192,9 @@ Volcanos("misc", { return socket }, ResourceFavicon(can) { return can.misc.Resource(can, nfs.SRC_MAIN_ICO) }, - Resource(can, path, space, serve) { if (can.base.beginWith(path, web.HTTP, nfs.PS)) { return path } + Resource(can, path, space, serve) { + if (serve && can.base.beginWith(path, nfs.PS)) { return serve+path } + if (can.base.beginWith(path, web.HTTP, nfs.PS)) { return path } var p = can.base.MergeURL(nfs.REQUIRE+path+_version, ice.POD, space||can.ConfSpace()||can.misc.Search(can, ice.POD)) if (serve && serve.indexOf(location.origin) == -1) { var u = can.base.ParseURL(serve); p = u.origin + p } return p diff --git a/plugin/table.js b/plugin/table.js index addca4be..2ff67da5 100644 --- a/plugin/table.js +++ b/plugin/table.js @@ -9,8 +9,9 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { } }, card: function(can, msg, target, filter) { target = target||can.ui.content||can._output - var list = msg.Table(function(value) { value.icon = value.icons||value.icon||value.image + var list = msg.Table(function(value) { if (filter && filter(value)) { return } + value.icon = value.icons||value.icon||value.image var img = can.misc.Resource(can, value.icon, value.type == web.MASTER? "": value.name) if (img.indexOf("/require/") == 0 && value.origin) { img = value.origin + img } return {view: [[html.ITEM, value.type, value.status]], list: [