diff --git a/panel/header.css b/panel/header.css index 7f5b464f..f04baf0c 100644 --- a/panel/header.css +++ b/panel/header.css @@ -2,13 +2,13 @@ fieldset.Header>div.output { line-height:21px; height:var(--header-height); over fieldset.Header>div.output div.item { background-color:var(--panel-output-bg-color); padding:13.5px; height:var(--header-height); float:left; } fieldset.Header>div.output div.title:first-child { font-size:var(--legend-font-size); font-style:italic; font-weight:bold; display:flex; align-items:center; justify-content:center; overflow:hidden; } fieldset.Header>div.output div.title img { height:var(--action-height); width:var(--action-height); } -fieldset.Header>div.output div.item.theme { margin-right:var(--button-margin); } +fieldset.Header>div.output div.item.theme { user-select:none; } fieldset.Header>div.output div.item.theme>i { margin-right:0; } fieldset.Header>div.output div.item.theme>i:last-child { color:var(--disable-fg-color); } fieldset.Header>div.output div.item.theme>i.bi-moon-stars:last-child { font-size:12px; } +fieldset.Header>div.output div.item.language { user-select:none; } +fieldset.Header>div.output div.item.language { margin-right:var(--button-margin); } fieldset.Header>div.output div.item.language>span:last-child { color:var(--disable-fg-color); } -fieldset.Header>div.output div.item.language { user-select: none; } -fieldset.Header>div.output div.item.theme { user-select: none; } fieldset.Header>div.output div.state { float:right; } fieldset.Header>div.output div.state.avatar { padding:0; } fieldset.Header>div.output div.state.avatar>img { height:var(--header-height); clip-path:circle(40%); } diff --git a/panel/header.js b/panel/header.js index 3da36658..2057952b 100644 --- a/panel/header.js +++ b/panel/header.js @@ -6,7 +6,7 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { can.page.Append(can, target, [{view: [[html.ITEM, chat.TITLE]], list: [{img: can.misc.ResourceFavicon(can)}, {text: item}], title: "返回主页", onclick: function(event) { can.onaction.title(event, can) }}]) }) }, - _state: function(can, msg, target) { can.core.List(can.base.Obj(can.Conf(chat.STATE)||msg.Option(chat.STATE), [aaa.LANGUAGE, chat.THEME, aaa.USERNICK, aaa.AVATAR, mdb.TIME]).reverse(), function(item) { + _state: function(can, msg, target) { can.core.List(can.base.Obj(can.Conf(chat.STATE)||msg.Option(chat.STATE), [chat.THEME, aaa.LANGUAGE, aaa.USERNICK, aaa.AVATAR, mdb.TIME]).reverse(), function(item) { if (item == aaa.AVATAR ) { can.user.isLocalFile || can.page.Append(can, target, [{view: [[html.ITEM, chat.STATE, item]], list: [{img: lex.SP}], onclick: function(event) { can.core.CallFunc([can.onaction, item], [event, can, item]) }}]); return } if (can.user.isMobile && item == mdb.TIME) { return } diff --git a/panel/river.js b/panel/river.js index 4be9c67f..592cf513 100644 --- a/panel/river.js +++ b/panel/river.js @@ -81,8 +81,8 @@ Volcanos(chat.ONACTION, {list: [mdb.CREATE, web.SHARE, web.REFRESH], _init: func action: function(event, can, river, storm) { can.misc.SearchHash(can, river, storm) can.page.Select(can, can._output, [html.DIV_LIST, html.DIV_ITEM], function(target) { can.page.ClassList.del(can, target, html.SELECT) }) can.onmotion.select(can, can.ui.sublist[river], html.DIV_ITEM, can.ui.storm_list[can.core.Keys(river, storm)]) - can.onaction.storm({target: can.ui.river_list[river]}, can, river) - can.page.ClassList.set(can, can.ui.river_list[river], "open", can.onmotion.toggle(can, can.ui.sublist[river], true)) + // can.onaction.storm({target: can.ui.river_list[river]}, can, river) + // can.page.ClassList.set(can, can.ui.river_list[river], "open", can.onmotion.toggle(can, can.ui.sublist[river], true)) can.onengine.signal(can, chat.ONSTORM_SELECT, can.request(event, {river: can.Conf(chat.RIVER, river), storm: can.Conf(chat.STORM, storm)})) }, carte: function(event, can, list, river, storm) { can.onkeymap.prevent(event); if (can.core.Value(can._root, can.core.Keys(chat.RIVER, river))) { return }