diff --git a/README.md b/README.md index 18d49f8b..3a53ce6c 100755 --- a/README.md +++ b/README.md @@ -100,7 +100,7 @@ To enjoy a better experience of using the **Meetio Theme** in your Sublime Text, | Usage | Light | Dark | | --------------- | ----------------------------------------------------------------------------- | ----------------------------------------------------------------------------- | -| `Cursor` | ![#5f7e97](https://placehold.it/30x24/5f7e97/000000?text=%20) `#5f7e97` | ![#ffcc00](https://placehold.it/30x24/ffcc00/000000?text=%20) `#ffcc00` | +| `Cursor` | ![#7e57c2](https://placehold.it/30x24/7e57c2/000000?text=%20) `#7e57c2` | ![#ffcc00](https://placehold.it/30x24/ffcc00/000000?text=%20) `#ffcc00` | | `Foreground` | ![#455A64](https://placehold.it/30x24/455A64/000000?text=%20) `#455A64` | ![#dedfe4](https://placehold.it/30x24/dedfe4/000000?text=%20) `#dedfe4` | | `Background` | ![#fbfbfb](https://placehold.it/30x24/fbfbfb/000000?text=%20) `#fbfbfb` | ![#011627](https://placehold.it/30x24/011627/000000?text=%20) `#011627` | | `Comments` | ![#90a4ae](https://placehold.it/30x24/90a4ae/000000?text=%20) `#90a4ae` | ![#697098](https://placehold.it/30x24/697098/000000?text=%20) `#697098` | @@ -113,7 +113,7 @@ To enjoy a better experience of using the **Meetio Theme** in your Sublime Text, | `Purple` | ![#7c4dff](https://placehold.it/30x24/7c4dff/000000?text=%20) `#7c4dff` | ![#c2afff](https://placehold.it/30x24/c2afff/000000?text=%20) `#c2afff` | | `Red` | ![#e53935](https://placehold.it/30x24/e53935/000000?text=%20) `#e53935` | ![#d95757](https://placehold.it/30x24/d95757/000000?text=%20) `#d95757` | | `Yellow` | ![#f3ad2c](https://placehold.it/30x24/f3ad2c/000000?text=%20) `#f3ad2c` | ![#ffcb6b](https://placehold.it/30x24/ffcb6b/000000?text=%20) `#ffcb6b` | -| `Invalid` | ![#d3423e3a](https://placehold.it/30x24/d3423e3a/000000?text=%20) `#d3423e3a` | ![#d46c6c3a](https://placehold.it/30x24/d46c6c3a/000000?text=%20) `#d46c6c3a` | +| `Invalid` | ![#d3423e66](https://placehold.it/30x24/d3423e66/000000?text=%20) `#d3423e66` | ![#d46c6c66](https://placehold.it/30x24/d46c6c66/000000?text=%20) `#d46c6c66` | | `Diff Added` | ![#9ccc65](https://placehold.it/30x24/9ccc65/000000?text=%20) `#9ccc65` | ![#9ccc65](https://placehold.it/30x24/9ccc65/000000?text=%20) `#9ccc65` | | `Diff Modified` | ![#e2b93d](https://placehold.it/30x24/e2b93d/000000?text=%20) `#e2b93d` | ![#e2b93d](https://placehold.it/30x24/e2b93d/000000?text=%20) `#e2b93d` | | `Diff Deleted` | ![#ef5350](https://placehold.it/30x24/ef5350/000000?text=%20) `#ef5350` | ![#ef5350](https://placehold.it/30x24/ef5350/000000?text=%20) `#ef5350` | diff --git a/schemes/Meetio-Dark.sublime-color-scheme b/schemes/Meetio-Dark.sublime-color-scheme index 621e8e46..458d85cf 100644 --- a/schemes/Meetio-Dark.sublime-color-scheme +++ b/schemes/Meetio-Dark.sublime-color-scheme @@ -15,7 +15,7 @@ "purple": "#c2afff", "red": "#d95757", "yellow": "#ffcb8b", - "invalid": "#d46c6c3a", + "invalid": "#d46c6c66", "diffAdded": "#addb67", "diffModified": "#e2b93d", "diffDeleted": "#ef5350", @@ -157,26 +157,6 @@ "scope": "source.scss meta.function.declaration.sass keyword.control.at-rule.sass, source.scss meta.function.declaration.sass meta.function.parameters.sass constant.language.sass, source.css meta.at-rule.import.css keyword.control.at-rule.import.css, source.scss meta.function-call.sass variable.function.sass keyword.control.at-rule.sass", "foreground": "var(cyan)" }, - { - "name": "[GitGutter] Inserted", - "scope": "markup.inserted.git_gutter", - "foreground": "var(diffAdded)" - }, - { - "name": "[GitGutter] Modified", - "scope": "markup.changed.git_gutter", - "foreground": "var(diffModified)" - }, - { - "name": "[GitGutter] Deleted", - "scope": "markup.deleted.git_gutter", - "foreground": "var(diffDeleted)" - }, - { - "name": "[GitGutter] Ignored", - "scope": "markup.ignored.git_gutter", - "foreground": "var(diffIgnored)" - }, { "name": "[Diff] Deleted", "scope": "diff.deleted, diff.deleted.char", @@ -263,19 +243,49 @@ "background": "color(var(yellow) alpha(0.9))" }, { - "name": "[INI] - Color for Entity", - "scope": "source.ini entity, meta.embedded.block.ini, source.ini", + "name": "[HTML] String", + "scope": "text.html.basic string", + "foreground": "var(green)" + }, + { + "name": "[HTML] Operator", + "scope": "keyword.other.template, keyword.other.substitution", + "foreground": "var(green)" + }, + { + "name": "[HTML] Attributes", + "scope": "entity.other.attribute-name.html, entity.other.attribute-name", + "foreground": "var(yellow)" + }, + { + "name": "[HTML] Tag Name", + "scope": "entity.name.tag", "foreground": "var(red)" }, { - "name": "[INI] - Color for Keyword", - "scope": "source.ini keyword, keyword.other.definition.ini", + "name": "[HTML] Tag Attribute", + "scope": "text.html.basic entity.other.attribute-name", "foreground": "var(purple)" }, { - "name": "[INI] - Color for Value", - "scope": "source.ini meta.declaration.ini meta.value.ini string.name.value.ini", - "foreground": "var(green)" + "name": "[GitGutter] Inserted", + "scope": "markup.inserted.git_gutter", + "foreground": "var(diffAdded)" + }, + { + "name": "[GitGutter] Modified", + "scope": "markup.changed.git_gutter", + "foreground": "var(diffModified)" + }, + { + "name": "[GitGutter] Deleted", + "scope": "markup.deleted.git_gutter", + "foreground": "var(diffDeleted)" + }, + { + "name": "[GitGutter] Ignored", + "scope": "markup.ignored.git_gutter", + "foreground": "var(diffIgnored)" }, { "name": "[JSON] Key ", @@ -313,89 +323,55 @@ "foreground": "var(brown)" }, { - "name": "[HTML] String", - "scope": "text.html.basic string", - "foreground": "var(green)" - }, - { - "name": "[HTML] Operator", - "scope": "keyword.other.template, keyword.other.substitution", - "foreground": "var(green)" - }, - { - "name": "[HTML] Attributes", - "scope": "entity.other.attribute-name.html, entity.other.attribute-name", - "foreground": "var(yellow)" - }, - { - "name": "[HTML] Tag Name", - "scope": "entity.name.tag", - "foreground": "var(red)" - }, - { - "name": "[HTML] Tag Attribute", - "scope": "text.html.basic entity.other.attribute-name", + "name": "[JavaScript] Constructor", + "scope": "source.js meta.class.js meta.block.js meta.function.declaration.js storage.type.accessor.js, meta.function-call.constructor.js, entity.name.function.constructor.js, variable.language.constructor.js", "foreground": "var(purple)" }, { - "name": "[Python] Variables", - "scope": "source.python meta.function.parameters.python variable.parameter.python, source.python meta.function-call.arguments.python meta.qualified-name.python meta.generic-name.python, source.python meta.function-call.arguments.python variable.parameter.python", - "foreground": "var(orange)" - }, - { - "name": "[Python] Function Arguments", - "scope": "source.python meta.function-call.arguments.python meta.qualified-name.python meta.generic-name.python", - "foreground": "var(foreground)" - }, - { - "name": "[Python] Statement While", - "scope": "source.python meta.statement.while.python constant.language.python, source.python constant.language.python", - "foreground": "var(pink)" - }, - { - "name": "[Python] Annotation", - "scope": "source.python meta.function.parameters.annotation.python meta.qualified-name.python support.type.python", - "foreground": "var(yellow)" + "name": "[JavaScript] Object Key", + "scope": "meta.object-literal.key.js", + "foreground": "var(blue)" }, { - "name": "[Python] Print", - "scope": "source.python keyword.other.print.python, source.python meta.function-call.python meta.qualified-name.python variable.function.python support.function.builtin.python", - "font_style": "normal", - "foreground": "var(pink)" + "name": "[JavaScript] Function", + "scope": "variable.function, variable.annotation, entity.name.function, meta.class-method.js entity.name.function.js, variable.function", + "foreground": "var(blue)" }, { - "name": "[Python] Function Parameters", - "scope": "source.python meta.item-access.arguments.python meta.qualified-name.python meta.generic-name.python, source.python meta.item-access.arguments.python meta.qualified-name.python support.type.python, source.python meta.function.parameters.annotation.python meta.item-access.arguments.python meta.qualified-name.python support.type.python", - "foreground": "var(green)" + "name": "[JavaScript] Language Library", + "scope": "variable.language", + "foreground": "var(red)", + "font_style": "italic" }, { - "name": "[Python] Generic Name", - "scope": "source.python meta.function.parameters.annotation.python meta.item-access.arguments.python meta.item-access.python meta.qualified-name.python meta.generic-name.python", - "foreground": "var(blue)" + "name": "[JavaScript] Library", + "scope": "support.function, support.macro", + "foreground": "var(blue)", + "font_style": "italic" }, { - "name": "[Python] Exception", - "scope": "source.python meta.statement.raise.python meta.function-call.python meta.qualified-name.python variable.function.python support.type.exception.python", - "foreground": "var(red)" + "name": "[JavaScript] Support", + "scope": "support.type, support.class", + "foreground": "var(yellow)" }, { - "name": "[Python] Function Parameters", - "scope": "source.python meta.item-access.python meta.qualified-name.python meta.generic-name.python, source.python meta.function.parameters.annotation.python meta.item-access.python meta.qualified-name.python meta.generic-name.python", - "foreground": "var(yellow)" + "name": "[JavaScript] Null", + "scope": "constant.language.null.js", + "foreground": "var(orange)" }, { - "name": "[SQL] Source", - "scope": "source.sql", - "foreground": "var(foreground)" + "name": "[JavaScript] Undefined", + "scope": "constant.language.undefined.js", + "foreground": "var(orange)" }, { - "name": "[SQL] — Other keywords", - "scope": "keyword.other.DML.sql", - "foreground": "var(blue)" + "name": "[JavaScript] Boolean", + "scope": "source.js meta.export.js meta.binding.name.js variable.other.constant.js, constant.language.boolean.false.js, constant.language.boolean.true.js, source.js meta.export.js meta.class.js meta.block.js meta.function.js meta.block.js variable.other.constant.js", + "foreground": "var(orange)" }, { - "name": "[SQL] — Function", - "scope": "support.function.aggregate.sql", + "name": "[JavaScript] Object", + "scope": "source.js meta.class.js meta.block.js meta.function.js meta.block.js meta.function-call.constructor.js meta.group.js meta.object-literal.js variable.other.readwrite.js", "foreground": "var(pink)" }, { @@ -439,6 +415,67 @@ "scope": "embedding.php text.html.basic meta.embedded.block.php source.php meta.class.php meta.block.php meta.function.php meta.block.php constant.language.php", "foreground": "var(orange)" }, + { + "name": "[INI] - Color for Entity", + "scope": "source.ini entity, meta.embedded.block.ini, source.ini", + "foreground": "var(red)" + }, + { + "name": "[INI] - Color for Keyword", + "scope": "source.ini keyword, keyword.other.definition.ini", + "foreground": "var(purple)" + }, + { + "name": "[INI] - Color for Value", + "scope": "source.ini meta.declaration.ini meta.value.ini string.name.value.ini", + "foreground": "var(green)" + }, + { + "name": "[Python] Variables", + "scope": "source.python meta.function.parameters.python variable.parameter.python, source.python meta.function-call.arguments.python meta.qualified-name.python meta.generic-name.python, source.python meta.function-call.arguments.python variable.parameter.python", + "foreground": "var(orange)" + }, + { + "name": "[Python] Function Arguments", + "scope": "source.python meta.function-call.arguments.python meta.qualified-name.python meta.generic-name.python", + "foreground": "var(foreground)" + }, + { + "name": "[Python] Statement While", + "scope": "source.python meta.statement.while.python constant.language.python, source.python constant.language.python", + "foreground": "var(pink)" + }, + { + "name": "[Python] Annotation", + "scope": "source.python meta.function.parameters.annotation.python meta.qualified-name.python support.type.python", + "foreground": "var(yellow)" + }, + { + "name": "[Python] Print", + "scope": "source.python keyword.other.print.python, source.python meta.function-call.python meta.qualified-name.python variable.function.python support.function.builtin.python", + "font_style": "normal", + "foreground": "var(pink)" + }, + { + "name": "[Python] Function Parameters", + "scope": "source.python meta.item-access.arguments.python meta.qualified-name.python meta.generic-name.python, source.python meta.item-access.arguments.python meta.qualified-name.python support.type.python, source.python meta.function.parameters.annotation.python meta.item-access.arguments.python meta.qualified-name.python support.type.python", + "foreground": "var(green)" + }, + { + "name": "[Python] Generic Name", + "scope": "source.python meta.function.parameters.annotation.python meta.item-access.arguments.python meta.item-access.python meta.qualified-name.python meta.generic-name.python", + "foreground": "var(blue)" + }, + { + "name": "[Python] Exception", + "scope": "source.python meta.statement.raise.python meta.function-call.python meta.qualified-name.python variable.function.python support.type.exception.python", + "foreground": "var(red)" + }, + { + "name": "[Python] Function Parameters", + "scope": "source.python meta.item-access.python meta.qualified-name.python meta.generic-name.python, source.python meta.function.parameters.annotation.python meta.item-access.python meta.qualified-name.python meta.generic-name.python", + "foreground": "var(yellow)" + }, { "name": "[Markdown] Deleted", "scope": "markup.deleted", @@ -521,70 +558,23 @@ { "name": "[Markdown] - Color for Punctuation — Heading, `Code` and fenced ```code blocks```, **Bold**, _Italic_", "scope": "punctuation.definition.raw.begin.markdown, punctuation.definition.raw.end.markdown, punctuation.definition.raw.code-fence.begin.markdown, punctuation.definition.raw.code-fence.end.markdown, punctuation.definition.heading.begin.markdown, punctuation.definition.bold.begin.markdown, punctuation.definition.bold.end.markdown, punctuation.definition.italic.begin.markdown, punctuation.definition.italic.end.markdown", - "foreground": "color(var(background) blend(var(foreground) 80%))" + "foreground": "color(var(background) blend(var(foreground) 85%))" }, { - "name": "[JavaScript] Constructor", - "scope": "source.js meta.class.js meta.block.js meta.function.declaration.js storage.type.accessor.js, meta.function-call.constructor.js, entity.name.function.constructor.js, variable.language.constructor.js", - "foreground": "var(purple)" - }, - { - "name": "[JavaScript] Object Key", - "scope": "meta.object-literal.key.js", - "foreground": "var(blue)" + "name": "[SQL] Source", + "scope": "source.sql", + "foreground": "var(foreground)" }, { - "name": "[JavaScript] Function", - "scope": "variable.function, variable.annotation, entity.name.function, meta.class-method.js entity.name.function.js, variable.function", + "name": "[SQL] — Other keywords", + "scope": "keyword.other.DML.sql", "foreground": "var(blue)" }, { - "name": "[JavaScript] Language Library", - "scope": "variable.language", - "foreground": "var(red)", - "font_style": "italic" - }, - { - "name": "[JavaScript] Library", - "scope": "support.function, support.macro", - "foreground": "var(blue)", - "font_style": "italic" - }, - { - "name": "[JavaScript] Support", - "scope": "support.type, support.class", - "foreground": "var(yellow)" - }, - { - "name": "[JavaScript] Null", - "scope": "constant.language.null.js", - "foreground": "var(orange)" - }, - { - "name": "[JavaScript] Undefined", - "scope": "constant.language.undefined.js", - "foreground": "var(orange)" - }, - { - "name": "[JavaScript] Boolean", - "scope": "source.js meta.export.js meta.binding.name.js variable.other.constant.js, constant.language.boolean.false.js, constant.language.boolean.true.js, source.js meta.export.js meta.class.js meta.block.js meta.function.js meta.block.js variable.other.constant.js", - "foreground": "var(orange)" - }, - { - "name": "[JavaScript] Object", - "scope": "source.js meta.class.js meta.block.js meta.function.js meta.block.js meta.function-call.constructor.js meta.group.js meta.object-literal.js variable.other.readwrite.js", + "name": "[SQL] — Function", + "scope": "support.function.aggregate.sql", "foreground": "var(pink)" }, - { - "name": "[SublimeLinter] Error", - "scope": "sublimelinter.mark.error", - "foreground": "var(invalid)" - }, - { - "name": "[SublimeLinter] Gutter mark", - "scope": "sublimelinter.gutter-mark", - "foreground": "var(blue)" - }, { "name": "[JavaScript] Constructor", "scope": "source.ts meta.export.default.ts meta.class.ts meta.method.declaration.ts storage.type.ts, meta.function-call.constructor.ts, entity.name.function.constructor.ts, variable.language.constructor.ts", @@ -645,6 +635,16 @@ "scope": "source.tsx meta.export.default.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.function-call.tsx variable.other.object.tsx, source.tsx meta.export.default.tsx meta.class.tsx meta.field.declaration.tsx meta.type.annotation.tsx entity.name.type.module.tsx", "foreground": "var(brown)" }, + { + "name": "[SublimeLinter] Error", + "scope": "sublimelinter.mark.error", + "foreground": "var(invalid)" + }, + { + "name": "[SublimeLinter] Gutter mark", + "scope": "sublimelinter.gutter-mark", + "foreground": "var(blue)" + }, { "name": "[Vue] Function Parameter", "scope": "text.html.vue source.js.embedded.html source.js meta.export.js meta.object-literal.js meta.object-literal.js meta.function.declaration.js meta.binding.name.js variable.parameter.function.js", diff --git a/schemes/Meetio-Light.sublime-color-scheme b/schemes/Meetio-Light.sublime-color-scheme index e3ba38c3..d09a0d04 100644 --- a/schemes/Meetio-Light.sublime-color-scheme +++ b/schemes/Meetio-Light.sublime-color-scheme @@ -15,7 +15,7 @@ "purple": "#7c4dff", "red": "#e53935", "yellow": "#f3ad2c", - "invalid": "#d3423e3a", + "invalid": "#d3423e66", "diffAdded": "#9ccc65", "diffModified": "#e2b93d", "diffDeleted": "#ef5350", @@ -157,26 +157,6 @@ "scope": "source.scss meta.function.declaration.sass keyword.control.at-rule.sass, source.scss meta.function.declaration.sass meta.function.parameters.sass constant.language.sass, source.css meta.at-rule.import.css keyword.control.at-rule.import.css, source.scss meta.function-call.sass variable.function.sass keyword.control.at-rule.sass", "foreground": "var(cyan)" }, - { - "name": "[GitGutter] Inserted", - "scope": "markup.inserted.git_gutter", - "foreground": "var(diffAdded)" - }, - { - "name": "[GitGutter] Modified", - "scope": "markup.changed.git_gutter", - "foreground": "var(diffModified)" - }, - { - "name": "[GitGutter] Deleted", - "scope": "markup.deleted.git_gutter", - "foreground": "var(diffDeleted)" - }, - { - "name": "[GitGutter] Ignored", - "scope": "markup.ignored.git_gutter", - "foreground": "var(diffIgnored)" - }, { "name": "[Diff] Deleted", "scope": "diff.deleted, diff.deleted.char", @@ -263,19 +243,49 @@ "background": "color(var(yellow) alpha(0.9))" }, { - "name": "[INI] - Color for Entity", - "scope": "source.ini entity, meta.embedded.block.ini, source.ini", + "name": "[HTML] String", + "scope": "text.html.basic string", + "foreground": "var(green)" + }, + { + "name": "[HTML] Operator", + "scope": "keyword.other.template, keyword.other.substitution", + "foreground": "var(green)" + }, + { + "name": "[HTML] Attributes", + "scope": "entity.other.attribute-name.html, entity.other.attribute-name", + "foreground": "var(yellow)" + }, + { + "name": "[HTML] Tag Name", + "scope": "entity.name.tag", "foreground": "var(red)" }, { - "name": "[INI] - Color for Keyword", - "scope": "source.ini keyword, keyword.other.definition.ini", + "name": "[HTML] Tag Attribute", + "scope": "text.html.basic entity.other.attribute-name", "foreground": "var(purple)" }, { - "name": "[INI] - Color for Value", - "scope": "source.ini meta.declaration.ini meta.value.ini string.name.value.ini", - "foreground": "var(green)" + "name": "[GitGutter] Inserted", + "scope": "markup.inserted.git_gutter", + "foreground": "var(diffAdded)" + }, + { + "name": "[GitGutter] Modified", + "scope": "markup.changed.git_gutter", + "foreground": "var(diffModified)" + }, + { + "name": "[GitGutter] Deleted", + "scope": "markup.deleted.git_gutter", + "foreground": "var(diffDeleted)" + }, + { + "name": "[GitGutter] Ignored", + "scope": "markup.ignored.git_gutter", + "foreground": "var(diffIgnored)" }, { "name": "[JSON] Key ", @@ -313,89 +323,55 @@ "foreground": "var(brown)" }, { - "name": "[HTML] String", - "scope": "text.html.basic string", - "foreground": "var(green)" - }, - { - "name": "[HTML] Operator", - "scope": "keyword.other.template, keyword.other.substitution", - "foreground": "var(green)" - }, - { - "name": "[HTML] Attributes", - "scope": "entity.other.attribute-name.html, entity.other.attribute-name", - "foreground": "var(yellow)" - }, - { - "name": "[HTML] Tag Name", - "scope": "entity.name.tag", - "foreground": "var(red)" - }, - { - "name": "[HTML] Tag Attribute", - "scope": "text.html.basic entity.other.attribute-name", + "name": "[JavaScript] Constructor", + "scope": "source.js meta.class.js meta.block.js meta.function.declaration.js storage.type.accessor.js, meta.function-call.constructor.js, entity.name.function.constructor.js, variable.language.constructor.js", "foreground": "var(purple)" }, { - "name": "[Python] Variables", - "scope": "source.python meta.function.parameters.python variable.parameter.python, source.python meta.function-call.arguments.python meta.qualified-name.python meta.generic-name.python, source.python meta.function-call.arguments.python variable.parameter.python", - "foreground": "var(orange)" - }, - { - "name": "[Python] Function Arguments", - "scope": "source.python meta.function-call.arguments.python meta.qualified-name.python meta.generic-name.python", - "foreground": "var(foreground)" - }, - { - "name": "[Python] Statement While", - "scope": "source.python meta.statement.while.python constant.language.python, source.python constant.language.python", - "foreground": "var(pink)" - }, - { - "name": "[Python] Annotation", - "scope": "source.python meta.function.parameters.annotation.python meta.qualified-name.python support.type.python", - "foreground": "var(yellow)" + "name": "[JavaScript] Object Key", + "scope": "meta.object-literal.key.js", + "foreground": "var(blue)" }, { - "name": "[Python] Print", - "scope": "source.python keyword.other.print.python, source.python meta.function-call.python meta.qualified-name.python variable.function.python support.function.builtin.python", - "font_style": "normal", - "foreground": "var(pink)" + "name": "[JavaScript] Function", + "scope": "variable.function, variable.annotation, entity.name.function, meta.class-method.js entity.name.function.js, variable.function", + "foreground": "var(blue)" }, { - "name": "[Python] Function Parameters", - "scope": "source.python meta.item-access.arguments.python meta.qualified-name.python meta.generic-name.python, source.python meta.item-access.arguments.python meta.qualified-name.python support.type.python, source.python meta.function.parameters.annotation.python meta.item-access.arguments.python meta.qualified-name.python support.type.python", - "foreground": "var(green)" + "name": "[JavaScript] Language Library", + "scope": "variable.language", + "foreground": "var(red)", + "font_style": "italic" }, { - "name": "[Python] Generic Name", - "scope": "source.python meta.function.parameters.annotation.python meta.item-access.arguments.python meta.item-access.python meta.qualified-name.python meta.generic-name.python", - "foreground": "var(blue)" + "name": "[JavaScript] Library", + "scope": "support.function, support.macro", + "foreground": "var(blue)", + "font_style": "italic" }, { - "name": "[Python] Exception", - "scope": "source.python meta.statement.raise.python meta.function-call.python meta.qualified-name.python variable.function.python support.type.exception.python", - "foreground": "var(red)" + "name": "[JavaScript] Support", + "scope": "support.type, support.class", + "foreground": "var(yellow)" }, { - "name": "[Python] Function Parameters", - "scope": "source.python meta.item-access.python meta.qualified-name.python meta.generic-name.python, source.python meta.function.parameters.annotation.python meta.item-access.python meta.qualified-name.python meta.generic-name.python", - "foreground": "var(yellow)" + "name": "[JavaScript] Null", + "scope": "constant.language.null.js", + "foreground": "var(orange)" }, { - "name": "[SQL] Source", - "scope": "source.sql", - "foreground": "var(foreground)" + "name": "[JavaScript] Undefined", + "scope": "constant.language.undefined.js", + "foreground": "var(orange)" }, { - "name": "[SQL] — Other keywords", - "scope": "keyword.other.DML.sql", - "foreground": "var(blue)" + "name": "[JavaScript] Boolean", + "scope": "source.js meta.export.js meta.binding.name.js variable.other.constant.js, constant.language.boolean.false.js, constant.language.boolean.true.js, source.js meta.export.js meta.class.js meta.block.js meta.function.js meta.block.js variable.other.constant.js", + "foreground": "var(orange)" }, { - "name": "[SQL] — Function", - "scope": "support.function.aggregate.sql", + "name": "[JavaScript] Object", + "scope": "source.js meta.class.js meta.block.js meta.function.js meta.block.js meta.function-call.constructor.js meta.group.js meta.object-literal.js variable.other.readwrite.js", "foreground": "var(pink)" }, { @@ -439,6 +415,67 @@ "scope": "embedding.php text.html.basic meta.embedded.block.php source.php meta.class.php meta.block.php meta.function.php meta.block.php constant.language.php", "foreground": "var(orange)" }, + { + "name": "[INI] - Color for Entity", + "scope": "source.ini entity, meta.embedded.block.ini, source.ini", + "foreground": "var(red)" + }, + { + "name": "[INI] - Color for Keyword", + "scope": "source.ini keyword, keyword.other.definition.ini", + "foreground": "var(purple)" + }, + { + "name": "[INI] - Color for Value", + "scope": "source.ini meta.declaration.ini meta.value.ini string.name.value.ini", + "foreground": "var(green)" + }, + { + "name": "[Python] Variables", + "scope": "source.python meta.function.parameters.python variable.parameter.python, source.python meta.function-call.arguments.python meta.qualified-name.python meta.generic-name.python, source.python meta.function-call.arguments.python variable.parameter.python", + "foreground": "var(orange)" + }, + { + "name": "[Python] Function Arguments", + "scope": "source.python meta.function-call.arguments.python meta.qualified-name.python meta.generic-name.python", + "foreground": "var(foreground)" + }, + { + "name": "[Python] Statement While", + "scope": "source.python meta.statement.while.python constant.language.python, source.python constant.language.python", + "foreground": "var(pink)" + }, + { + "name": "[Python] Annotation", + "scope": "source.python meta.function.parameters.annotation.python meta.qualified-name.python support.type.python", + "foreground": "var(yellow)" + }, + { + "name": "[Python] Print", + "scope": "source.python keyword.other.print.python, source.python meta.function-call.python meta.qualified-name.python variable.function.python support.function.builtin.python", + "font_style": "normal", + "foreground": "var(pink)" + }, + { + "name": "[Python] Function Parameters", + "scope": "source.python meta.item-access.arguments.python meta.qualified-name.python meta.generic-name.python, source.python meta.item-access.arguments.python meta.qualified-name.python support.type.python, source.python meta.function.parameters.annotation.python meta.item-access.arguments.python meta.qualified-name.python support.type.python", + "foreground": "var(green)" + }, + { + "name": "[Python] Generic Name", + "scope": "source.python meta.function.parameters.annotation.python meta.item-access.arguments.python meta.item-access.python meta.qualified-name.python meta.generic-name.python", + "foreground": "var(blue)" + }, + { + "name": "[Python] Exception", + "scope": "source.python meta.statement.raise.python meta.function-call.python meta.qualified-name.python variable.function.python support.type.exception.python", + "foreground": "var(red)" + }, + { + "name": "[Python] Function Parameters", + "scope": "source.python meta.item-access.python meta.qualified-name.python meta.generic-name.python, source.python meta.function.parameters.annotation.python meta.item-access.python meta.qualified-name.python meta.generic-name.python", + "foreground": "var(yellow)" + }, { "name": "[Markdown] Deleted", "scope": "markup.deleted", @@ -521,70 +558,23 @@ { "name": "[Markdown] - Color for Punctuation — Heading, `Code` and fenced ```code blocks```, **Bold**, _Italic_", "scope": "punctuation.definition.raw.begin.markdown, punctuation.definition.raw.end.markdown, punctuation.definition.raw.code-fence.begin.markdown, punctuation.definition.raw.code-fence.end.markdown, punctuation.definition.heading.begin.markdown, punctuation.definition.bold.begin.markdown, punctuation.definition.bold.end.markdown, punctuation.definition.italic.begin.markdown, punctuation.definition.italic.end.markdown", - "foreground": "color(var(background) blend(var(foreground) 80%))" + "foreground": "color(var(background) blend(var(foreground) 85%))" }, { - "name": "[JavaScript] Constructor", - "scope": "source.js meta.class.js meta.block.js meta.function.declaration.js storage.type.accessor.js, meta.function-call.constructor.js, entity.name.function.constructor.js, variable.language.constructor.js", - "foreground": "var(purple)" - }, - { - "name": "[JavaScript] Object Key", - "scope": "meta.object-literal.key.js", - "foreground": "var(blue)" + "name": "[SQL] Source", + "scope": "source.sql", + "foreground": "var(foreground)" }, { - "name": "[JavaScript] Function", - "scope": "variable.function, variable.annotation, entity.name.function, meta.class-method.js entity.name.function.js, variable.function", + "name": "[SQL] — Other keywords", + "scope": "keyword.other.DML.sql", "foreground": "var(blue)" }, { - "name": "[JavaScript] Language Library", - "scope": "variable.language", - "foreground": "var(red)", - "font_style": "italic" - }, - { - "name": "[JavaScript] Library", - "scope": "support.function, support.macro", - "foreground": "var(blue)", - "font_style": "italic" - }, - { - "name": "[JavaScript] Support", - "scope": "support.type, support.class", - "foreground": "var(yellow)" - }, - { - "name": "[JavaScript] Null", - "scope": "constant.language.null.js", - "foreground": "var(orange)" - }, - { - "name": "[JavaScript] Undefined", - "scope": "constant.language.undefined.js", - "foreground": "var(orange)" - }, - { - "name": "[JavaScript] Boolean", - "scope": "source.js meta.export.js meta.binding.name.js variable.other.constant.js, constant.language.boolean.false.js, constant.language.boolean.true.js, source.js meta.export.js meta.class.js meta.block.js meta.function.js meta.block.js variable.other.constant.js", - "foreground": "var(orange)" - }, - { - "name": "[JavaScript] Object", - "scope": "source.js meta.class.js meta.block.js meta.function.js meta.block.js meta.function-call.constructor.js meta.group.js meta.object-literal.js variable.other.readwrite.js", + "name": "[SQL] — Function", + "scope": "support.function.aggregate.sql", "foreground": "var(pink)" }, - { - "name": "[SublimeLinter] Error", - "scope": "sublimelinter.mark.error", - "foreground": "var(invalid)" - }, - { - "name": "[SublimeLinter] Gutter mark", - "scope": "sublimelinter.gutter-mark", - "foreground": "var(blue)" - }, { "name": "[JavaScript] Constructor", "scope": "source.ts meta.export.default.ts meta.class.ts meta.method.declaration.ts storage.type.ts, meta.function-call.constructor.ts, entity.name.function.constructor.ts, variable.language.constructor.ts", @@ -645,6 +635,16 @@ "scope": "source.tsx meta.export.default.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.function-call.tsx variable.other.object.tsx, source.tsx meta.export.default.tsx meta.class.tsx meta.field.declaration.tsx meta.type.annotation.tsx entity.name.type.module.tsx", "foreground": "var(brown)" }, + { + "name": "[SublimeLinter] Error", + "scope": "sublimelinter.mark.error", + "foreground": "var(invalid)" + }, + { + "name": "[SublimeLinter] Gutter mark", + "scope": "sublimelinter.gutter-mark", + "foreground": "var(blue)" + }, { "name": "[Vue] Function Parameter", "scope": "text.html.vue source.js.embedded.html source.js meta.export.js meta.object-literal.js meta.object-literal.js meta.function.declaration.js meta.binding.name.js variable.parameter.function.js", diff --git a/src/schemes/dark.json b/src/schemes/dark.json index 1c6a2ce7..6dd22891 100644 --- a/src/schemes/dark.json +++ b/src/schemes/dark.json @@ -15,7 +15,7 @@ "purple" : "#c2afff", "red" : "#d95757", "yellow" : "#ffcb8b", - "invalid" : "#d46c6c3a", + "invalid" : "#d46c6c66", "diffAdded" : "#addb67", "diffModified" : "#e2b93d", "diffDeleted" : "#ef5350", diff --git a/src/schemes/files/rules/markdown-syntax.json b/src/schemes/files/rules/markdown-syntax.json index 947064bf..570e9f33 100644 --- a/src/schemes/files/rules/markdown-syntax.json +++ b/src/schemes/files/rules/markdown-syntax.json @@ -81,6 +81,6 @@ { "name": "[Markdown] - Color for Punctuation — Heading, `Code` and fenced ```code blocks```, **Bold**, _Italic_", "scope": "punctuation.definition.raw.begin.markdown, punctuation.definition.raw.end.markdown, punctuation.definition.raw.code-fence.begin.markdown, punctuation.definition.raw.code-fence.end.markdown, punctuation.definition.heading.begin.markdown, punctuation.definition.bold.begin.markdown, punctuation.definition.bold.end.markdown, punctuation.definition.italic.begin.markdown, punctuation.definition.italic.end.markdown", - "foreground": "color(var(background) blend(var(foreground) 80%))" + "foreground": "color(var(background) blend(var(foreground) 85%))" } ] diff --git a/src/schemes/light.json b/src/schemes/light.json index 4320c742..7b74c97a 100644 --- a/src/schemes/light.json +++ b/src/schemes/light.json @@ -2,7 +2,7 @@ "name": "Meetio-Light", "author": "Mauro Reis Vieira ", "variables": { - "cursor" : "#7e57c2", + "cursor" : "#7e57c2", "foreground" : "#455A64", "background" : "#fbfbfb", "comments" : "#90a4ae", @@ -15,7 +15,7 @@ "purple" : "#7c4dff", "red" : "#e53935", "yellow" : "#f3ad2c", - "invalid" : "#d3423e3a", + "invalid" : "#d3423e66", "diffAdded" : "#9ccc65", "diffModified" : "#e2b93d", "diffDeleted" : "#ef5350",