From 63ce5b883e0b8c5633df23e7de68d12dae455eff Mon Sep 17 00:00:00 2001 From: Kristi Date: Sun, 27 Oct 2019 02:23:49 -0400 Subject: [PATCH] Better non-eyegouging markdown support --- CHANGELOG.md | 5 + themes/tokyo-night-color-theme.json | 109 +++++++++++++++------- themes/tokyo-night-storm-color-theme.json | 109 +++++++++++++++------- 3 files changed, 157 insertions(+), 66 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce343bb..358e9da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Release Notes +## 0.3.4 +`2019-10-27` +- Better non-eyegouging markdown support +- Update ignored file color + ## 0.3.3 `2019-10-24` - Add image preview border diff --git a/themes/tokyo-night-color-theme.json b/themes/tokyo-night-color-theme.json index 642c048..6e3ae1a 100644 --- a/themes/tokyo-night-color-theme.json +++ b/themes/tokyo-night-color-theme.json @@ -443,6 +443,7 @@ "keyword.other", "keyword.operator.bitwise.shift", "punctuation", + "punctuation.definition.constant.markdown", "punctuation.definition.string", "punctuation.support.type.property-name", "text.html.vue-html meta.tag", @@ -1174,8 +1175,33 @@ } }, { - "name": "Markdown - Heading", - "scope": "markup.heading entity.name", + "name": "Markdown - Heading 1", + "scope": [ + "heading.1.markdown entity.name", + "heading.1.markdown punctuation.definition.heading.markdown", + ], + "settings": { + "fontStyle": "bold", + "foreground": "#89ddff" + } + }, + { + "name": "Markdown - Heading 2", + "scope": [ + "heading.2.markdown entity.name", + "heading.2.markdown punctuation.definition.heading.markdown", + ], + "settings": { + "fontStyle": "bold", + "foreground": "#61bdf2" + } + }, + { + "name": "Markdown - Heading 3", + "scope": [ + "heading.3.markdown entity.name", + "heading.3.markdown punctuation.definition.heading.markdown", + ], "settings": { "fontStyle": "bold", "foreground": "#7aa2f7" @@ -1183,26 +1209,43 @@ }, { "name": "Markdown - Heading 4", - "scope": "heading.4.markdown entity.name", + "scope": [ + "heading.4.markdown entity.name", + "heading.4.markdown punctuation.definition.heading.markdown", + ], "settings": { - "fontStyle": "", - "foreground": "#7aa2f7" + "fontStyle": "bold", + "foreground": "#6d91de" } }, { - "name": "Markdown - Heading punctuation", + "name": "Markdown - Heading 5", "scope": [ - "markdown.heading", - "markup.heading | markup.heading entity.name", - "markup.heading.markdown punctuation.definition.heading.markdown" + "heading.5.markdown entity.name", + "heading.5.markdown punctuation.definition.heading.markdown", ], "settings": { - "foreground": "#7db5ff" + "fontStyle": "bold", + "foreground": "#9aa5ce" + } + }, + { + "name": "Markdown - Heading 6", + "scope": [ + "heading.6.markdown entity.name", + "heading.6.markdown punctuation.definition.heading.markdown", + ], + "settings": { + "fontStyle": "bold", + "foreground": "#747ca1" } }, { "name": "Markup - Italic", - "scope": "markup.italic", + "scope": [ + "markup.italic", + "markup.italic punctuation" + ], "settings": { "fontStyle": "italic", "foreground": "#c0caf5" @@ -1210,7 +1253,11 @@ }, { "name": "Markup - Bold", - "scope": "markup.bold", + "scope": [ + "markup.bold", + "markup.bold punctuation" + + ], "settings": { "fontStyle": "bold", "foreground": "#c0caf5" @@ -1218,7 +1265,10 @@ }, { "name": "Markup - Bold-Italic", - "scope":"markup.bold markup.italic", + "scope": [ + "markup.bold markup.italic", + "markup.bold markup.italic punctuation", + ], "settings": { "fontStyle": "bold italic", "foreground": "#c0caf5" @@ -1226,10 +1276,12 @@ }, { "name": "Markup - Underline", - "scope": "markup.underline", + "scope": [ + "markup.underline", + "markup.underline punctuation" + ], "settings": { - "fontStyle": "underline", - "foreground": "#babfe0" + "fontStyle": "underline" } }, { @@ -1248,23 +1300,14 @@ }, { "name": "Markdown - Link", - "scope": "string.other.link", + "scope": [ + "string.other.link", + "markup.underline.link", + "constant.other.reference.link.markdown", + "string.other.link.description.title.markdown" + ], "settings": { - "foreground": "#0db9d7" - } - }, - { - "name": "Markdown - Link Description", - "scope": "string.other.link.description.title.markdown", - "settings": { - "foreground": "#bb9af7" - } - }, - { - "name": "Markdown - Link Anchor", - "scope": "constant.other.reference.link.markdown", - "settings": { - "foreground": "#e0af68" + "foreground": "#84bec4" } }, { @@ -1296,7 +1339,7 @@ "scope": "meta.separator", "settings": { "fontStyle": "bold", - "foreground": "#4e5579" + "foreground": "#444b6a" } }, { diff --git a/themes/tokyo-night-storm-color-theme.json b/themes/tokyo-night-storm-color-theme.json index 9f9d756..770c3f8 100644 --- a/themes/tokyo-night-storm-color-theme.json +++ b/themes/tokyo-night-storm-color-theme.json @@ -442,6 +442,7 @@ "keyword.other", "keyword.operator.bitwise.shift", "punctuation", + "punctuation.definition.constant.markdown", "punctuation.definition.string", "punctuation.support.type.property-name", "text.html.vue-html meta.tag", @@ -1174,8 +1175,33 @@ } }, { - "name": "Markdown - Heading", - "scope": "markup.heading entity.name", + "name": "Markdown - Heading 1", + "scope": [ + "heading.1.markdown entity.name", + "heading.1.markdown punctuation.definition.heading.markdown", + ], + "settings": { + "fontStyle": "bold", + "foreground": "#89ddff" + } + }, + { + "name": "Markdown - Heading 2", + "scope": [ + "heading.2.markdown entity.name", + "heading.2.markdown punctuation.definition.heading.markdown", + ], + "settings": { + "fontStyle": "bold", + "foreground": "#61bdf2" + } + }, + { + "name": "Markdown - Heading 3", + "scope": [ + "heading.3.markdown entity.name", + "heading.3.markdown punctuation.definition.heading.markdown", + ], "settings": { "fontStyle": "bold", "foreground": "#7aa2f7" @@ -1183,26 +1209,43 @@ }, { "name": "Markdown - Heading 4", - "scope": "heading.4.markdown entity.name", + "scope": [ + "heading.4.markdown entity.name", + "heading.4.markdown punctuation.definition.heading.markdown", + ], "settings": { - "fontStyle": "", - "foreground": "#7aa2f7" + "fontStyle": "bold", + "foreground": "#6d91de" } }, { - "name": "Markdown - Heading punctuation", + "name": "Markdown - Heading 5", "scope": [ - "markdown.heading", - "markup.heading | markup.heading entity.name", - "markup.heading.markdown punctuation.definition.heading.markdown" + "heading.5.markdown entity.name", + "heading.5.markdown punctuation.definition.heading.markdown", ], "settings": { - "foreground": "#7aa2f7" + "fontStyle": "bold", + "foreground": "#9aa5ce" + } + }, + { + "name": "Markdown - Heading 6", + "scope": [ + "heading.6.markdown entity.name", + "heading.6.markdown punctuation.definition.heading.markdown", + ], + "settings": { + "fontStyle": "bold", + "foreground": "#747ca1" } }, { "name": "Markup - Italic", - "scope": "markup.italic", + "scope": [ + "markup.italic", + "markup.italic punctuation" + ], "settings": { "fontStyle": "italic", "foreground": "#c0caf5" @@ -1210,7 +1253,11 @@ }, { "name": "Markup - Bold", - "scope": "markup.bold", + "scope": [ + "markup.bold", + "markup.bold punctuation" + + ], "settings": { "fontStyle": "bold", "foreground": "#c0caf5" @@ -1218,7 +1265,10 @@ }, { "name": "Markup - Bold-Italic", - "scope":"markup.bold markup.italic", + "scope": [ + "markup.bold markup.italic", + "markup.bold markup.italic punctuation", + ], "settings": { "fontStyle": "bold italic", "foreground": "#c0caf5" @@ -1226,10 +1276,12 @@ }, { "name": "Markup - Underline", - "scope": "markup.underline", + "scope": [ + "markup.underline", + "markup.underline punctuation" + ], "settings": { - "fontStyle": "underline", - "foreground": "#acb0d0" + "fontStyle": "underline" } }, { @@ -1248,23 +1300,14 @@ }, { "name": "Markdown - Link", - "scope": "string.other.link", + "scope": [ + "string.other.link", + "markup.underline.link", + "constant.other.reference.link.markdown", + "string.other.link.description.title.markdown" + ], "settings": { - "foreground": "#2ac3de" - } - }, - { - "name": "Markdown - Link Description", - "scope": "string.other.link.description.title.markdown", - "settings": { - "foreground": "#bb9af7" - } - }, - { - "name": "Markdown - Link Anchor", - "scope": "constant.other.reference.link.markdown", - "settings": { - "foreground": "#e0af68" + "foreground": "#84bec4" } }, { @@ -1296,7 +1339,7 @@ "scope": "meta.separator", "settings": { "fontStyle": "bold", - "foreground": "#4E5579" + "foreground": "#565f89" } }, {