From ae0d31909d6a59b9ba3ac5e69ab0429c9aa57191 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 12 Dec 2019 21:43:15 +0100 Subject: [PATCH] Update styles --- statik/statik.go | 2 +- styles/dark.json | 28 +++++++++++++++------------- styles/light.json | 28 +++++++++++++++------------- styles/notty.json | 44 +++++++++++++++++++++----------------------- 4 files changed, 52 insertions(+), 50 deletions(-) diff --git a/statik/statik.go b/statik/statik.go index dd480dd..e993161 100644 --- a/statik/statik.go +++ b/statik/statik.go @@ -7,6 +7,6 @@ import ( ) func init() { - data := "PK\x03\x04\x14\x00\x08\x00\x08\x008\x9c\x8aO\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00 \x00 \x00dark.jsonUT\x05\x00\x01\x1d\xf3\xef]\xacT[\xae\x9b0\x10\xfdg\x15\x96\xf3\xdb{\x95\x00\x89Z>\xfa\xdf=DB\x06\x0f\xc4\x8a\x1f\xa91R\xa4\x08\xa9k\xe9\xd2\xba\x92\xcay\x8d\x03\xce\xe3J\xe1o\x0e\x9es\xce\x8c\xc7sH\x08\xa1\xdc\xd4\xbd\x02\xedhA|L\x08\x15\x9a\x9f\xe2\xfc\xdb \xd8Yh\xc4\x9e\x16\x84\xae\xf5Z\xd33\xda\xf5M\x04\xad\x8d4\xd6\x83\xe92\xa5 !\x83\xc7\xe9f\x81\xf4\x8d\xb1\x8ayzJ\x0e\x87O\x07{7\x0c\xe41i\xc5\xeamkM\xafyy\xe5_eS\xc9\xf4\xfb5\xc3HN\x0b\xe2l\x0fh\"E\x13aI1\xed\x0b\x86fg3\xb4;Q\xce~<\x14\xceb\xd5\xcfb\x8c1\x0f\xaf\xaa\xe4wT\xde,\xb3\xbc'\xf3f\x9d\xd5]\x9d/\x0b-GB\x0d\x93\x1d*y&\xafu\x8a\xa4\xe8\x82H8P\xb1\xa9\xf9\xf7\xe7/\xc1\xf1\x06\xdd+\xb0\xcc \xa3c\x87?\x83\xa3R\xe8myQ|\xe6\xf3\xa6!>3\xd6\x92I/z\xcd\xc1J\xa1\xe1\xcc0i\xc7\x1c\xed\x08\xc5Z\x18\xf9A\xea_\xfeo\x11<\xd3\x8f\x9f\xd3G\x97g#:dz\xe6$]\x04;\xa26\x1c^\xdc\x12\xb1}\x90f\xab\xa9\xb7yv\xcb_V\xd2\xd4A\x17\x15\xb3\xad\xd0\xc1\xaa\x0b\xca\xca1\xd5\xb1J\x02\x0e\x05\xa8\xdd\xe6\xcaq\x1c\x12&E=\xbe\xaf\xceY\xa3\xdb\xf0\\t\xccm\xac\xe6\xb5\xfe8\x7f\xb1\xcd\x9a\x07\x17x,\xa8\xfc\xdd\x1b\x17\x18\xe4 1\xe8L\xe3*\x0bl\x8b\xd0\x86Y>\x86\x9c\x92\xd8\x9d\x00\xebv\xec8\xd4C2$\xff\x03\x00\x00\xff\xffPK\x07\x08cC\x86\xae\x8f\x01\x00\x001\x06\x00\x00PK\x03\x04\x14\x00\x08\x00\x08\x00\x8d\x94\x8aO\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\n\x00 \x00light.jsonUT\x05\x00\x01\xaa\xe5\xef]\xacT[\xae\x9b0\x10\xfdg\x15\x96\xf3\xdbD)\x90\xb4\xe5\xa3\xff\xddC$d\xf0@\xac\xf8\x91\x1a#E\x8a\x90\xba\x96.\xed\xae\xe4\xcay\x8d/8\xb9\x91n\xf8\x9b\x83\xe7\x9c3\xc3\xc1\xc7\x84\x10\xcaM\xdd+\xd0\x8e\x16\xc4\xd7\x84P\xa1\xf9\xb9\xce\xbf\x9d\x81\xbd\x85F\x1chA\xe8Fo4\xbd\xa0]\xdfD\xd0\xdaHc=\x98f9M\x08\x19\x86\x9c\x92\xb8\x9d\x00\xeb\xf6\xec\x14\xea!\x19\x92\xf7\x00\x00\x00\xff\xffPK\x07\x08\xbd\xb7My\x8c\x01\x00\x001\x06\x00\x00PK\x03\x04\x14\x00\x08\x00\x08\x00`\x9c\x8aO\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\n\x00 \x00notty.jsonUT\x05\x00\x01d\xf3\xef]\x8c\x93On\xb30\x10\xc5\xf7\x9c\xc2r6\xdf\x175\x91\xda\xa6]d\xd1}\xef\x80D\x0c\x18\xb0\xf0\x1fj\x8c\x14 !\xf5,=ZOR9\xa4\xcc\x88\x1aAv\xf3<\xef7oF\xa1\x8f\x08\xa1\xb9\xc9:\xc5\xb5\xa3g\xe2kB\xa8\xd0\xf9X\x9f\x1eF\xa1\xb1\xbc\x10Wz&4\xd6\xb1\xa6w\xb5\xed\n\xacF\x84\x0c\xfe\x85V\x8f\x80*\x8cU\xcc\xa3\xe8\x8e\xf4\xfd\xd1\xf1\xab\x1b\x86U\xc0\x13\x00\xf0\xe8\x90\xefWC\x83\xf0$`>\x07C\xedVb!\xc0i\x01\xb0\x9d\xf0\xb2D\xd8\x8ex]Dlf\xf8\x1eO\x19+)ZT \xc7U\xe8\xf6\xdf\x9f_\x04\x08\\w\x8a[\xe6\x84\xd1\xa1\xe6#j\x95B\xd7\xc9|\xa2\xaeC[\xfc\x9b\xf2\xff\x07\xbfP\xac\xe4\x13`ny\xf7\xafgX\x9c\x1c\xdefV\x18\x9b\x99\x9c\x87\x18\x97\xc9}\x01\xafoNRi2\x94T1[\n\xbd\xf0U\xac\x9c\x9c\xa5\x12E\xe1\xaa\xa9B\x87\xdb\xff\xa5\xec\x01\xd2:kt\x19\xf4\x85\x8c\xc8Y\xd9\xd0\xe2\xb1>\xdc\x7f8\xeam\xe9\xe4\xa33\x0e\x05\xce\xb9\x84\xa25\x85K-g5H\x15\xb3\xf9\\rJ\xc2\x05\x91\xd66\xec\xf6\xaf\x19\xa2!\xfa \x00\x00\xff\xffPK\x07\x08\x06\xb5\xf3y6\x01\x00\x00\x80\x04\x00\x00PK\x01\x02\x14\x03\x14\x00\x08\x00\x08\x008\x9c\x8aOcC\x86\xae\x8f\x01\x00\x001\x06\x00\x00 \x00 \x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81\x00\x00\x00\x00dark.jsonUT\x05\x00\x01\x1d\xf3\xef]PK\x01\x02\x14\x03\x14\x00\x08\x00\x08\x00\x8d\x94\x8aO\xbd\xb7My\x8c\x01\x00\x001\x06\x00\x00\n\x00 \x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81\xcf\x01\x00\x00light.jsonUT\x05\x00\x01\xaa\xe5\xef]PK\x01\x02\x14\x03\x14\x00\x08\x00\x08\x00`\x9c\x8aO\x06\xb5\xf3y6\x01\x00\x00\x80\x04\x00\x00\n\x00 \x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81\x9c\x03\x00\x00notty.jsonUT\x05\x00\x01d\xf3\xef]PK\x05\x06\x00\x00\x00\x00\x03\x00\x03\x00\xc2\x00\x00\x00\x13\x05\x00\x00\x00\x00" + data := "PK\x03\x04\x14\x00\x08\x00\x08\x00\x96\x9e\x8cO\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00 \x00 \x00dark.jsonUT\x05\x00\x01\x8d\x9a\xf2]\xac\x94\xdf\x8e\xaa0\x10\xc6\xefy\x8aI\xbd=\x1a\x054\xe7p\xe1\xfdy\x07\x13Ra\xc0\xc6\xfe\xf1\x94\x92xbH\xf6Y\xf6\xd1\xf6I6\xa0K+t\xdd\xc5,w\x1df\xfa\xfb:\xfd:\x97\x00\x80\xe4*\xab\x05JC\x12h\xd7\x00\x84\xc9\xfc\xba\x8e\x7f]\x03'\x8d\x05;\x93\x04\xc8N\xee$\xb9E\xab\xba\xf0D3\xc5\x95n\x83\xe1:$\x01@\xd3\xc6\xc9ae\xb7\xf7\xd7U\xe6?\xc7<\xb5(\x18\xfc\xb1e\xfd\x9f=\xcd\x8e\xa5V\xb5\xcc\xd3\x1e\xbb\x89\xc6J\xc2\xdf}\x85\xe29I\xc0\xe8\x1a\xad\xb6\xd0jsO\xea;\xe7\xa7jg3\x18q\xa3?\x0f\xb1\x91\xbf%\x0f\x10\xd3\x19\xf1t\xc6t\xc8\xfa \xc8t\xca\xe6\x19\x8a\x0f\xb3\x1e`\n\xca+\xcb1x\xee\x9e\xc2u\xc5Y\xe5}\x18}:3(|\xf6y{y\x05k\x7f\x94\xb5@M\x0dS\xd2\x97\xbcpR9\x93\xc7\xf4C\xc4W\xd2\xef:\xd4V\xda\xa2Z\xe6\xa89\x93xK\x1b\xb5ai\x99L\xd0\x12\x07\xd0BiA\xdb5\xf9\xdb\xfeM\xe0rY\xb4\x19M\x03\xf3\xed\xf8\x89\xc5\xd1`\xbb\xef+ W\xce\xa0\xc8T\xee\x94\xfe\xd4P\x08\xa3\xcdX\xf22\xba\xc7\xa6{\xae2\xa7\x83\x82\xea\x92Ig\x0c:\xa7\x8dm\xa9\xa1{\x8e\xd61(N\x87~\x8f\xce \x94\xb3lxW\x95\xd1J\x96n\x9e\xd7\xf3\xdaw\x1f;9\xbf}\xbe\xa9\x1b;\xf7\xda\x1d(\xfdW+\x83>\xdbm\x1d\xdb\x1d\x8c\xe0\xb6\x01N\xac:\xd1\xce\xb3M\xd0\x04\xef\x01\x00\x00\xff\xffPK\x07\x08\x17(\x7fG\x87\x01\x00\x000\x06\x00\x00PK\x03\x04\x14\x00\x08\x00\x08\x00A\xa5\x8cO\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\n\x00 \x00light.jsonUT\x05\x00\x01\x1a\xa6\xf2]\xac\x94On\xab0\x10\xc6\xf7\x9cb\xe4l_\xa2< y\xaf,\xb2\xef\x1d\"!\x07\x06b\xc5\x7fRc\xa4T\x11R\xcf\xd2\xa3\xf5$\x15$\xc5.\xb8Q\x88\xca\xce\xe3\x19\xff\xbe\x19>\xfb\x1c\x00\x90\\e\xb5@iH\x02\xed\x1a\x800\x99_\xd6\xf1\x9fK\xe0\xa8\xb1`'\x92\x00\xd9\xca\xad$\xd7hU\x17\x9eh\xa6\xb8\xd2m0\x8cb\x12\x004m\x9c\xec\xff\xda\xe3\xfdu\x95y\xe5\x98\xa7\x16\x05\x83\x1d[\xd6\xef\xechv(\xb5\xaae\x9e\xf6\xd8u4V\x12\xfe\xef+\x14\xcfI\x02F\xd7h\xb5\x85V\x9b\xdb\xa9\xaf\xcf\x1f\xd5\xcef0\xe6\xfe\xbb\x89\x8d\xfc#\xb9\x81\x98\xce\x88\xa73\xa6CV\x0f@\xa6S\xd6\x8fP\xee\xc1\x14\x94W\x96c\xf0\xd4]\x85\xcb\x8a\xb3\xca{1\xfatfP\xf8\xec\xf3\xf1\xf6\x0e\xd6\xfe(k\x81\x9a\x1a\xa6\xa4/y\xe1\xa4r&\x0f\xe9\x97\x88\xa1\xf4\xa7[\x13j+mQ-s\xd4\x9cI\xbc\xa6\x0d\xc7\x10\xad-\x93 Z\xe2\x00Z(-h\xbb&\xcf\xedn\x02\xe7\xf3\xa2\xcdh\x1a\x98o\xc6C\x8d\xa3\xc1q\xf7+ \x97+[\x9b\xa9\xdc)\xfd\xadG!\\\xc5c\xc9\xcb\xe8;6\xddq\x959\x13\x14T\x97L:\xcf\xa0\xd3\xed\xd2\x96\x1a\xba\xe3h\x1d\x83\xe2\xb8\xef\xcf\xe8\x0cB9\xcb\x86\xff\xaa2Z\xc9\xd2\xcd\xf3z^\xfb\xfe\xc7V\xce\xaf\x9f\xef\xd5u\xa5u\x0d\xa5/\xb52\xe8\xb3\xdd\xc6\xb1\xdd\xde\x08n\x07\xe0\xc4\xaa#\xed<\xdb\x04M\xf0\x19\x00\x00\xff\xffPK\x07\x08\xdd\xa1\xad\xca\x83\x01\x00\x000\x06\x00\x00PK\x03\x04\x14\x00\x08\x00\x08\x00F\xa5\x8cO\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\n\x00 \x00notty.jsonUT\x05\x00\x01$\xa6\xf2]\x9c\x93\xc1N\xc30\x0c@\xef\xfd\x8a(\xdc&6 \x18\x1cv\xd8\x9d\x7f\x98\xd4em\xdaFM\x9c\x92\xa6\xd2PU\x89o\xe1\xd3\xf8\x12\x94v,\xeef\x90Xov\xfc\x9e\x938\xed\x13\xc6xn\xb3\xceH\xf0|\xc3B\xcc\x18W\x90O\xf1\xfa~J4N\x16\xea\xc87\x8c\xef`\x07\xfc\x94m\xbb\x02g\x13\xc6\x86\xb0\xc2\xab\x87\xa8\xba\xa8\xf9!\xfd\xbb\x96y\x1a\xb5w\x0c\xe1\x8f\x11\xc7\x8d\xa9\xb6\xbf\x0bg\xc6'zC\x7f\xd03|\xfd\x7f|\xc6?\xdf\xc0\xcf\x04/\xb7\x08\xb0\xc1\xcb\xe38\xdf)\xd2\xaa%\xa7}.W^\x1aj\x08_\x1f\x9fH*\xa13\xd2 \xaf,P\xc5+T\xaa\x15\xd4\xe9\xe5&\xa0\x8e\x912\xa2\x94\xe7\x8aIUXgD\x88\xf9kX\xdd\xb0\xbe_\x85\x8aa`\xcbmt\x8fh4e6\x97\xd4v\xf6\xd7\xefg\x1f%\x81J\x0f\xdafud\x8dp\xa5\x82\xd9\xc5xq\xd0\xa8\x974ME\xf5Z\\\xf7Z\xc4^\xadw\x16J\x92\xa3@DV\x8e\xba\x9d\x1d,O\x1f\xfe\x0b\xc7\xc3\xa4o\x9d\xf5\xe4ul\xf1\xfb\xf2F\xc7\xc3\xa3\\\xdb\x88q\xb4C2$\xdf\x01\x00\x00\xff\xffPK\x07\x08\xbf\xba\xf0z*\x01\x00\x00,\x04\x00\x00PK\x01\x02\x14\x03\x14\x00\x08\x00\x08\x00\x96\x9e\x8cO\x17(\x7fG\x87\x01\x00\x000\x06\x00\x00 \x00 \x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81\x00\x00\x00\x00dark.jsonUT\x05\x00\x01\x8d\x9a\xf2]PK\x01\x02\x14\x03\x14\x00\x08\x00\x08\x00A\xa5\x8cO\xdd\xa1\xad\xca\x83\x01\x00\x000\x06\x00\x00\n\x00 \x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81\xc7\x01\x00\x00light.jsonUT\x05\x00\x01\x1a\xa6\xf2]PK\x01\x02\x14\x03\x14\x00\x08\x00\x08\x00F\xa5\x8cO\xbf\xba\xf0z*\x01\x00\x00,\x04\x00\x00\n\x00 \x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81\x8b\x03\x00\x00notty.jsonUT\x05\x00\x01$\xa6\xf2]PK\x05\x06\x00\x00\x00\x00\x03\x00\x03\x00\xc2\x00\x00\x00\xf6\x04\x00\x00\x00\x00" fs.Register(data) } diff --git a/styles/dark.json b/styles/dark.json index b11da50..5d1775b 100644 --- a/styles/dark.json +++ b/styles/dark.json @@ -6,8 +6,9 @@ "color": "252" }, "h1": { - "format": " {{.text}} ", "suffix": "\n\n", + "styled_prefix": " ", + "styled_suffix": " ", "background_color": "63", "color": "228", "bold": true @@ -15,36 +16,38 @@ "h2": { "prefix": "\n", "suffix": "\n", - "format": "## {{.text}}", + "styled_prefix": "## ", "color": "39", "bold": true }, "h3": { - "format": "### {{.text}}", "suffix": "\n", + "styled_prefix": "### ", "color": "39", "bold": true }, "h4": { - "format": "#### {{.text}}", "suffix": "\n", + "styled_prefix": "#### ", "color": "39", "bold": true }, "h5": { - "format": "##### {{.text}}", "suffix": "\n", + "styled_prefix": "##### ", "color": "39", "bold": true }, "h6": { - "format": "###### {{.text}}", "suffix": "\n", + "styled_prefix": "###### ", "color": "35", "bold": false }, "text": {}, - "list": {}, + "list": { + "indent": 4 + }, "item": { "prefix": "• " }, @@ -56,7 +59,6 @@ "bold": true }, "link": { - "format": "{{.text}}", "underline": true, "color": "30" }, @@ -69,7 +71,8 @@ "color": "212" }, "code": { - "format": " {{.text}} ", + "styled_prefix": " ", + "styled_suffix": " ", "background_color": "236", "color": "203" }, @@ -88,10 +91,9 @@ "format": "\n--------\n", "color": "240" }, - "block_quote": {}, - "del": {}, - "softbreak": {}, - "hardbreak": {}, + "block_quote": { + "prefix": "> " + }, "html_block": {}, "html_span": {} } diff --git a/styles/light.json b/styles/light.json index 6af692c..cc03a60 100644 --- a/styles/light.json +++ b/styles/light.json @@ -6,8 +6,9 @@ "color": "234" }, "h1": { - "format": " {{.text}} ", "suffix": "\n\n", + "styled_prefix": " ", + "styled_suffix": " ", "background_color": "63", "color": "228", "bold": true @@ -15,36 +16,38 @@ "h2": { "prefix": "\n", "suffix": "\n", - "format": "## {{.text}}", + "styled_prefix": "## ", "color": "27", "bold": true }, "h3": { - "format": "### {{.text}}", "suffix": "\n", + "styled_prefix": "### ", "color": "27", "bold": true }, "h4": { - "format": "#### {{.text}}", "suffix": "\n", + "styled_prefix": "#### ", "color": "27", "bold": true }, "h5": { - "format": "##### {{.text}}", "suffix": "\n", + "styled_prefix": "##### ", "color": "27", "bold": true }, "h6": { - "format": "###### {{.text}}", "suffix": "\n", + "styled_prefix": "###### ", "color": "27", "bold": false }, "text": {}, - "list": {}, + "list": { + "indent": 4 + }, "item": { "prefix": "• " }, @@ -56,7 +59,6 @@ "bold": true }, "link": { - "format": "{{.text}}", "underline": true, "color": "36" }, @@ -69,7 +71,8 @@ "color": "205" }, "code": { - "format": " {{.text}} ", + "styled_prefix": " ", + "styled_suffix": " ", "background_color": "254", "color": "203" }, @@ -88,10 +91,9 @@ "format": "\n--------\n", "color": "240" }, - "block_quote": {}, - "del": {}, - "softbreak": {}, - "hardbreak": {}, + "block_quote": { + "prefix": "> " + }, "html_block": {}, "html_span": {} } diff --git a/styles/notty.json b/styles/notty.json index a5a3291..fc14874 100644 --- a/styles/notty.json +++ b/styles/notty.json @@ -5,32 +5,34 @@ "suffix": "\n\n" }, "h1": { - "format": "# {{.text}}", - "suffix": "\n\n" + "suffix": "\n\n", + "styled_prefix": "# " }, "h2": { "prefix": "\n", "suffix": "\n", - "format": "## {{.text}}" + "styled_prefix": "## " }, "h3": { - "format": "### {{.text}}", - "suffix": "\n" + "suffix": "\n", + "styled_prefix": "### " }, "h4": { - "format": "#### {{.text}}", - "suffix": "\n" + "suffix": "\n", + "styled_prefix": "#### " }, "h5": { - "format": "##### {{.text}}", - "suffix": "\n" + "suffix": "\n", + "styled_prefix": "##### " }, "h6": { - "format": "###### {{.text}}", - "suffix": "\n" + "suffix": "\n", + "styled_prefix": "###### " }, "text": {}, - "list": {}, + "list": { + "indent": 4 + }, "item": { "prefix": "• " }, @@ -38,20 +40,17 @@ "prefix": ". " }, "link_text": {}, - "link": { - "format": "({{.text}})" - }, + "link": {}, "image_text": { "format": "Image: {{.text}} ->" }, "image": {}, "code": { - "format": "`{{.text}}`" + "prefix": "`", + "suffix": "`" }, "code_block": { - "margin": 4, - "prefix": "\n", - "suffix": "\n" + "margin": 4 }, "table": {}, "emph": { @@ -65,10 +64,9 @@ "hr": { "format": "\n--------\n" }, - "block_quote": {}, - "del": {}, - "softbreak": {}, - "hardbreak": {}, + "block_quote": { + "prefix": "> " + }, "html_block": {}, "html_span": {} }