opt some

2025-04-25 08:48:06 +08:00 · 2023-07-08 08:40:40 +08:00 · 2023-07-08 08:40:40 +08:00 · 651d6ba166
commit 651d6ba166
parent 8d0a8e579a
6 changed files with 108 additions and 134 deletions
--- a/index.css
+++ b/index.css
@ -74,7 +74,6 @@ body>div.upload div.status div.size { text-align:center; }
 legend { font-size:1.2rem; line-height:32px; height:32px; }
 select, input { font-size:1rem; height:32px; }  textarea::placeholder, input::placeholder { font-style:italic; }
 textarea { font-size:1rem; tab-size:2; padding:5px; height:96px; width:100%; resize:vertical; }
-// table.content, div.item, div.code, div.story[data-type=spark] { font-family:monospace; }
 table.content, div.item, div.code, div.story[data-type=spark] { white-space:pre; text-align:left; }
 div.story[data-type=spark] { padding:5px 10px; border-left:var(--code-border-color) solid 5px; }
 table.content div.story[data-type=spark] { margin:0; }
--- a/panel/footer.css
+++ b/panel/footer.css
@ -4,8 +4,9 @@ fieldset.Footer>div.output div.title:first-child { text-align:center; width:230p
 fieldset.Footer>div.output div.state { float:right; }
 fieldset.Footer>div.output div.state label { font-size:12px; }
 fieldset.Footer>div.output div.toast { float:right; }
-fieldset.Footer>div.output div.cmd { padding:0; margin-left:10px; }
-fieldset.Footer>div.output div.cmd>input[name=cmd] { margin-right:0; width:120px; transition:all 1s; }
+fieldset.Footer>div.output div.cmd { padding:0; margin-left:10px; position:relative; }
+fieldset.Footer>div.output div.cmd>i { position:absolute; left:10px; top:8px; }
+fieldset.Footer>div.output div.cmd>input[name=cmd] { padding-left:30px; margin-right:0; width:120px; transition:all 1s; }
 fieldset.Footer>div.output div.cmd>input[name=cmd]:focus { width:320px; transition:all 0.5s; }
 fieldset.Footer>div.output div.cmd>span.delete { margin-left:-20px; margin-right:5px; }

--- a/panel/header.css
+++ b/panel/header.css
@ -4,7 +4,8 @@ fieldset.Header>div.output div.title:first-child { font-style:italic; font-weigh
 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:48px; }
-fieldset.Header>div.output div.search.title { padding:8px 5px; margin-left:5px; }
-fieldset.Header>div.output div.search>input { margin-right:0; transition:all 1s; }
+fieldset.Header>div.output div.search.title { padding:8px 5px; margin-left:5px; position:relative; }
+fieldset.Header>div.output div.search>i { position:absolute; left:10px; top:15px; }
+fieldset.Header>div.output div.search>input { padding-left:30px; margin-right:0; transition:all 1s; }
 fieldset.Header>div.output div.search>input:focus { width:320px; transition:all 0.5s; }
-fieldset.Header>div.output div.search>span.delete { margin-left:-20px; margin-right:5px; }
+fieldset.Header>div.output div.search>span.delete { position:absolute; top:14px; right:5px; }
--- a/plugin/local/code/inner/syntax.js
+++ b/plugin/local/code/inner/syntax.js
@ -1,8 +1,7 @@
 Volcanos(chat.ONSYNTAX, {
 	makefile: {prefix: {"#": code.COMMENT}, suffix: {":": code.COMMENT}, keyword: {
 		"ifeq": code.KEYWORD, "ifneq": code.KEYWORD, "else": code.KEYWORD, "endif": code.KEYWORD,
-		},
-	},
+	}},
 	man: {
 		prefix: {
 			"NAME": code.KEYWORD,
@ -57,8 +56,7 @@ Volcanos(chat.ONSYNTAX, {
 		"empty": code.FUNCTION,
 		"exists": code.FUNCTION,
 		"executable": code.FUNCTION,
-		},
-	}, vimrc: {link: "vim"},
+	}}, vimrc: {link: "vim"},
 	c: {
 		prefix: {
 			"//": code.COMMENT,
@ -146,7 +144,8 @@ Volcanos(chat.ONSYNTAX, {
 		"service": code.KEYWORD, "rpc": code.KEYWORD, "returns": code.KEYWORD,
 		"message": code.KEYWORD, "repeated": code.FUNCTION, "string": code.DATATYPE, "int64": code.DATATYPE,
 	}},
-	go: {prefix: {"// ": code.COMMENT}, regexp: {"[A-Z_0-9]+": code.CONSTANT}, keyword: {
+	go: {prefix: {"// ": code.COMMENT}, regexp: {"[A-Z_0-9]+": code.CONSTANT},
+		keyword: {
 			"package": code.KEYWORD, "import": code.KEYWORD, "const": code.KEYWORD, "type": code.KEYWORD, "struct": code.KEYWORD, "interface": code.KEYWORD, "func": code.KEYWORD, "var": code.KEYWORD,
 			"if": code.KEYWORD, "else": code.KEYWORD,
 			"for": code.KEYWORD, "range": code.KEYWORD, "break": code.KEYWORD, "continue": code.KEYWORD,
@ -186,7 +185,8 @@ Volcanos(chat.ONSYNTAX, {
 			}
 		},
 	}, mod: {prefix: {"//": code.COMMENT}, keyword: {"go": code.KEYWORD, "module": code.KEYWORD, "require": code.KEYWORD, "replace": code.KEYWORD}}, sum: {},
-	js: {prefix: {"// ": code.COMMENT}, regexp: {"[A-Z_0-9]+": code.CONSTANT}, keyword: {
+	js: {prefix: {"// ": code.COMMENT}, regexp: {"[A-Z_0-9]+": code.CONSTANT},
+		keyword: {
 			"let": code.KEYWORD, "const": code.KEYWORD, "var": code.KEYWORD,
 			"if": code.KEYWORD, "else": code.KEYWORD,
 			"switch": code.KEYWORD, "case": code.KEYWORD, "default": code.KEYWORD,
@ -237,9 +237,7 @@ Volcanos(chat.ONSYNTAX, {
 				ls[0] && push(opts.block+nfs.PT+ls[0])
 			}
 		},
-	}, json: {split: {operator: "{[:,]}"}, keyword: {
-    "true": code.CONSTANT, "false": code.CONSTANT,
-  }},
+	}, json: {split: {operator: "{[:,]}"}, keyword: {"true": code.CONSTANT, "false": code.CONSTANT}},
 	css: {prefix: {"// ": code.COMMENT, "/* ": code.COMMENT}, split: {operator: "{[(.,:;&>=)]}"},
 		func: function(can, push, text) { text.indexOf("/* ") == 0 && push(can.base.trimPrefix(can.base.trimSuffix(text, " */"), "/* ")) },
 		regexp: {
@ -251,13 +249,6 @@ Volcanos(chat.ONSYNTAX, {
 			"#[^ ;]+": code.CONSTANT,
 		},
 		keyword: {
-			"h1": code.KEYWORD, "h2": code.KEYWORD, "h3": code.KEYWORD,
-			"p": code.KEYWORD, "a": code.KEYWORD,
-			"ul": code.KEYWORD, "ol": code.KEYWORD, "li": code.KEYWORD,
-
-			"fieldset": code.KEYWORD, "legend": code.KEYWORD, "form": code.KEYWORD,
-			"select": code.KEYWORD, "input": code.KEYWORD, "textarea": code.KEYWORD,
-
 			"background-color": code.FUNCTION, "color": code.FUNCTION,
 			"font-family": code.FUNCTION, "font-weight": code.FUNCTION, "font-style": code.FUNCTION, "font-size": code.FUNCTION, "line-height": code.FUNCTION,
 			"text-align": code.FUNCTION, "white-space": code.FUNCTION, "tab-size": code.FUNCTION,
@ -270,23 +261,17 @@ Volcanos(chat.ONSYNTAX, {
 			"border-radius": code.FUNCTION, "outline": code.FUNCTION, "box-shadow": code.FUNCTION, "text-shadow": code.FUNCTION,
 			"caret-color": code.FUNCTION, "cursor": code.FUNCTION, "pointer": code.CONSTANT,

-			"body": code.KEYWORD,
-			"table": code.KEYWORD, "thead": code.KEYWORD, "tbody": code.KEYWORD, "tr": code.KEYWORD, "th": code.KEYWORD, "td": code.KEYWORD,
-			"label": code.KEYWORD, "span": code.KEYWORD, "img": code.KEYWORD, "svg": code.KEYWORD, "div": code.KEYWORD,
-			"video": code.KEYWORD,
-			"iframe": code.KEYWORD,
 			"hover": code.DATATYPE, "focus": code.DATATYPE, "not": code.DATATYPE, "type": code.FUNCTION, "name": code.FUNCTION,
+			"box-sizing": code.FUNCTION, "border-box": code.CONSTANT,
+			"background": code.FUNCTION, "background-position": code.FUNCTION, "background-size": code.FUNCTION,
+			"flex": code.FUNCTION, "justify-content": code.FUNCTION,
+			"transition": code.FUNCTION, "transform": code.FUNCTION, "translate": code.FUNCTION, "rotate": code.FUNCTION,
+			"stroke-width": code.FUNCTION, "stroke": code.FUNCTION, "fill": code.FUNCTION,
+			"z-index": code.FUNCTION,

-			"z-index": code.FUNCTION, "box-sizing": code.FUNCTION, "border-box": code.CONSTANT,
-			"justify-content": code.FUNCTION,
-			
+			"monospace": code.CONSTANT, "italic": code.CONSTANT, "bold": code.CONSTANT, "center": code.CONSTANT,
 			"solid": code.CONSTANT, "unset": code.CONSTANT,
 			"block": code.CONSTANT, "none": code.CONSTANT, "hidden": code.CONSTANT, "visible": code.CONSTANT, "auto": code.CONSTANT, "relative": code.CONSTANT, "absolute": code.CONSTANT, "sticky": code.CONSTANT, "fixed": code.CONSTANT,
-			"transition": code.FUNCTION, "transform": code.FUNCTION, "translate": code.FUNCTION, "rotate": code.FUNCTION,
-
-			"background": code.FUNCTION, "background-position": code.FUNCTION, "background-size": code.FUNCTION,
-			"monospace": code.CONSTANT, "italic": code.CONSTANT, "bold": code.CONSTANT, "center": code.CONSTANT,
-			"stroke-width": code.FUNCTION, "stroke": code.FUNCTION, "fill": code.FUNCTION,

 			"dark": code.CONSTANT, "light": code.CONSTANT, "transparent": code.CONSTANT,
 			"black": code.CONSTANT, "white": code.CONSTANT, "blue": code.CONSTANT, "red": code.CONSTANT, "yellow": code.CONSTANT,
@ -328,10 +313,9 @@ Volcanos(chat.ONSYNTAX, {
 			"calc": code.FUNCTION,
 			"url": code.FUNCTION,
 			"contexts": code.CONSTANT,
+		}, include: ["html"],
 	},
-	},
-	html: {split: {operator: "<!=/>"},
-		keyword: {
+	html: {split: {operator: "<!=/>"}, keyword: {
 		"DOCTYPE": code.KEYWORD, "html": code.KEYWORD, "head": code.KEYWORD, "body": code.KEYWORD,
 		"meta": code.KEYWORD, "title": code.KEYWORD, "link": code.KEYWORD, "script": code.KEYWORD,
 		"src": code.FUNCTION, "href": code.FUNCTION, "rel": code.FUNCTION, "style": code.FUNCTION,
@ -339,31 +323,19 @@ Volcanos(chat.ONSYNTAX, {
 		"h1": code.KEYWORD, "h2": code.KEYWORD, "h3": code.KEYWORD,
 		"p": code.KEYWORD, "em": code.KEYWORD, "strong": code.KEYWORD, "sub": code.KEYWORD, "sup": code.KEYWORD, "i": code.KEYWORD, "b": code.KEYWORD, "u": code.KEYWORD,
 		"pre": code.KEYWORD, "code": code.KEYWORD, "var": code.KEYWORD, "kbd": code.KEYWORD, "samp": code.KEYWORD,
+
 		"ul": code.KEYWORD, "ol": code.KEYWORD, "li": code.KEYWORD,
-
-			"header": code.KEYWORD, "nav": code.KEYWORD, "main": code.KEYWORD, "aside": code.KEYWORD, "footer": code.KEYWORD, "article": code.KEYWORD, "section": code.KEYWORD,
-			"img": code.KEYWORD, "video": code.KEYWORD, "audio": code.KEYWORD, "iframe": code.KEYWORD,
-
-			"div": code.KEYWORD, "span": code.KEYWORD,
-			"svg": code.KEYWORD,
-
-			"a": code.KEYWORD,
-			"height": code.FUNCTION, "width": code.FUNCTION,
-
-			"fieldset": code.KEYWORD, "legend": code.KEYWORD, "form": code.KEYWORD,
-			"select": code.KEYWORD, "option": code.KEYWORD, "button": code.KEYWORD, "input": code.KEYWORD, "textarea": code.KEYWORD,
-
-			"br": code.KEYWORD, "hr": code.KEYWORD,
-			"label": code.KEYWORD,
 		"table": code.KEYWORD, "thead": code.KEYWORD, "tbody": code.KEYWORD, "tfoot": code.KEYWORD,
 		"tr": code.KEYWORD, "th": code.KEYWORD, "td": code.KEYWORD,
 		"colgroup": code.KEYWORD, "col": code.KEYWORD, "colspan": code.FUNCTION, "rowspan": code.FUNCTION,

-			"dl": code.KEYWORD, "dt": code.KEYWORD, "dd": code.KEYWORD,
-			"time": code.KEYWORD,
-			"blockquote": code.KEYWORD, "q": code.KEYWORD, "cite": code.KEYWORD, "abbr": code.KEYWORD, "address": code.KEYWORD,
-			"source": code.KEYWORD, "muted": code.FUNCTION, "autoplay": code.FUNCTION, "loop": code.FUNCTION, "controls": code.FUNCTION,
-			"rect": code.KEYWORD, "circle": code.KEYWORD, "fill": code.FUNCTION, "x": code.FUNCTION, "y": code.FUNCTION, "r": code.FUNCTION,
-		},
-	},
+		"header": code.KEYWORD, "nav": code.KEYWORD, "main": code.KEYWORD, "aside": code.KEYWORD, "footer": code.KEYWORD, "article": code.KEYWORD, "section": code.KEYWORD,
+		"a": code.KEYWORD, "div": code.KEYWORD, "span": code.KEYWORD, "br": code.KEYWORD, "hr": code.KEYWORD,
+		"img": code.KEYWORD, "video": code.KEYWORD, "audio": code.KEYWORD, "iframe": code.KEYWORD, "canvas": code.KEYWORD,
+		"svg": code.KEYWORD, "rect": code.KEYWORD, "circle": code.KEYWORD,
+
+		"fieldset": code.KEYWORD, "legend": code.KEYWORD, "form": code.KEYWORD, "label": code.KEYWORD,
+		"select": code.KEYWORD, "option": code.KEYWORD, "button": code.KEYWORD, "input": code.KEYWORD, "textarea": code.KEYWORD,
+		"height": code.FUNCTION, "width": code.FUNCTION,
+	}},
 })
--- a/proto.js
+++ b/proto.js
@ -278,7 +278,7 @@ var svg = {
 	FIGURE: "figure", DATA: "data", SHIP: "ship", TRANS: "trans",
 	GO: "go",
 	SHAPE: "shape", TEXT: "text", RECT: "rect", LINE: "line", CIRCLE: "circle", ELLIPSE: "ellipse", BLOCK: "block",
-	STROKE_WIDTH: "stroke-width", STROKE: "stroke", FILL: "fill", FONT_SIZE: "font-size", FONT_FAMILY: "font-family", MONOSPACE: "monospace", TEXT_ANCHOR: "text-anchor",
+	STROKE_WIDTH: "stroke-width", STROKE: "stroke", FILL: "fill", FONT_SIZE: "font-size", FONT_FAMILY: "font-family", TEXT_ANCHOR: "text-anchor",
 	G: "g", X: "x", Y: "y", R: "r", RX: "rx", RY: "ry", CX: "cx", CY: "cy", X1: "x1", Y1: "y1", X2: "x2", Y2: "y2",
 	PATH: "path", PATH2V: "path2v", PATH2H: "path2h",
 	M: "M", Q: "Q", T: "T",
--- a/publish/chrome/contexts.css
+++ b/publish/chrome/contexts.css
@ -28,7 +28,7 @@ html, body {
 	--hover-bg-color:var(--input-bg-color);
 	--hover-fg-color:var(--input-fg-color);

-	--th-fg-color:black;
+	--th-fg-color:var(--plugin-fg-color);
 	--th-bg-color:var(--plugin-bg-color);
 	--td-hover-bg-color:var(--plugin-bg-color);
 	--tr-hover-bg-color:var(--plugin-bg-color);
@ -60,6 +60,7 @@ html, body {
 	--hover-bg-color:var(--input-bg-color);
 	--hover-fg-color:white;

+	--th-fg-color:var(--plugin-fg-color);
 	--th-bg-color:var(--plugin-bg-color);
 	--td-hover-bg-color:var(--plugin-bg-color);
 	--tr-hover-bg-color:var(--plugin-bg-color);
@ -82,7 +83,7 @@ fieldset.auto, fieldset.full, fieldset.float, body>div.float { position:fixed; z

 body>div.carte { padding:0; }
 body>div.carte input[name=filter] { margin:5px; width:calc(100% - 10px); position:sticky; top:5px; }
-body>div.carte div.item { text-align:center; white-space:pre; padding:5px 10px; }
+body>div.carte div.item { white-space:pre; padding:5px 10px; }
 body>div.carte div.item span.icon.next { float:right; }
 body>div.carte div.item { background-color:var(--carte-bg-color); }
 body>div.carte div.item:hover { background-color:var(--hover-bg-color); }