diff --git a/index.css b/index.css index dd521c14..f079ce38 100644 --- a/index.css +++ b/index.css @@ -433,7 +433,7 @@ body div.input.float input.select[type=button] { width:var(--form-width) !import body div.input.float input:not([type=button]) { width:var(--form-width) !important; padding-left:24px; } body div.input.float input[type=text] { width:var(--form-width) !important; padding-left:24px; } body div.input.float input[name=cancel] { border:var(--box-danger); background-color:transparent; color:var(--danger-bg-color); } -body div.input.float input[name=submit] { border:var(--box-notice); background-color:var(--notice-bg-color); color:var(--notice-fg-color); } +body.mobile div.input.float input[name=submit] { border:var(--box-notice); background-color:var(--notice-bg-color); color:var(--notice-fg-color); } body div.input.float input[name=submit]:hover { background-color:var(--notice-bg-color); color:var(--notice-fg-color); } body div.input.float input[name=cancel]:hover { background-color:var(--danger-bg-color); color:var(--danger-fg-color); } body div.input.float div.action { padding:var(--table-padding); width:100%; position:sticky; bottom:0; flex-direction:row-reverse; cursor:move; } @@ -661,7 +661,7 @@ body { font-family:var(--body-font-family); } legend { font-family:var(--legend-font-family); font-style:italic; } input { font-family:var(--input-font-family); } kbd { font-family:var(--code-font-family); line-height:var(--code-line-height); } -kbd:hover { background-color:var(--notice-bg-color); color:var(--notice-fg-color); } +// kbd:hover { background-color:var(--notice-bg-color); color:var(--notice-fg-color); } table.content { font-family:var(--table-font-family); } table.content th { font-family:var(--input-font-family); font-style:italic; } body div.output>div.code { font-family:var(--table-font-family); padding:var(--table-padding); } diff --git a/lib/misc.js b/lib/misc.js index 70a6b648..1dc3171e 100644 --- a/lib/misc.js +++ b/lib/misc.js @@ -255,9 +255,7 @@ Volcanos("misc", { return can.misc.Resource(can, path||(can.page.isDark(can)? "usr/icons/volcanos.png": "usr/icons/icebergs.png"), space, serve) }, Resource: function(can, path, space, serve) { if (!path) { return "" } - if (!can.base.beginWith(path, web.HTTP, nfs.PS)) { - path = nfs.P+path+(path.indexOf("usr/icons/") == -1? (space? can.core.Split(_version, "&")[0]: _version): "") - } + if (!can.base.beginWith(path, web.HTTP, nfs.PS)) { path = nfs.P+path+(path.indexOf("usr/icons/") == -1? (space? can.core.Split(_version, "&")[0]: _version): "") } if (!can.base.beginWith(path, web.HTTP)) { if (serve && serve.indexOf(location.origin) == -1) { var u = can.base.ParseURL(serve); path = u.origin + path } } if (!space && can.base.beginWith(path, web.HTTP)) { return path } if (!space && path.indexOf("pod=") > 0) { return path } diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js index 70ca99d1..f63bc1d2 100644 --- a/plugin/local/code/inner.js +++ b/plugin/local/code/inner.js @@ -5,7 +5,10 @@ const CURRENT_FILE = "web.code.inner:currentFile", SELECT_LINE = "selectLine" const VIEW_CREATE = "tabview.view.create", VIEW_REMOVE = "tabview.view.remove", LINE_SELECT = "tabview.line.select" Volcanos(chat.ONIMPORT, { _init: function(can, msg, cb) { can.onappend.style(can, code.INNER), can.Mode(msg.Option("mode")||can.Mode()) - if (can.Mode() == ice.MSG_RESULT) { msg.result = msg.result||[can._output.innerHTML], can.Mode(chat.SIMPLE), can.sup.Mode(chat.SIMPLE) } + if (can.Mode() == ice.MSG_RESULT) { + can.Conf("_width", can.ConfWidth()) + msg.result = msg.result||[can._output.innerHTML], can.Mode(chat.SIMPLE), can.sup.Mode(chat.SIMPLE) + } can.onmotion.clear(can, can._output), msg.result = msg.result||[""] var paths = can.core.Split(can.Option(nfs.PATH)); can.Option(nfs.PATH, paths[0]) can.core.List([nfs.PATH, nfs.FILE, nfs.LINE], function(key) { msg.Option(key) && can.Option(key, msg.Option(key)) }) @@ -255,7 +258,7 @@ Volcanos(chat.ONIMPORT, { }) }) }, layout: function(can) { - if (can.Conf(ctx.STYLE) == html.OUTPUT) { return can.page.style(can, can.ui.content, html.WIDTH, can.ConfWidth()) } + if (can.Conf(ctx.STYLE) == html.OUTPUT) { return can.page.style(can, can.ui.content, html.WIDTH, (can.Conf("_width")||can.ConfWidth())-3) } if (can.isSimpleMode() && !can.page.tagis(can._fields, html.FIELDSET_FLOAT)) { can.page.style(can, can._output, html.MAX_HEIGHT, "") } if (can.isSimpleMode()) { can.ui.layout(can.ConfHeight(), can.ConfWidth()); return can.page.style(can, can.ui.content, html.WIDTH, can.ConfWidth()) } if (can.isCmdMode()) { can.page.style(can, can._output, html.HEIGHT, can.ConfHeight(can.page.height())) } diff --git a/plugin/local/wiki/word.css b/plugin/local/wiki/word.css index f14ee0e3..560fe0ce 100644 --- a/plugin/local/wiki/word.css +++ b/plugin/local/wiki/word.css @@ -19,7 +19,7 @@ fieldset.word>div.navmenu div.list { margin-left:var(--title-margin); } fieldset.word>div.navmenu div.item { font-size:1.4em; font-weight:bold; font-family:cursive; padding:var(--input-padding) var(--title-margin); } fieldset.word>div.navmenu>div.item { font-size:1.6em; } -div.story[data-type=spark] label { -webkit-user-select:none; } +div.story[data-type=spark] label { padding:3px; -webkit-user-select:none; } div.story[data-type=spark_tabs] { margin-top:var(--title-margin); } div.story[data-type=spark_tabs]>div.tabs>div.item { font-style:italic; padding:var(--input-padding) var(--button-padding); height:var(--action-height); float:left; } div.story[data-type=spark_tabs]>div.tabs>div.item.select { border-top:var(--box-notice3); }