From cf2b2af54c116e470222cf48a6bc0bb0b09de313 Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Sat, 18 Sep 2021 16:15:23 -0700 Subject: [PATCH] Make the highlighting closer to before --- src/theme/css/syntax/ayu.css | 89 ++++------- src/theme/css/syntax/light.css | 52 +++---- src/theme/syntax-themes/ayu.tmTheme | 176 ++++------------------ src/theme/syntax-themes/dark.tmTheme | 3 +- src/theme/syntax-themes/light.tmTheme | 70 ++++----- src/theme/syntaxes/Console.sublime-syntax | 23 +++ 6 files changed, 144 insertions(+), 269 deletions(-) create mode 100644 src/theme/syntaxes/Console.sublime-syntax diff --git a/src/theme/css/syntax/ayu.css b/src/theme/css/syntax/ayu.css index 5eafbdcf..d89afe41 100644 --- a/src/theme/css/syntax/ayu.css +++ b/src/theme/css/syntax/ayu.css @@ -3,135 +3,108 @@ */ .syn-code { - color: #c5c8c6; - background-color: #1d1f21; + color: #ffee99; } -.syn-variable.syn-parameter.syn-function { - color: #c5c8c6; -} .syn-comment, .syn-punctuation.syn-definition.syn-comment { - color: #969896; + color: #5c6773; } .syn-punctuation.syn-definition.syn-string, .syn-punctuation.syn-definition.syn-variable, .syn-punctuation.syn-definition.syn-string, .syn-punctuation.syn-definition.syn-parameters, .syn-punctuation.syn-definition.syn-string, .syn-punctuation.syn-definition.syn-array { - color: #c5c8c6; + color: #5c6773; } .syn-none { - color: #c5c8c6; + color: #5c6773; } .syn-keyword.syn-operator { - color: #c5c8c6; + color: #5c6773; } .syn-keyword { - color: #b294bb; + color: #ff7733; } .syn-variable { - color: #cc6666; + color: #ff7733; } .syn-entity.syn-name.syn-function, .syn-meta.syn-require, .syn-support.syn-function.syn-any-method { - color: #81a2be; + color: #36a3d9; } .syn-entity.syn-name.syn-label { - color: #a3685a; + color: #ffee99; } .syn-support.syn-class, .syn-entity.syn-name.syn-class, .syn-entity.syn-name.syn-type.syn-class { - color: #f0c674; + color: #ffee99; } .syn-meta.syn-class { - color: #ffffff; + color: #ffee99; } .syn-keyword.syn-other.syn-special-method { - color: #81a2be; + color: #36a3d9; } .syn-storage { - color: #b294bb; + color: #ff7733; } .syn-support.syn-function { - color: #8abeb7; + color: #36a3d9; } .syn-string, .syn-constant.syn-other.syn-symbol, .syn-entity.syn-other.syn-inherited-class { - color: #b5bd68; + color: #b8cc52; } .syn-constant.syn-numeric { - color: #de935f; + color: #ffee99; } .syn-none { - color: #de935f; + color: #ffee99; } .syn-none { - color: #de935f; + color: #ffee99; } .syn-constant { - color: #de935f; + color: #ffee99; } .syn-entity.syn-name.syn-tag { - color: #cc6666; + color: #00568d; } .syn-entity.syn-other.syn-attribute-name { - color: #de935f; + color: #ff7733; } .syn-entity.syn-other.syn-attribute-name.syn-id, .syn-punctuation.syn-definition.syn-entity { - color: #81a2be; + color: #ff7733; } .syn-meta.syn-selector { - color: #b294bb; + color: #ff7733; } .syn-none { - color: #de935f; + color: #ffee99; } .syn-markup.syn-heading .syn-punctuation.syn-definition.syn-heading, .syn-entity.syn-name.syn-section { - color: #81a2be; -} -.syn-keyword.syn-other.syn-unit { - color: #de935f; + color: #ffb454; } .syn-markup.syn-bold, .syn-punctuation.syn-definition.syn-bold { - color: #f0c674; font-weight: bold; } .syn-markup.syn-italic, .syn-punctuation.syn-definition.syn-italic { - color: #b294bb; font-style: italic; } -.syn-markup.syn-raw.syn-inline { - color: #b5bd68; -} .syn-string.syn-other.syn-link, .syn-punctuation.syn-definition.syn-string.syn-end.syn-markdown, .syn-punctuation.syn-definition.syn-string.syn-begin.syn-markdown { - color: #cc6666; + color: #ff7733; } .syn-meta.syn-link { - color: #de935f; + color: #ff7733; } .syn-markup.syn-list { - color: #cc6666; + color: #b8cc52; } .syn-markup.syn-quote { - color: #de935f; + color: #5c6773; } .syn-meta.syn-separator { color: #c5c8c6; background-color: #373b41; } -.syn-markup.syn-inserted { - color: #b5bd68; -} -.syn-markup.syn-deleted { - color: #cc6666; -} -.syn-markup.syn-changed { - color: #b294bb; -} .syn-constant.syn-other.syn-color { - color: #8abeb7; + color: #ffee99; } .syn-string.syn-regexp { - color: #8abeb7; -} -.syn-constant.syn-character.syn-escape { - color: #8abeb7; -} -.syn-punctuation.syn-section.syn-embedded, .syn-variable.syn-interpolation { - color: #b294bb; + color: #ff7733; } .syn-invalid.syn-illegal { color: #ffffff; diff --git a/src/theme/css/syntax/light.css b/src/theme/css/syntax/light.css index ec72e9d5..b778db1b 100644 --- a/src/theme/css/syntax/light.css +++ b/src/theme/css/syntax/light.css @@ -11,7 +11,7 @@ color: #6e6b5e; } .syn-comment, .syn-punctuation.syn-definition.syn-comment { - color: #999580; + color: #575757; } .syn-punctuation.syn-definition.syn-string, .syn-punctuation.syn-definition.syn-variable, .syn-punctuation.syn-definition.syn-string, .syn-punctuation.syn-definition.syn-parameters, .syn-punctuation.syn-definition.syn-string, .syn-punctuation.syn-definition.syn-array { color: #6e6b5e; @@ -26,19 +26,19 @@ color: #b854d4; } .syn-variable { - color: #d73737; + color: #d70025; } .syn-entity.syn-name.syn-function, .syn-meta.syn-require, .syn-support.syn-function.syn-any-method { - color: #6684e1; + color: #0030f2; } .syn-support.syn-class, .syn-entity.syn-name.syn-class, .syn-entity.syn-name.syn-type.syn-class { - color: #b65611; + color: #b21e00; } .syn-meta.syn-class { color: #292824; } .syn-keyword.syn-other.syn-special-method { - color: #6684e1; + color: #0030f2; } .syn-storage { color: #b854d4; @@ -47,43 +47,43 @@ color: #1fad83; } .syn-string, .syn-constant.syn-other.syn-symbol, .syn-entity.syn-other.syn-inherited-class { - color: #60ac39; + color: #008200; } .syn-constant.syn-numeric { - color: #b65611; + color: #b21e00; } .syn-none { - color: #b65611; + color: #b21e00; } .syn-none { - color: #b65611; + color: #b21e00; } .syn-constant { - color: #b65611; + color: #b21e00; } .syn-entity.syn-name.syn-tag { - color: #d73737; + color: #d70025; } .syn-entity.syn-other.syn-attribute-name { - color: #b65611; + color: #b21e00; } .syn-entity.syn-other.syn-attribute-name.syn-id, .syn-punctuation.syn-definition.syn-entity { - color: #6684e1; + color: #0030f2; } .syn-meta.syn-selector { color: #b854d4; } .syn-none { - color: #b65611; + color: #b21e00; } .syn-markup.syn-heading .syn-punctuation.syn-definition.syn-heading, .syn-entity.syn-name.syn-section { - color: #6684e1; + color: #0030f2; } .syn-keyword.syn-other.syn-unit { - color: #b65611; + color: #b21e00; } .syn-markup.syn-bold, .syn-punctuation.syn-definition.syn-bold { - color: #b65611; + color: #b21e00; font-weight: bold; } .syn-markup.syn-italic, .syn-punctuation.syn-definition.syn-italic { @@ -91,29 +91,29 @@ font-weight: bold; font-style: italic; } .syn-markup.syn-raw.syn-inline { - color: #60ac39; + color: #008200; } .syn-string.syn-other.syn-link { - color: #d73737; + color: #d70025; } .syn-meta.syn-link { - color: #b65611; + color: #b21e00; } .syn-markup.syn-list { - color: #d73737; + color: #d70025; } .syn-markup.syn-quote { - color: #b65611; + color: #b21e00; } .syn-meta.syn-separator { color: #6e6b5e; background-color: #e8e4cf; } .syn-markup.syn-inserted { - color: #60ac39; + color: #008200; } .syn-markup.syn-deleted { - color: #d73737; + color: #d70025; } .syn-markup.syn-changed { color: #b854d4; @@ -132,11 +132,11 @@ font-style: italic; } .syn-invalid.syn-illegal { color: #fefbec; - background-color: #d73737; + background-color: #d70025; } .syn-invalid.syn-broken { color: #20201d; - background-color: #b65611; + background-color: #b21e00; } .syn-invalid.syn-deprecated { color: #fefbec; diff --git a/src/theme/syntax-themes/ayu.tmTheme b/src/theme/syntax-themes/ayu.tmTheme index b25c81db..837f80da 100644 --- a/src/theme/syntax-themes/ayu.tmTheme +++ b/src/theme/syntax-themes/ayu.tmTheme @@ -2,46 +2,17 @@ + author - Template: Chris Kempson, Scheme: Chris Kempson (http://chriskempson.com) + Template: Chris Kempson, Scheme: Chris Kempson (http://chriskempson.com), Michael Howell (https://notriddle.com) name Base16 Tomorrow Night semanticClass theme.base16.tomorrow-night colorSpaceName sRGB - gutterSettings - - background - #282a2e - divider - #282a2e - foreground - #969896 - selectionBackground - #373b41 - selectionForeground - #b4b7b4 - settings - - settings - - background - #1d1f21 - caret - #c5c8c6 - foreground - #c5c8c6 - invisibles - #969896 - lineHighlight - #96989655 - selection - #373b41 - - name Text @@ -50,7 +21,7 @@ settings foreground - #c5c8c6 + #ffee99 @@ -61,7 +32,7 @@ settings foreground - #969896 + #5c6773 @@ -72,7 +43,7 @@ settings foreground - #c5c8c6 + #5c6773 @@ -83,7 +54,7 @@ settings foreground - #c5c8c6 + #5c6773 @@ -94,7 +65,7 @@ settings foreground - #c5c8c6 + #5c6773 @@ -105,7 +76,7 @@ settings foreground - #b294bb + #ff7733 @@ -116,7 +87,7 @@ settings foreground - #cc6666 + #ff7733 @@ -127,7 +98,7 @@ settings foreground - #81a2be + #36a3d9 @@ -138,7 +109,7 @@ settings foreground - #a3685a + #ffee99 @@ -149,7 +120,7 @@ settings foreground - #f0c674 + #ffee99 @@ -160,7 +131,7 @@ settings foreground - #ffffff + #ffee99 @@ -171,7 +142,7 @@ settings foreground - #81a2be + #36a3d9 @@ -182,7 +153,7 @@ settings foreground - #b294bb + #ff7733 @@ -193,7 +164,7 @@ settings foreground - #8abeb7 + #36a3d9 @@ -204,7 +175,7 @@ settings foreground - #b5bd68 + #b8cc52 @@ -215,7 +186,7 @@ settings foreground - #de935f + #ffee99 @@ -226,7 +197,7 @@ settings foreground - #de935f + #ffee99 @@ -237,7 +208,7 @@ settings foreground - #de935f + #ffee99 @@ -248,7 +219,7 @@ settings foreground - #de935f + #ffee99 @@ -259,7 +230,7 @@ settings foreground - #cc6666 + #00568d @@ -270,7 +241,7 @@ settings foreground - #de935f + #ff7733 @@ -281,7 +252,7 @@ settings foreground - #81a2be + #ff7733 @@ -292,7 +263,7 @@ settings foreground - #b294bb + #ff7733 @@ -303,7 +274,7 @@ settings foreground - #de935f + #ffee99 @@ -316,18 +287,7 @@ fontStyle foreground - #81a2be - - - - name - Units - scope - keyword.other.unit - settings - - foreground - #de935f + #ffb454 @@ -339,8 +299,6 @@ fontStyle bold - foreground - #f0c674 @@ -352,19 +310,6 @@ fontStyle italic - foreground - #b294bb - - - - name - Code - scope - markup.raw.inline - settings - - foreground - #b5bd68 @@ -375,7 +320,7 @@ settings foreground - #cc6666 + #ff7733 @@ -386,7 +331,7 @@ settings foreground - #de935f + #ff7733 @@ -397,7 +342,7 @@ settings foreground - #cc6666 + #b8cc52 @@ -408,7 +353,7 @@ settings foreground - #de935f + #5c6773 @@ -424,39 +369,6 @@ #c5c8c6 - - name - Inserted - scope - markup.inserted - settings - - foreground - #b5bd68 - - - - name - Deleted - scope - markup.deleted - settings - - foreground - #cc6666 - - - - name - Changed - scope - markup.changed - settings - - foreground - #b294bb - - name Colors @@ -465,7 +377,7 @@ settings foreground - #8abeb7 + #ffee99 @@ -476,29 +388,7 @@ settings foreground - #8abeb7 - - - - name - Escape Characters - scope - constant.character.escape - settings - - foreground - #8abeb7 - - - - name - Embedded - scope - punctuation.section.embedded, variable.interpolation - settings - - foreground - #b294bb + #ff7733 diff --git a/src/theme/syntax-themes/dark.tmTheme b/src/theme/syntax-themes/dark.tmTheme index b25c81db..6d3f3c82 100644 --- a/src/theme/syntax-themes/dark.tmTheme +++ b/src/theme/syntax-themes/dark.tmTheme @@ -2,8 +2,9 @@ + author - Template: Chris Kempson, Scheme: Chris Kempson (http://chriskempson.com) + Template: Chris Kempson, Scheme: Chris Kempson (http://chriskempson.com), Michael Howell name Base16 Tomorrow Night semanticClass diff --git a/src/theme/syntax-themes/light.tmTheme b/src/theme/syntax-themes/light.tmTheme index 87d3353b..473dfd49 100644 --- a/src/theme/syntax-themes/light.tmTheme +++ b/src/theme/syntax-themes/light.tmTheme @@ -2,27 +2,15 @@ + author - Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/dune) + Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/dune), Michael Howell (https://notriddle.com) name Base16 Atelier Dune Light semanticClass base16.atelierdune.light colorSpaceName sRGB - gutterSettings - - background - #fefbec - divider - #fefbec - foreground - #6e6b5e - selectionBackground - #fefbec - selectionForeground - #a6a28c - settings @@ -37,7 +25,7 @@ invisibles #e8e4cf lineHighlight - #99958055 + #57575755 selection #e8e4cf @@ -61,7 +49,7 @@ settings foreground - #999580 + #575757 @@ -116,7 +104,7 @@ settings foreground - #d73737 + #d70025 @@ -127,7 +115,7 @@ settings foreground - #6684e1 + #0030f2 @@ -138,7 +126,7 @@ settings foreground - #b65611 + #b21e00 @@ -160,7 +148,7 @@ settings foreground - #6684e1 + #0030f2 @@ -193,7 +181,7 @@ settings foreground - #60ac39 + #008200 @@ -204,7 +192,7 @@ settings foreground - #b65611 + #b21e00 @@ -215,7 +203,7 @@ settings foreground - #b65611 + #b21e00 @@ -226,7 +214,7 @@ settings foreground - #b65611 + #b21e00 @@ -237,7 +225,7 @@ settings foreground - #b65611 + #b21e00 @@ -248,7 +236,7 @@ settings foreground - #d73737 + #d70025 @@ -259,7 +247,7 @@ settings foreground - #b65611 + #b21e00 @@ -270,7 +258,7 @@ settings foreground - #6684e1 + #0030f2 @@ -292,7 +280,7 @@ settings foreground - #b65611 + #b21e00 @@ -305,7 +293,7 @@ fontStyle foreground - #6684e1 + #0030f2 @@ -316,7 +304,7 @@ settings foreground - #b65611 + #b21e00 @@ -329,7 +317,7 @@ fontStyle bold foreground - #b65611 + #b21e00 @@ -353,7 +341,7 @@ settings foreground - #60ac39 + #008200 @@ -364,7 +352,7 @@ settings foreground - #d73737 + #d70025 @@ -375,7 +363,7 @@ settings foreground - #b65611 + #b21e00 @@ -386,7 +374,7 @@ settings foreground - #d73737 + #d70025 @@ -397,7 +385,7 @@ settings foreground - #b65611 + #b21e00 @@ -421,7 +409,7 @@ settings foreground - #60ac39 + #008200 @@ -432,7 +420,7 @@ settings foreground - #d73737 + #d70025 @@ -498,7 +486,7 @@ settings background - #d73737 + #d70025 foreground #fefbec @@ -511,7 +499,7 @@ settings background - #b65611 + #b21e00 foreground #20201d diff --git a/src/theme/syntaxes/Console.sublime-syntax b/src/theme/syntaxes/Console.sublime-syntax new file mode 100644 index 00000000..21ff8d21 --- /dev/null +++ b/src/theme/syntaxes/Console.sublime-syntax @@ -0,0 +1,23 @@ +%YAML 1.2 +--- +# http://www.sublimetext.com/docs/3/syntax.html +name: Console +file_extensions: + - console +scope: console +contexts: + main: + - include: comments + comments: + - match: "\\$" + scope: string.dollar-prompt.console + push: + - meta_scope: support.class.dollar-prompt.console + - match: $\n? + pop: true + - match: "#" + scope: string.hash-prompt.console + push: + - meta_scope: support.class.hash-prompt.console + - match: $\n? + pop: true