From f352dc19777ef821969260652cae4e83a95d0ceb Mon Sep 17 00:00:00 2001 From: Ike Ku Date: Sat, 16 Sep 2017 13:00:11 +0300 Subject: [PATCH 01/12] Before color update --- ayu-dark.tmTheme | 324 ++++++++++++++++------ ayu-light.tmTheme | 364 ++++++++++++++++++------- ayu-mirage.tmTheme | 324 ++++++++++++++++------ src/templates/old.yaml | 413 +++++++++++++++++++++++++++++ src/templates/sublime.syntax.xml | 330 +++++++++++++++++------ src/templates/sublime.syntax.yml | 230 ++++++++++------ src/themes/dark.yml | 4 +- src/themes/light.yml | 12 +- src/themes/mirage.yml | 4 +- widgets/Widget - ayu-light.stTheme | 4 +- 10 files changed, 1567 insertions(+), 442 deletions(-) create mode 100644 src/templates/old.yaml diff --git a/ayu-dark.tmTheme b/ayu-dark.tmTheme index 6751bfea..174b62a3 100644 --- a/ayu-dark.tmTheme +++ b/ayu-dark.tmTheme @@ -67,7 +67,7 @@ a { name - Comments + Comment scope comment, punctuation.definition.comment settings @@ -80,278 +80,438 @@ a { name - Separators, Comma and alike + String scope - punctuation.separator, punctuation.terminator + string settings foreground - #E6E1CFdd + #C2D94C name - Variable + Punctuation scope - variable + punctuation.definition settings foreground - #E6E1CF + #5fb3b3 name - Keyword, Storage + Number scope - keyword, storage.type, storage.modifier + constant.numeric settings foreground - #FF7733 + #FFEE99 name - Operator, Misc + Regular Expressions and Escape Characters scope - constant.other.color, meta.tag, punctuation.separator.inheritance.php, punctuation.section.embedded, keyword.other.substitution + string.regexp, constant.character.escape settings foreground - #E7C547 + #95E6CB name - Tag + Built-in constant scope - entity.name.tag, meta.tag.sgml + constant.language settings + fontStyle + italic foreground - #50B4E6 + #FFEE99 name - Function, Special Method, Block Level + User-defined constant scope - entity.name.function, meta.function-call, variable.function, support.function, keyword.other.special-method, meta.block-level + constant.character, constant.other settings foreground - #FFB454 + #FFEE99 name - Other Variable, String Link + Member Variable scope - support.other.variable, string.other.link + variable.member settings foreground - #F07178 + #ec5f67 name - Number, Constant, Function Argument, Tag Attribute, Embedded + Keyword scope - constant.numeric, constant.language, support.constant, constant.character, variable.parameter, keyword.other.unit + keyword - keyword.operator, keyword.operator.word settings foreground - #FFEE99 + #FF7733 name - String, Symbols, Inherited Class + Operators scope - string, keyword.other.template, constant.other.symbol, constant.other.key, entity.other.inherited-class, meta.group.braces.curly constant.other.object.key.js string.unquoted.label.js + keyword.operator settings - fontStyle - normal foreground - #C2D94C + #E7C547 name - Class, Support + Punctuation scope - entity.name.class, entity.name.type.class, support.type, support.class, support.orther.namespace.use.php, meta.use.php, support.other.namespace.php + punctuation.separator, punctuation.terminator settings foreground - #50B4E6 + #A7ADBA name - Sub-methods + Punctuation scope - entity.name.module.js, variable.import.parameter.js, variable.other.class.js + punctuation.section settings foreground - #50B4E6 + #ffffff name - Language methods + Accessor scope - variable.language + punctuation.accessor + settings + + foreground + #A7ADBA + + + + name + Annotation Punctuation + scope + punctuation.definition.annotation + settings + + foreground + #5fb3b3 + + + + name + JavaScript Dollar + scope + variable.other.dollar.only.js, variable.other.object.dollar.only.js, variable.type.dollar.only.js, support.class.dollar.only.js + settings + + foreground + #E6B673 + + + + name + Storage + scope + storage + settings + + foreground + #FF7733 + + + + name + Storage type + scope + storage.type settings fontStyle italic foreground - #50B4E6 + #FF7733 name - Invalid + Entity name scope - invalid + entity.name.function settings foreground - #FF3333 + #FFB454 name - Deprecated + Entity name scope - invalid.deprecated + entity.name - (entity.name.section | entity.name.tag | entity.name.label) settings - background - #FF7733 foreground - #FFFFFF + #f9ae58 name - Html punctuations tags + Inherited class scope - punctuation.definition.tag.end, punctuation.definition.tag.begin, punctuation.definition.tag + entity.other.inherited-class settings + fontStyle + italic underline foreground - #50B4E690 + #5fb3b3 name - Attributes + Function argument scope - entity.other.attribute-name + variable.parameter settings + fontStyle + foreground - #FF7733 + #f9ae58 name - Regular Expressions and Escape Characters + Language variable scope - string.regexp, constant.character.escape + variable.language settings + fontStyle + italic foreground - #95E6CB + #ec5f67 name - URL + Tag scope - *url*, *link*, *uri* + entity.name.tag, meta.tag.sgml settings fontStyle - underline + + foreground + #50B4E6 name - Search Results Nums + Tag attribute scope - constant.numeric.line-number.find-in-files - match + entity.other.attribute-name settings foreground - #5C6773 + #c594c5 name - Search Results Lines + Function call scope - entity.name.filename.find-in-files + variable.function, variable.annotation settings + fontStyle + foreground - #C2D94C + #6699cc name - Decorators + Library function scope - tag.decorator.js entity.name.tag.js, tag.decorator.js punctuation.definition.tag.js + support.function, support.macro settings fontStyle italic foreground - #E6B673 + #F07178 name - ES7 Bind Operator + Library constant scope - source.js constant.other.object.key.js string.unquoted.label.js + support.constant settings fontStyle italic foreground - #50B4E6 + #c594c5 name - entity.name.method.js + Library class/type scope - entity.name.method.js + support.type, support.class settings fontStyle italic foreground - #E6B673 + #6699cc name - meta.method.js + Invalid scope - meta.class-method.js entity.name.function.js, variable.function.constructor + invalid settings foreground - #E6B673 + #FF3333 + + + + name + Invalid deprecated + scope + invalid.deprecated + settings + + background + #FF7733 + foreground + #FFFFFF + + + + name + YAML Key + scope + entity.name.tag.yaml + settings + + foreground + #5fb3b3 + + + + name + YAML String + scope + source.yaml string.unquoted + settings + + foreground + #D8DEE9 + + + + name + diff.header + scope + meta.diff, meta.diff.header + settings + + foreground + #c594c5 + + + + name + diff.deleted + scope + markup.deleted + settings + + foreground + #FF3333 + + + + name + diff.inserted + scope + markup.inserted + settings + + foreground + #99c794 + + + + name + diff.changed + scope + markup.changed + settings + + foreground + #f9ae58 + + + + name + CSS Properties + scope + support.type.property-name + settings + + foreground + #D8DEE9 + + + + scope + constant.numeric.line-number.match + settings + + foreground + #ec5f67 + + + + scope + message.error + settings + + foreground + #ec5f67 @@ -621,7 +781,7 @@ a { settings foreground - #FF7733 + #FF3333 @@ -643,7 +803,7 @@ a { settings background - #3cadd71a + #E6E1CF10 foreground #50B4E6 @@ -678,7 +838,7 @@ a { settings background - #ffffff10 + #E6E1CF10 foreground #E6E1CF @@ -691,7 +851,7 @@ a { settings background - #ffffff10 + #E6E1CF10 foreground #5C6773 @@ -737,7 +897,7 @@ a { settings foreground - #FF7733 + #FF3333 diff --git a/ayu-light.tmTheme b/ayu-light.tmTheme index cb1fbf26..3b102685 100644 --- a/ayu-light.tmTheme +++ b/ayu-light.tmTheme @@ -52,7 +52,7 @@ body { padding: 1px 3px; } a { - color: rgba(65, 166, 217, .7); + color: rgba(54, 163, 217, .7); } selection @@ -67,7 +67,7 @@ a { name - Comments + Comment scope comment, punctuation.definition.comment settings @@ -80,278 +80,438 @@ a { name - Separators, Comma and alike + String scope - punctuation.separator, punctuation.terminator + string settings foreground - #5C6066dd + #86B300 name - Variable + Punctuation scope - variable + punctuation.definition settings foreground - #5C6066 + #5fb3b3 name - Keyword, Storage + Number scope - keyword, storage.type, storage.modifier + constant.numeric settings foreground - #F2590C + #A37ACC name - Operator, Misc + Regular Expressions and Escape Characters scope - constant.other.color, meta.tag, punctuation.separator.inheritance.php, punctuation.section.embedded, keyword.other.substitution + string.regexp, constant.character.escape settings foreground - #E7C547 + #4CBF99 name - Tag + Built-in constant scope - entity.name.tag, meta.tag.sgml + constant.language settings + fontStyle + italic foreground - #41A6D9 + #A37ACC name - Function, Special Method, Block Level + User-defined constant scope - entity.name.function, meta.function-call, variable.function, support.function, keyword.other.special-method, meta.block-level + constant.character, constant.other settings foreground - #F29718 + #A37ACC name - Other Variable, String Link + Member Variable scope - support.other.variable, string.other.link + variable.member settings foreground - #F07178 + #ec5f67 name - Number, Constant, Function Argument, Tag Attribute, Embedded + Keyword scope - constant.numeric, constant.language, support.constant, constant.character, variable.parameter, keyword.other.unit + keyword - keyword.operator, keyword.operator.word settings foreground - #A37ACC + #FA6E32 name - String, Symbols, Inherited Class + Operators scope - string, keyword.other.template, constant.other.symbol, constant.other.key, entity.other.inherited-class, meta.group.braces.curly constant.other.object.key.js string.unquoted.label.js + keyword.operator settings - fontStyle - normal foreground - #86B300 + #E7C547 + + + + name + Punctuation + scope + punctuation.separator, punctuation.terminator + settings + + foreground + #A7ADBA name - Class, Support + Punctuation scope - entity.name.class, entity.name.type.class, support.type, support.class, support.orther.namespace.use.php, meta.use.php, support.other.namespace.php + punctuation.section settings foreground - #41A6D9 + #ffffff name - Sub-methods + Accessor scope - entity.name.module.js, variable.import.parameter.js, variable.other.class.js + punctuation.accessor settings foreground - #41A6D9 + #A7ADBA name - Language methods + Annotation Punctuation scope - variable.language + punctuation.definition.annotation + settings + + foreground + #5fb3b3 + + + + name + JavaScript Dollar + scope + variable.other.dollar.only.js, variable.other.object.dollar.only.js, variable.type.dollar.only.js, support.class.dollar.only.js + settings + + foreground + #E6B673 + + + + name + Storage + scope + storage + settings + + foreground + #FA6E32 + + + + name + Storage type + scope + storage.type settings fontStyle italic foreground - #41A6D9 + #FA6E32 name - Invalid + Entity name scope - invalid + entity.name.function settings foreground - #FF3333 + #F29718 name - Deprecated + Entity name scope - invalid.deprecated + entity.name - (entity.name.section | entity.name.tag | entity.name.label) settings - background - #F2590C foreground - #FFFFFF + #f9ae58 name - Html punctuations tags + Inherited class scope - punctuation.definition.tag.end, punctuation.definition.tag.begin, punctuation.definition.tag + entity.other.inherited-class settings + fontStyle + italic underline foreground - #41A6D990 + #5fb3b3 name - Attributes + Function argument scope - entity.other.attribute-name + variable.parameter settings + fontStyle + foreground - #F2590C + #f9ae58 name - Regular Expressions and Escape Characters + Language variable scope - string.regexp, constant.character.escape + variable.language settings + fontStyle + italic foreground - #4DBF99 + #ec5f67 name - URL + Tag scope - *url*, *link*, *uri* + entity.name.tag, meta.tag.sgml settings fontStyle - underline + + foreground + #36A3D9 name - Search Results Nums + Tag attribute scope - constant.numeric.line-number.find-in-files - match + entity.other.attribute-name settings foreground - #ABB0B6 + #c594c5 name - Search Results Lines + Function call scope - entity.name.filename.find-in-files + variable.function, variable.annotation settings + fontStyle + foreground - #86B300 + #6699cc name - Decorators + Library function scope - tag.decorator.js entity.name.tag.js, tag.decorator.js punctuation.definition.tag.js + support.function, support.macro settings fontStyle italic foreground - #CCA37A + #F07178 name - ES7 Bind Operator + Library constant scope - source.js constant.other.object.key.js string.unquoted.label.js + support.constant settings fontStyle italic foreground - #41A6D9 + #c594c5 name - entity.name.method.js + Library class/type scope - entity.name.method.js + support.type, support.class settings fontStyle italic foreground - #CCA37A + #6699cc name - meta.method.js + Invalid scope - meta.class-method.js entity.name.function.js, variable.function.constructor + invalid settings foreground - #CCA37A + #F51818 + + + + name + Invalid deprecated + scope + invalid.deprecated + settings + + background + #FA6E32 + foreground + #FFFFFF + + + + name + YAML Key + scope + entity.name.tag.yaml + settings + + foreground + #5fb3b3 + + + + name + YAML String + scope + source.yaml string.unquoted + settings + + foreground + #D8DEE9 + + + + name + diff.header + scope + meta.diff, meta.diff.header + settings + + foreground + #c594c5 + + + + name + diff.deleted + scope + markup.deleted + settings + + foreground + #F51818 + + + + name + diff.inserted + scope + markup.inserted + settings + + foreground + #99c794 + + + + name + diff.changed + scope + markup.changed + settings + + foreground + #f9ae58 + + + + name + CSS Properties + scope + support.type.property-name + settings + + foreground + #D8DEE9 + + + + scope + constant.numeric.line-number.match + settings + + foreground + #ec5f67 + + + + scope + message.error + settings + + foreground + #ec5f67 @@ -362,7 +522,7 @@ a { settings foreground - #41A6D9 + #36A3D9 @@ -373,7 +533,7 @@ a { settings foreground - #41A6D9 + #36A3D9 @@ -384,7 +544,7 @@ a { settings foreground - #41A6D9 + #36A3D9 @@ -395,7 +555,7 @@ a { settings foreground - #41A6D9 + #36A3D9 @@ -406,7 +566,7 @@ a { settings foreground - #41A6D9 + #36A3D9 @@ -417,7 +577,7 @@ a { settings foreground - #41A6D9 + #36A3D9 @@ -428,7 +588,7 @@ a { settings foreground - #41A6D9 + #36A3D9 @@ -439,7 +599,7 @@ a { settings foreground - #41A6D9 + #36A3D9 @@ -450,7 +610,7 @@ a { settings foreground - #41A6D9 + #36A3D9 @@ -472,7 +632,7 @@ a { settings foreground - #F2590C + #FA6E32 @@ -599,7 +759,7 @@ a { settings foreground - #4DBF99 + #4CBF99 @@ -621,7 +781,7 @@ a { settings foreground - #F2590C + #F51818 @@ -632,7 +792,7 @@ a { settings foreground - #CCA37A + #E6B673 @@ -643,9 +803,9 @@ a { settings background - #3cadd71a + #5C606610 foreground - #41A6D9 + #36A3D9 @@ -656,7 +816,7 @@ a { settings foreground - #41A6D9 + #36A3D9 @@ -678,7 +838,7 @@ a { settings background - #ffffff10 + #5C606610 foreground #5C6066 @@ -691,7 +851,7 @@ a { settings background - #ffffff10 + #5C606610 foreground #ABB0B6 @@ -726,7 +886,7 @@ a { settings foreground - #41A6D9 + #36A3D9 @@ -737,7 +897,7 @@ a { settings foreground - #F2590C + #F51818 @@ -781,7 +941,7 @@ a { settings background - #41A6D9 + #36A3D9 foreground #FFFFFF @@ -807,7 +967,7 @@ a { settings background - #F2590C + #FA6E32 foreground #FFFFFF @@ -833,7 +993,7 @@ a { settings foreground - #41A6D9 + #36A3D9 @@ -855,7 +1015,7 @@ a { settings foreground - #FF3333 + #F51818 diff --git a/ayu-mirage.tmTheme b/ayu-mirage.tmTheme index 6ac035f6..cf810dd4 100644 --- a/ayu-mirage.tmTheme +++ b/ayu-mirage.tmTheme @@ -67,7 +67,7 @@ a { name - Comments + Comment scope comment, punctuation.definition.comment settings @@ -80,278 +80,438 @@ a { name - Separators, Comma and alike + String scope - punctuation.separator, punctuation.terminator + string settings foreground - #D9D7CEdd + #BAE67E name - Variable + Punctuation scope - variable + punctuation.definition settings foreground - #D9D7CE + #5fb3b3 name - Keyword, Storage + Number scope - keyword, storage.type, storage.modifier + constant.numeric settings foreground - #FFAE57 + #D4BFFF name - Operator, Misc + Regular Expressions and Escape Characters scope - constant.other.color, meta.tag, punctuation.separator.inheritance.php, punctuation.section.embedded, keyword.other.substitution + string.regexp, constant.character.escape settings foreground - #80D4FF + #95E6CB name - Tag + Built-in constant scope - entity.name.tag, meta.tag.sgml + constant.language settings + fontStyle + italic foreground - #5CCFE6 + #D4BFFF name - Function, Special Method, Block Level + User-defined constant scope - entity.name.function, meta.function-call, variable.function, support.function, keyword.other.special-method, meta.block-level + constant.character, constant.other settings foreground - #FFD580 + #D4BFFF name - Other Variable, String Link + Member Variable scope - support.other.variable, string.other.link + variable.member settings foreground - #F07178 + #ec5f67 name - Number, Constant, Function Argument, Tag Attribute, Embedded + Keyword scope - constant.numeric, constant.language, support.constant, constant.character, variable.parameter, keyword.other.unit + keyword - keyword.operator, keyword.operator.word settings foreground - #D4BFFF + #FFAE57 name - String, Symbols, Inherited Class + Operators scope - string, keyword.other.template, constant.other.symbol, constant.other.key, entity.other.inherited-class, meta.group.braces.curly constant.other.object.key.js string.unquoted.label.js + keyword.operator settings - fontStyle - normal foreground - #BAE67E + #80D4FF name - Class, Support + Punctuation scope - entity.name.class, entity.name.type.class, support.type, support.class, support.orther.namespace.use.php, meta.use.php, support.other.namespace.php + punctuation.separator, punctuation.terminator settings foreground - #5CCFE6 + #A7ADBA name - Sub-methods + Punctuation scope - entity.name.module.js, variable.import.parameter.js, variable.other.class.js + punctuation.section settings foreground - #5CCFE6 + #ffffff name - Language methods + Accessor scope - variable.language + punctuation.accessor + settings + + foreground + #A7ADBA + + + + name + Annotation Punctuation + scope + punctuation.definition.annotation + settings + + foreground + #5fb3b3 + + + + name + JavaScript Dollar + scope + variable.other.dollar.only.js, variable.other.object.dollar.only.js, variable.type.dollar.only.js, support.class.dollar.only.js + settings + + foreground + #FFC44C + + + + name + Storage + scope + storage + settings + + foreground + #FFAE57 + + + + name + Storage type + scope + storage.type settings fontStyle italic foreground - #5CCFE6 + #FFAE57 name - Invalid + Entity name scope - invalid + entity.name.function settings foreground - #FF3333 + #FFD580 name - Deprecated + Entity name scope - invalid.deprecated + entity.name - (entity.name.section | entity.name.tag | entity.name.label) settings - background - #FFAE57 foreground - #FFFFFF + #f9ae58 name - Html punctuations tags + Inherited class scope - punctuation.definition.tag.end, punctuation.definition.tag.begin, punctuation.definition.tag + entity.other.inherited-class settings + fontStyle + italic underline foreground - #5CCFE690 + #5fb3b3 name - Attributes + Function argument scope - entity.other.attribute-name + variable.parameter settings + fontStyle + foreground - #FFAE57 + #f9ae58 name - Regular Expressions and Escape Characters + Language variable scope - string.regexp, constant.character.escape + variable.language settings + fontStyle + italic foreground - #95E6CB + #ec5f67 name - URL + Tag scope - *url*, *link*, *uri* + entity.name.tag, meta.tag.sgml settings fontStyle - underline + + foreground + #5CCFE6 name - Search Results Nums + Tag attribute scope - constant.numeric.line-number.find-in-files - match + entity.other.attribute-name settings foreground - #5C6773 + #c594c5 name - Search Results Lines + Function call scope - entity.name.filename.find-in-files + variable.function, variable.annotation settings + fontStyle + foreground - #BAE67E + #6699cc name - Decorators + Library function scope - tag.decorator.js entity.name.tag.js, tag.decorator.js punctuation.definition.tag.js + support.function, support.macro settings fontStyle italic foreground - #FFC44C + #F07178 name - ES7 Bind Operator + Library constant scope - source.js constant.other.object.key.js string.unquoted.label.js + support.constant settings fontStyle italic foreground - #5CCFE6 + #c594c5 name - entity.name.method.js + Library class/type scope - entity.name.method.js + support.type, support.class settings fontStyle italic foreground - #FFC44C + #6699cc name - meta.method.js + Invalid scope - meta.class-method.js entity.name.function.js, variable.function.constructor + invalid settings foreground - #FFC44C + #FF3333 + + + + name + Invalid deprecated + scope + invalid.deprecated + settings + + background + #FFAE57 + foreground + #FFFFFF + + + + name + YAML Key + scope + entity.name.tag.yaml + settings + + foreground + #5fb3b3 + + + + name + YAML String + scope + source.yaml string.unquoted + settings + + foreground + #D8DEE9 + + + + name + diff.header + scope + meta.diff, meta.diff.header + settings + + foreground + #c594c5 + + + + name + diff.deleted + scope + markup.deleted + settings + + foreground + #FF3333 + + + + name + diff.inserted + scope + markup.inserted + settings + + foreground + #99c794 + + + + name + diff.changed + scope + markup.changed + settings + + foreground + #f9ae58 + + + + name + CSS Properties + scope + support.type.property-name + settings + + foreground + #D8DEE9 + + + + scope + constant.numeric.line-number.match + settings + + foreground + #ec5f67 + + + + scope + message.error + settings + + foreground + #ec5f67 @@ -621,7 +781,7 @@ a { settings foreground - #FFAE57 + #FF3333 @@ -643,7 +803,7 @@ a { settings background - #3cadd71a + #D9D7CE10 foreground #5CCFE6 @@ -678,7 +838,7 @@ a { settings background - #ffffff10 + #D9D7CE10 foreground #D9D7CE @@ -691,7 +851,7 @@ a { settings background - #ffffff10 + #D9D7CE10 foreground #5C6773 @@ -737,7 +897,7 @@ a { settings foreground - #FFAE57 + #FF3333 diff --git a/src/templates/old.yaml b/src/templates/old.yaml new file mode 100644 index 00000000..530b0558 --- /dev/null +++ b/src/templates/old.yaml @@ -0,0 +1,413 @@ +# [PackageDev] target_format: plist, ext: xml +# prefix="" +# sublime="" +# ext="yml" +--- + +name: ayu +author: Ike Ku +uuid: 0e709986-46a0-40a0-b3bf-c8dfe525c455 +colorSpaceName: sRGB +semanticClass: ayu."{theme}" + +settings: + +- settings: + activeGuide: '#"{syntax.active_guide.hex}"' + background: &bg '#"{common.bg.hex}"' + inactiveBackground: *bg + caret: &accent '#"{common.accent.hex}"' + findHighlight: &constant '#"{syntax.constant.hex}"' + findHighlightForeground: *bg + foreground: &fg '#"{common.fg.hex}"' + guide: &gutter '#"{syntax.gutter.hex}"' + accent: *accent + gutter: *bg + gutterForeground: *gutter + invisibles: '#FF0000' + lineHighlight: '#"{syntax.line_hg.hex}"' + selection: &selection '#"{syntax.selection.hex}"' + selectionBorder: *selection + inactiveSelection: '#"{syntax.selection.hex}"88' + shadow: '#00000010' + stackGuide: '#"{syntax.stack_guide.hex}"' + popupCss: | + html, body { + background-color: #"{ui.panel.bg.hex}"; + color: #"{common.fg.hex}"; + } + body { + padding: 1px 3px; + } + a { + color: rgba("{syntax.tag.rgb}", .7); + } + +- name: Comments + scope: comment, punctuation.definition.comment + settings: + fontStyle: italic + foreground: &comment '#"{syntax.comment.hex}"' + +# Punctuation +- name: Separators, Comma and alike + scope: punctuation.separator, punctuation.terminator + settings: + foreground: '#"{common.fg.hex}"dd' + +- name: Variable + scope: variable + settings: + foreground: *fg + +- name: Keyword, Storage + scope: keyword, storage.type, storage.modifier + settings: + foreground: &keyword '#"{syntax.keyword.hex}"' + +- name: Operator, Misc + scope: constant.other.color, meta.tag, punctuation.separator.inheritance.php, punctuation.section.embedded, keyword.other.substitution + settings: + foreground: &operator '#"{syntax.operator.hex}"' + +- name: Tag + scope: entity.name.tag, meta.tag.sgml + settings: + foreground: &tag '#"{syntax.tag.hex}"' + +- name: Function, Special Method, Block Level + scope: entity.name.function, meta.function-call, variable.function, support.function, keyword.other.special-method, meta.block-level + settings: + foreground: &function '#"{syntax.func.hex}"' + +- name: Other Variable, String Link + scope: support.other.variable, string.other.link + settings: + foreground: &markup '#"{syntax.markup.hex}"' + +- name: Number, Constant, Function Argument, Tag Attribute, Embedded + scope: constant.numeric, constant.language, support.constant, constant.character, variable.parameter, keyword.other.unit + settings: + foreground: *constant + +- name: String, Symbols, Inherited Class + scope: string, keyword.other.template, constant.other.symbol, constant.other.key, entity.other.inherited-class, meta.group.braces.curly constant.other.object.key.js string.unquoted.label.js + settings: + fontStyle: normal + foreground: &string '#"{syntax.string.hex}"' + +- name: Class, Support + scope: entity.name.class, entity.name.type.class, support.type, support.class, support.orther.namespace.use.php, meta.use.php, support.other.namespace.php + settings: + foreground: *tag + +- name: Sub-methods + scope: entity.name.module.js, variable.import.parameter.js, variable.other.class.js + settings: + foreground: *tag + +- name: Language methods + scope: variable.language + settings: + fontStyle: italic + foreground: *tag + +- name: Invalid + scope: invalid + settings: + foreground: &error '#"{syntax.error.hex}"' + +- name: Deprecated + scope: invalid.deprecated + settings: + background: *keyword + foreground: &white '#FFFFFF' + +- name: Html punctuations tags + scope: punctuation.definition.tag.end, punctuation.definition.tag.begin, punctuation.definition.tag + settings: + foreground: '#"{syntax.tag.hex}"90' # opacity of tag verson of &tag_punctag + +- name: Attributes + scope: entity.other.attribute-name + settings: + foreground: *keyword + +- name: Regular Expressions and Escape Characters + scope: string.regexp, constant.character.escape + settings: + foreground: ®exp '#"{syntax.regexp.hex}"' + +- name: URL + scope: '*url*, *link*, *uri*' + settings: + fontStyle: underline + +- name: Search Results Nums + scope: constant.numeric.line-number.find-in-files - match + settings: + foreground: *comment + +- name: Search Results Lines + scope: entity.name.filename.find-in-files + settings: + foreground: *string + +# ES6 +- name: Decorators + scope: tag.decorator.js entity.name.tag.js, tag.decorator.js punctuation.definition.tag.js + settings: + fontStyle: italic + foreground: &special '#"{syntax.special.hex}"' + +- name: ES7 Bind Operator + scope: source.js constant.other.object.key.js string.unquoted.label.js + settings: + fontStyle: italic + foreground: *tag + +- name: entity.name.method.js + scope: entity.name.method.js + settings: + fontStyle: italic + foreground: *special + +- name: meta.method.js + scope: meta.class-method.js entity.name.function.js, variable.function.constructor + settings: + foreground: *special + +# JSON +- name: JSON Key - Level 8 + scope: source.json meta meta meta meta meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string + settings: + foreground: *tag + +- name: JSON Key - Level 7 + scope: source.json meta meta meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string + settings: + foreground: *tag + +- name: JSON Key - Level 6 + scope: source.json meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string + settings: + foreground: *tag + +- name: JSON Key - Level 5 + scope: source.json meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string + settings: + foreground: *tag + +- name: JSON Key - Level 4 + scope: source.json meta meta meta meta meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string + settings: + foreground: *tag + +- name: JSON Key - Level 3 + scope: source.json meta meta meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string + settings: + foreground: *tag + +- name: JSON Key - Level 2 + scope: source.json meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string + settings: + foreground: *tag + +- name: JSON Key - Level 1 + scope: source.json meta meta.structure.dictionary.json string.quoted.double.json - meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta.structure.dictionary.json punctuation.definition.string - meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string + settings: + foreground: *tag + +- name: JSON Key - Level 0 + scope: source.json meta.structure.dictionary.json string.quoted.double.json - meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta.structure.dictionary.json punctuation.definition.string - meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string + settings: + foreground: *tag + +# Markup and Markdown +- name: Markup Heading + scope: markup.heading + settings: + fontStyle: bold + +- name: Markup headings + scope: markup.heading punctuation.definition.heading + settings: + foreground: *keyword + +- name: Markup h1 + scope: markup.heading.1 punctuation.definition.heading + settings: + foreground: '#ec5f67' + +- name: Markup Links + scope: string.other.link, markup.underline.link + settings: + foreground: *operator + +- name: Markup Italic + scope: markup.italic + settings: + fontStyle: italic + +- name: Markup Bold + scope: markup.bold + settings: + fontStyle: bold + +- name: Markup Bold/italic + scope: markup.italic markup.bold | markup.bold markup.italic + settings: + fontStyle: bold italic + +- name: Markup punctuation + scope: (text punctuation.definition.italic | text punctuation.definition.bold) + settings: + foreground: *markup + +- name: Markup Code + scope: markup.raw + settings: + background: '#"{common.fg.hex}"07' + +- name: Markup Code Inline + scope: markup.raw.inline + settings: + background: '#"{common.fg.hex}"10' + +- name: Markdown Separator + scope: meta.separator + settings: + background: '#"{common.fg.hex}"10' + fontStyle: bold + foreground: *comment + +- name: Markup Blockquote + scope: markup.quote + settings: + foreground: *constant + fontStyle: italic + +- name: Markup List Bullet + scope: markup.list.numbered.bullet, markup.list punctuation.definition.list_item + settings: + foreground: *regexp + +- name: Markup Inserted + scope: markup.inserted + settings: + foreground: *string + +- name: Markup Deleted + scope: markup.deleted + settings: + foreground: *keyword + +- name: Markup - Strike + scope: markup.strike + settings: + foreground: *special + +- name: Markup - Table + scope: markup.table + settings: + background: '#3cadd71a' + foreground: *tag + +- name: Markdown - Markup Raw Inline + scope: text.html.markdown markup.raw.inline + settings: + foreground: *tag + +- name: Markdown - Line Break + scope: text.html.markdown meta.dummy.line-break + settings: + foreground: *comment + +- name: Markdown - Raw Block Fenced + scope: markup.raw.block.fenced.markdown + settings: + background: '#"{common.fg.hex}"10' + foreground: *fg + +- name: Markdown - Fenced Bode Block + scope: punctuation.definition.fenced.markdown, variable.language.fenced.markdown + settings: + background: '#"{common.fg.hex}"10' + foreground: *comment + +- name: Markdown - Fenced Language + scope: variable.language.fenced.markdown + settings: + foreground: *comment + +# GitGutter +- name: GitGutter Added + scope: markup.inserted.git_gutter + settings: + foreground: *string + +- name: GitGutter Changed + scope: markup.changed.git_gutter + settings: + foreground: *tag + +- name: GitGutter Deleted + scope: markup.deleted.git_gutter + settings: + foreground: *keyword + +- name: GitGutter Ignored + scope: markup.ignored.git_gutter + settings: + foreground: *comment + +- name: GitGutter Untracked + scope: markup.untracked.git_gutter + settings: + foreground: *comment + +- name: GutterColor + scope: gutter_color + settings: + foreground: *white + +# AceJump +- name: AceJump Label - Blue + scope: acejump.label.blue + settings: + background: *tag + foreground: *white + +- name: AceJump Label - Green + scope: acejump.label.green + settings: + background: *string + foreground: *white + +- name: AceJump Label - Orange + scope: acejump.label.orange + settings: + background: *keyword + foreground: *white + +- name: AceJump Label - Purple + scope: acejump.label.purple + settings: + background: *markup + foreground: *white + +# SublimeLinter +- name: SublimeLinter Warning + scope: sublimelinter.mark.warning + settings: + foreground: *tag + +- name: SublimeLinter Gutter Mark + scope: sublimelinter.gutter-mark + settings: + foreground: *white + +- name: SublimeLinter Error + scope: sublimelinter.mark.error + settings: + foreground: *error diff --git a/src/templates/sublime.syntax.xml b/src/templates/sublime.syntax.xml index 3b3a595c..50bcb53b 100644 --- a/src/templates/sublime.syntax.xml +++ b/src/templates/sublime.syntax.xml @@ -67,7 +67,7 @@ a { name - Comments + Comment scope comment, punctuation.definition.comment settings @@ -80,278 +80,438 @@ a { name - Separators, Comma and alike + String scope - punctuation.separator, punctuation.terminator + string settings foreground - #"{common.fg.hex}"dd + #"{syntax.string.hex}" name - Variable + Punctuation scope - variable + punctuation.definition settings foreground - #"{common.fg.hex}" + #5fb3b3 name - Keyword, Storage + Number scope - keyword, storage.type, storage.modifier + constant.numeric settings foreground - #"{syntax.keyword.hex}" + #"{syntax.constant.hex}" name - Operator, Misc + Regular Expressions and Escape Characters scope - constant.other.color, meta.tag, punctuation.separator.inheritance.php, punctuation.section.embedded, keyword.other.substitution + string.regexp, constant.character.escape settings foreground - #"{syntax.operator.hex}" + #"{syntax.regexp.hex}" name - Tag + Built-in constant scope - entity.name.tag, meta.tag.sgml + constant.language settings + fontStyle + italic foreground - #"{syntax.tag.hex}" + #"{syntax.constant.hex}" name - Function, Special Method, Block Level + User-defined constant scope - entity.name.function, meta.function-call, variable.function, support.function, keyword.other.special-method, meta.block-level + constant.character, constant.other settings foreground - #"{syntax.func.hex}" + #"{syntax.constant.hex}" name - Other Variable, String Link + Member Variable scope - support.other.variable, string.other.link + variable.member settings foreground - #"{syntax.sup_var.hex}" + #ec5f67 name - Number, Constant, Function Argument, Tag Attribute, Embedded + Keyword scope - constant.numeric, constant.language, support.constant, constant.character, variable.parameter, keyword.other.unit + keyword - keyword.operator, keyword.operator.word settings foreground - #"{syntax.constant.hex}" + #"{syntax.keyword.hex}" name - String, Symbols, Inherited Class + Operators scope - string, keyword.other.template, constant.other.symbol, constant.other.key, entity.other.inherited-class, meta.group.braces.curly constant.other.object.key.js string.unquoted.label.js + keyword.operator settings - fontStyle - normal foreground - #"{syntax.string.hex}" + #"{syntax.operator.hex}" name - Class, Support + Punctuation scope - entity.name.class, entity.name.type.class, support.type, support.class, support.orther.namespace.use.php, meta.use.php, support.other.namespace.php + punctuation.separator, punctuation.terminator settings foreground - #"{syntax.tag.hex}" + #A7ADBA name - Sub-methods + Punctuation scope - entity.name.module.js, variable.import.parameter.js, variable.other.class.js + punctuation.section settings foreground - #"{syntax.tag.hex}" + #ffffff name - Language methods + Accessor scope - variable.language + punctuation.accessor + settings + + foreground + #A7ADBA + + + + name + Annotation Punctuation + scope + punctuation.definition.annotation + settings + + foreground + #5fb3b3 + + + + name + JavaScript Dollar + scope + variable.other.dollar.only.js, variable.other.object.dollar.only.js, variable.type.dollar.only.js, support.class.dollar.only.js + settings + + foreground + #"{syntax.special.hex}" + + + + name + Storage + scope + storage + settings + + foreground + #"{syntax.keyword.hex}" + + + + name + Storage type + scope + storage.type settings fontStyle italic foreground - #"{syntax.tag.hex}" + #"{syntax.keyword.hex}" name - Invalid + Entity name scope - invalid + entity.name.function settings foreground - #"{syntax.error.hex}" + #"{syntax.func.hex}" name - Deprecated + Entity name scope - invalid.deprecated + entity.name - (entity.name.section | entity.name.tag | entity.name.label) settings - background - #"{syntax.keyword.hex}" foreground - #FFFFFF + #f9ae58 name - Html punctuations tags + Inherited class scope - punctuation.definition.tag.end, punctuation.definition.tag.begin, punctuation.definition.tag + entity.other.inherited-class settings + fontStyle + italic underline foreground - #"{syntax.tag.hex}"90 + #5fb3b3 name - Attributes + Function argument scope - entity.other.attribute-name + variable.parameter settings + fontStyle + foreground - #"{syntax.keyword.hex}" + #f9ae58 name - Regular Expressions and Escape Characters + Language variable scope - string.regexp, constant.character.escape + variable.language settings + fontStyle + italic foreground - #"{syntax.regexp.hex}" + #ec5f67 name - URL + Tag scope - *url*, *link*, *uri* + entity.name.tag, meta.tag.sgml settings fontStyle - underline + + foreground + #"{syntax.tag.hex}" name - Search Results Nums + Tag attribute scope - constant.numeric.line-number.find-in-files - match + entity.other.attribute-name settings foreground - #"{syntax.comment.hex}" + #c594c5 name - Search Results Lines + Function call scope - entity.name.filename.find-in-files + variable.function, variable.annotation settings + fontStyle + foreground - #"{syntax.string.hex}" + #6699cc name - Decorators + Library function scope - tag.decorator.js entity.name.tag.js, tag.decorator.js punctuation.definition.tag.js + support.function, support.macro settings fontStyle italic foreground - #"{syntax.es_spec.hex}" + #"{syntax.markup.hex}" name - ES7 Bind Operator + Library constant scope - source.js constant.other.object.key.js string.unquoted.label.js + support.constant settings fontStyle italic foreground - #"{syntax.tag.hex}" + #c594c5 name - entity.name.method.js + Library class/type scope - entity.name.method.js + support.type, support.class settings fontStyle italic foreground - #"{syntax.es_spec.hex}" + #6699cc name - meta.method.js + Invalid scope - meta.class-method.js entity.name.function.js, variable.function.constructor + invalid settings foreground - #"{syntax.es_spec.hex}" + #"{syntax.error.hex}" + + + + name + Invalid deprecated + scope + invalid.deprecated + settings + + background + #"{syntax.keyword.hex}" + foreground + #FFFFFF + + + + name + YAML Key + scope + entity.name.tag.yaml + settings + + foreground + #5fb3b3 + + + + name + YAML String + scope + source.yaml string.unquoted + settings + + foreground + #D8DEE9 + + + + name + diff.header + scope + meta.diff, meta.diff.header + settings + + foreground + #c594c5 + + + + name + diff.deleted + scope + markup.deleted + settings + + foreground + #"{syntax.error.hex}" + + + + name + diff.inserted + scope + markup.inserted + settings + + foreground + #99c794 + + + + name + diff.changed + scope + markup.changed + settings + + foreground + #f9ae58 + + + + name + CSS Properties + scope + support.type.property-name + settings + + foreground + #D8DEE9 + + + + scope + constant.numeric.line-number.match + settings + + foreground + #ec5f67 + + + + scope + message.error + settings + + foreground + #ec5f67 @@ -538,7 +698,7 @@ a { settings foreground - #"{syntax.sup_var.hex}" + #"{syntax.markup.hex}" @@ -621,7 +781,7 @@ a { settings foreground - #"{syntax.keyword.hex}" + #"{syntax.error.hex}" @@ -632,7 +792,7 @@ a { settings foreground - #"{syntax.es_spec.hex}" + #"{syntax.special.hex}" @@ -643,7 +803,7 @@ a { settings background - #3cadd71a + #"{common.fg.hex}"10 foreground #"{syntax.tag.hex}" @@ -678,7 +838,7 @@ a { settings background - #ffffff10 + #"{common.fg.hex}"10 foreground #"{common.fg.hex}" @@ -691,7 +851,7 @@ a { settings background - #ffffff10 + #"{common.fg.hex}"10 foreground #"{syntax.comment.hex}" @@ -737,7 +897,7 @@ a { settings foreground - #"{syntax.keyword.hex}" + #"{syntax.error.hex}" @@ -820,7 +980,7 @@ a { settings background - #"{syntax.sup_var.hex}" + #"{syntax.markup.hex}" foreground #FFFFFF diff --git a/src/templates/sublime.syntax.yml b/src/templates/sublime.syntax.yml index 9dd79930..a3ae51b6 100644 --- a/src/templates/sublime.syntax.yml +++ b/src/templates/sublime.syntax.yml @@ -43,139 +43,211 @@ settings: color: rgba("{syntax.tag.rgb}", .7); } -- name: Comments +- name: Comment scope: comment, punctuation.definition.comment settings: fontStyle: italic foreground: &comment '#"{syntax.comment.hex}"' -# Punctuation -- name: Separators, Comma and alike - scope: punctuation.separator, punctuation.terminator +- name: String + scope: string settings: - foreground: '#"{common.fg.hex}"dd' + foreground: &string '#"{syntax.string.hex}"' -- name: Variable - scope: variable +- name: Punctuation + scope: punctuation.definition settings: - foreground: *fg + foreground: '#5fb3b3' + +- name: Number + scope: constant.numeric + settings: + foreground: *constant + +- name: Regular Expressions and Escape Characters + scope: string.regexp, constant.character.escape + settings: + foreground: ®exp '#"{syntax.regexp.hex}"' -- name: Keyword, Storage - scope: keyword, storage.type, storage.modifier +- name: Built-in constant + scope: constant.language + settings: + fontStyle: italic + foreground: *constant + +- name: User-defined constant + scope: constant.character, constant.other + settings: + foreground: *constant + +- name: Member Variable + scope: variable.member + settings: + foreground: '#ec5f67' + +- name: Keyword + scope: keyword - keyword.operator, keyword.operator.word settings: foreground: &keyword '#"{syntax.keyword.hex}"' -- name: Operator, Misc - scope: constant.other.color, meta.tag, punctuation.separator.inheritance.php, punctuation.section.embedded, keyword.other.substitution +- name: Operators + scope: keyword.operator settings: foreground: &operator '#"{syntax.operator.hex}"' -- name: Tag - scope: entity.name.tag, meta.tag.sgml +- name: Punctuation + scope: punctuation.separator, punctuation.terminator settings: - foreground: &tag '#"{syntax.tag.hex}"' + foreground: '#A7ADBA' -- name: Function, Special Method, Block Level - scope: entity.name.function, meta.function-call, variable.function, support.function, keyword.other.special-method, meta.block-level +- name: Punctuation + scope: punctuation.section settings: - foreground: &function '#"{syntax.func.hex}"' + foreground: '#ffffff' -- name: Other Variable, String Link - scope: support.other.variable, string.other.link +- name: Accessor + scope: punctuation.accessor settings: - foreground: &sup_var '#"{syntax.sup_var.hex}"' + foreground: '#A7ADBA' -- name: Number, Constant, Function Argument, Tag Attribute, Embedded - scope: constant.numeric, constant.language, support.constant, constant.character, variable.parameter, keyword.other.unit +- name: Annotation Punctuation + scope: punctuation.definition.annotation settings: - foreground: *constant + foreground: '#5fb3b3' -- name: String, Symbols, Inherited Class - scope: string, keyword.other.template, constant.other.symbol, constant.other.key, entity.other.inherited-class, meta.group.braces.curly constant.other.object.key.js string.unquoted.label.js +- name: JavaScript Dollar + scope: variable.other.dollar.only.js, variable.other.object.dollar.only.js, variable.type.dollar.only.js, + support.class.dollar.only.js settings: - fontStyle: normal - foreground: &string '#"{syntax.string.hex}"' + foreground: &special '#"{syntax.special.hex}"' -- name: Class, Support - scope: entity.name.class, entity.name.type.class, support.type, support.class, support.orther.namespace.use.php, meta.use.php, support.other.namespace.php +- name: Storage + scope: storage settings: - foreground: *tag + foreground: *keyword -- name: Sub-methods - scope: entity.name.module.js, variable.import.parameter.js, variable.other.class.js +- name: Storage type + scope: storage.type settings: - foreground: *tag + fontStyle: italic + foreground: *keyword -- name: Language methods +- name: Entity name + scope: entity.name.function + settings: + foreground: &function '#"{syntax.func.hex}"' + +- name: Entity name + scope: entity.name - (entity.name.section | entity.name.tag | entity.name.label) + settings: + foreground: '#f9ae58' + +- name: Inherited class + scope: entity.other.inherited-class + settings: + fontStyle: italic underline + foreground: '#5fb3b3' + +- name: Function argument + scope: variable.parameter + settings: + fontStyle: '' + foreground: '#f9ae58' + +- name: Language variable scope: variable.language settings: fontStyle: italic - foreground: *tag + foreground: '#ec5f67' + +- name: Tag + scope: entity.name.tag, meta.tag.sgml + settings: + fontStyle: '' + foreground: &tag '#"{syntax.tag.hex}"' + +- name: Tag attribute + scope: entity.other.attribute-name + settings: + foreground: '#c594c5' + +- name: Function call + scope: variable.function, variable.annotation + settings: + fontStyle: '' + foreground: '#6699cc' + +- name: Library function + scope: support.function, support.macro + settings: + fontStyle: italic + foreground: &markup '#"{syntax.markup.hex}"' + +- name: Library constant + scope: support.constant + settings: + fontStyle: italic + foreground: '#c594c5' + +- name: Library class/type + scope: support.type, support.class + settings: + fontStyle: italic + foreground: '#6699cc' - name: Invalid scope: invalid settings: foreground: &error '#"{syntax.error.hex}"' -- name: Deprecated +- name: Invalid deprecated scope: invalid.deprecated settings: background: *keyword foreground: &white '#FFFFFF' -- name: Html punctuations tags - scope: punctuation.definition.tag.end, punctuation.definition.tag.begin, punctuation.definition.tag +- name: YAML Key + scope: entity.name.tag.yaml settings: - foreground: '#"{syntax.tag.hex}"90' # opacity of tag verson of &tag_punctag + foreground: '#5fb3b3' -- name: Attributes - scope: entity.other.attribute-name +- name: YAML String + scope: source.yaml string.unquoted settings: - foreground: *keyword + foreground: '#D8DEE9' -- name: Regular Expressions and Escape Characters - scope: string.regexp, constant.character.escape +- name: diff.header + scope: meta.diff, meta.diff.header settings: - foreground: ®exp '#"{syntax.regexp.hex}"' + foreground: '#c594c5' -- name: URL - scope: '*url*, *link*, *uri*' +- name: diff.deleted + scope: markup.deleted settings: - fontStyle: underline + foreground: *error -- name: Search Results Nums - scope: constant.numeric.line-number.find-in-files - match +- name: diff.inserted + scope: markup.inserted settings: - foreground: *comment + foreground: '#99c794' -- name: Search Results Lines - scope: entity.name.filename.find-in-files +- name: diff.changed + scope: markup.changed settings: - foreground: *string + foreground: '#f9ae58' -# ES6 -- name: Decorators - scope: tag.decorator.js entity.name.tag.js, tag.decorator.js punctuation.definition.tag.js +- name: CSS Properties + scope: support.type.property-name settings: - fontStyle: italic - foreground: &es_spec '#"{syntax.es_spec.hex}"' + foreground: '#D8DEE9' -- name: ES7 Bind Operator - scope: source.js constant.other.object.key.js string.unquoted.label.js +- scope: constant.numeric.line-number.match settings: - fontStyle: italic - foreground: *tag - -- name: entity.name.method.js - scope: entity.name.method.js - settings: - fontStyle: italic - foreground: *es_spec + foreground: '#ec5f67' -- name: meta.method.js - scope: meta.class-method.js entity.name.function.js, variable.function.constructor +- scope: message.error settings: - foreground: *es_spec + foreground: '#ec5f67' # JSON - name: JSON Key - Level 8 @@ -262,7 +334,7 @@ settings: - name: Markup punctuation scope: (text punctuation.definition.italic | text punctuation.definition.bold) settings: - foreground: *sup_var + foreground: *markup - name: Markup Code scope: markup.raw @@ -300,17 +372,17 @@ settings: - name: Markup Deleted scope: markup.deleted settings: - foreground: *keyword + foreground: *error - name: Markup - Strike scope: markup.strike settings: - foreground: *es_spec + foreground: *special - name: Markup - Table scope: markup.table settings: - background: '#3cadd71a' + background: '#"{common.fg.hex}"10' foreground: *tag - name: Markdown - Markup Raw Inline @@ -354,7 +426,7 @@ settings: - name: GitGutter Deleted scope: markup.deleted.git_gutter settings: - foreground: *keyword + foreground: *error - name: GitGutter Ignored scope: markup.ignored.git_gutter @@ -393,7 +465,7 @@ settings: - name: AceJump Label - Purple scope: acejump.label.purple settings: - background: *sup_var + background: *markup foreground: *white # SublimeLinter diff --git a/src/themes/dark.yml b/src/themes/dark.yml index c8df4631..df87ce5a 100644 --- a/src/themes/dark.yml +++ b/src/themes/dark.yml @@ -35,9 +35,9 @@ syntax: func: FFB454 regexp: 95E6CB string: C2D94C - sup_var: F07178 + markup: F07178 keyword: FF7733 - es_spec: E6B673 + special: E6B673 comment: 5C6773 constant: FFEE99 operator: E7C547 diff --git a/src/themes/light.yml b/src/themes/light.yml index f732fa2c..01158af9 100644 --- a/src/themes/light.yml +++ b/src/themes/light.yml @@ -24,20 +24,20 @@ ui: opacity: '0.2' syntax: - error: FF3333 + error: F51818 line_hg: F2F2F2 gutter: D9D8D7 selection: F0EEE4 stack_guide: DEDDDC active_guide: B3B2B1 - tag: 41A6D9 + tag: 36A3D9 func: F29718 - regexp: 4DBF99 + regexp: 4CBF99 string: 86B300 comment: ABB0B6 - sup_var: F07178 - es_spec: CCA37A - keyword: F2590C + markup: F07178 + special: E6B673 + keyword: FA6E32 operator: E7C547 constant: A37ACC diff --git a/src/themes/mirage.yml b/src/themes/mirage.yml index b5991499..538cef99 100644 --- a/src/themes/mirage.yml +++ b/src/themes/mirage.yml @@ -35,9 +35,9 @@ syntax: func: FFD580 string: BAE67E regexp: 95E6CB - sup_var: F07178 + markup: F07178 keyword: FFAE57 - es_spec: FFC44C + special: FFC44C comment: 5C6773 constant: D4BFFF operator: 80D4FF diff --git a/widgets/Widget - ayu-light.stTheme b/widgets/Widget - ayu-light.stTheme index 0e6bcfc9..2779e83a 100644 --- a/widgets/Widget - ayu-light.stTheme +++ b/widgets/Widget - ayu-light.stTheme @@ -57,7 +57,7 @@ settings foreground - #F2590C + #FA6E32 @@ -90,7 +90,7 @@ settings foreground - #4DBF99 + #4CBF99 From 4b593476e7528f5caeca35c2e5dc03f5a0fc9073 Mon Sep 17 00:00:00 2001 From: Ike Ku Date: Sat, 16 Sep 2017 13:12:11 +0300 Subject: [PATCH 02/12] New operator color --- ayu-dark.tmTheme | 4 ++-- ayu-light.tmTheme | 4 ++-- ayu-mirage.tmTheme | 4 ++-- src/themes/dark.yml | 2 +- src/themes/light.yml | 2 +- src/themes/mirage.yml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ayu-dark.tmTheme b/ayu-dark.tmTheme index 174b62a3..54c3eadc 100644 --- a/ayu-dark.tmTheme +++ b/ayu-dark.tmTheme @@ -176,7 +176,7 @@ a { settings foreground - #E7C547 + #F29668 @@ -654,7 +654,7 @@ a { settings foreground - #E7C547 + #F29668 diff --git a/ayu-light.tmTheme b/ayu-light.tmTheme index 3b102685..6c676113 100644 --- a/ayu-light.tmTheme +++ b/ayu-light.tmTheme @@ -176,7 +176,7 @@ a { settings foreground - #E7C547 + #ED996F @@ -654,7 +654,7 @@ a { settings foreground - #E7C547 + #ED996F diff --git a/ayu-mirage.tmTheme b/ayu-mirage.tmTheme index cf810dd4..87a563ea 100644 --- a/ayu-mirage.tmTheme +++ b/ayu-mirage.tmTheme @@ -176,7 +176,7 @@ a { settings foreground - #80D4FF + #F29E74 @@ -654,7 +654,7 @@ a { settings foreground - #80D4FF + #F29E74 diff --git a/src/themes/dark.yml b/src/themes/dark.yml index df87ce5a..f6330497 100644 --- a/src/themes/dark.yml +++ b/src/themes/dark.yml @@ -40,4 +40,4 @@ syntax: special: E6B673 comment: 5C6773 constant: FFEE99 - operator: E7C547 + operator: F29668 diff --git a/src/themes/light.yml b/src/themes/light.yml index 01158af9..0f9df1e7 100644 --- a/src/themes/light.yml +++ b/src/themes/light.yml @@ -39,5 +39,5 @@ syntax: markup: F07178 special: E6B673 keyword: FA6E32 - operator: E7C547 + operator: ED996F constant: A37ACC diff --git a/src/themes/mirage.yml b/src/themes/mirage.yml index 538cef99..66dd095f 100644 --- a/src/themes/mirage.yml +++ b/src/themes/mirage.yml @@ -40,4 +40,4 @@ syntax: special: FFC44C comment: 5C6773 constant: D4BFFF - operator: 80D4FF + operator: F29E74 From c3364dddee267b32510ce776b78a6b228c7da40f Mon Sep 17 00:00:00 2001 From: Ike Ku Date: Sat, 16 Sep 2017 13:37:14 +0300 Subject: [PATCH 03/12] Normalize tag colors --- ayu-dark.tmTheme | 42 +++++++++++++++----------------- ayu-light.tmTheme | 42 +++++++++++++++----------------- ayu-mirage.tmTheme | 10 +++----- src/templates/sublime.syntax.xml | 10 +++----- src/templates/sublime.syntax.yml | 11 ++++----- src/themes/dark.yml | 2 +- src/themes/light.yml | 2 +- 7 files changed, 55 insertions(+), 64 deletions(-) diff --git a/ayu-dark.tmTheme b/ayu-dark.tmTheme index 54c3eadc..e4e45543 100644 --- a/ayu-dark.tmTheme +++ b/ayu-dark.tmTheme @@ -52,7 +52,7 @@ body { padding: 1px 3px; } a { - color: rgba(80, 180, 230, .7); + color: rgba(57, 186, 230, .7); } selection @@ -198,7 +198,7 @@ a { settings foreground - #ffffff + #E6E1CF @@ -300,10 +300,8 @@ a { variable.parameter settings - fontStyle - foreground - #f9ae58 + #FFEE99 @@ -316,7 +314,7 @@ a { fontStyle italic foreground - #ec5f67 + #39BAE6 @@ -329,7 +327,7 @@ a { fontStyle foreground - #50B4E6 + #39BAE6 @@ -392,7 +390,7 @@ a { fontStyle italic foreground - #6699cc + #39BAE6 @@ -522,7 +520,7 @@ a { settings foreground - #50B4E6 + #39BAE6 @@ -533,7 +531,7 @@ a { settings foreground - #50B4E6 + #39BAE6 @@ -544,7 +542,7 @@ a { settings foreground - #50B4E6 + #39BAE6 @@ -555,7 +553,7 @@ a { settings foreground - #50B4E6 + #39BAE6 @@ -566,7 +564,7 @@ a { settings foreground - #50B4E6 + #39BAE6 @@ -577,7 +575,7 @@ a { settings foreground - #50B4E6 + #39BAE6 @@ -588,7 +586,7 @@ a { settings foreground - #50B4E6 + #39BAE6 @@ -599,7 +597,7 @@ a { settings foreground - #50B4E6 + #39BAE6 @@ -610,7 +608,7 @@ a { settings foreground - #50B4E6 + #39BAE6 @@ -805,7 +803,7 @@ a { background #E6E1CF10 foreground - #50B4E6 + #39BAE6 @@ -816,7 +814,7 @@ a { settings foreground - #50B4E6 + #39BAE6 @@ -886,7 +884,7 @@ a { settings foreground - #50B4E6 + #39BAE6 @@ -941,7 +939,7 @@ a { settings background - #50B4E6 + #39BAE6 foreground #FFFFFF @@ -993,7 +991,7 @@ a { settings foreground - #50B4E6 + #39BAE6 diff --git a/ayu-light.tmTheme b/ayu-light.tmTheme index 6c676113..3feedbe7 100644 --- a/ayu-light.tmTheme +++ b/ayu-light.tmTheme @@ -52,7 +52,7 @@ body { padding: 1px 3px; } a { - color: rgba(54, 163, 217, .7); + color: rgba(85, 180, 212, .7); } selection @@ -198,7 +198,7 @@ a { settings foreground - #ffffff + #5C6066 @@ -300,10 +300,8 @@ a { variable.parameter settings - fontStyle - foreground - #f9ae58 + #A37ACC @@ -316,7 +314,7 @@ a { fontStyle italic foreground - #ec5f67 + #55B4D4 @@ -329,7 +327,7 @@ a { fontStyle foreground - #36A3D9 + #55B4D4 @@ -392,7 +390,7 @@ a { fontStyle italic foreground - #6699cc + #55B4D4 @@ -522,7 +520,7 @@ a { settings foreground - #36A3D9 + #55B4D4 @@ -533,7 +531,7 @@ a { settings foreground - #36A3D9 + #55B4D4 @@ -544,7 +542,7 @@ a { settings foreground - #36A3D9 + #55B4D4 @@ -555,7 +553,7 @@ a { settings foreground - #36A3D9 + #55B4D4 @@ -566,7 +564,7 @@ a { settings foreground - #36A3D9 + #55B4D4 @@ -577,7 +575,7 @@ a { settings foreground - #36A3D9 + #55B4D4 @@ -588,7 +586,7 @@ a { settings foreground - #36A3D9 + #55B4D4 @@ -599,7 +597,7 @@ a { settings foreground - #36A3D9 + #55B4D4 @@ -610,7 +608,7 @@ a { settings foreground - #36A3D9 + #55B4D4 @@ -805,7 +803,7 @@ a { background #5C606610 foreground - #36A3D9 + #55B4D4 @@ -816,7 +814,7 @@ a { settings foreground - #36A3D9 + #55B4D4 @@ -886,7 +884,7 @@ a { settings foreground - #36A3D9 + #55B4D4 @@ -941,7 +939,7 @@ a { settings background - #36A3D9 + #55B4D4 foreground #FFFFFF @@ -993,7 +991,7 @@ a { settings foreground - #36A3D9 + #55B4D4 diff --git a/ayu-mirage.tmTheme b/ayu-mirage.tmTheme index 87a563ea..23a74bf7 100644 --- a/ayu-mirage.tmTheme +++ b/ayu-mirage.tmTheme @@ -198,7 +198,7 @@ a { settings foreground - #ffffff + #D9D7CE @@ -300,10 +300,8 @@ a { variable.parameter settings - fontStyle - foreground - #f9ae58 + #D4BFFF @@ -316,7 +314,7 @@ a { fontStyle italic foreground - #ec5f67 + #5CCFE6 @@ -392,7 +390,7 @@ a { fontStyle italic foreground - #6699cc + #5CCFE6 diff --git a/src/templates/sublime.syntax.xml b/src/templates/sublime.syntax.xml index 50bcb53b..f7fe4fdc 100644 --- a/src/templates/sublime.syntax.xml +++ b/src/templates/sublime.syntax.xml @@ -198,7 +198,7 @@ a { settings foreground - #ffffff + #"{common.fg.hex}" @@ -300,10 +300,8 @@ a { variable.parameter settings - fontStyle - foreground - #f9ae58 + #"{syntax.constant.hex}" @@ -316,7 +314,7 @@ a { fontStyle italic foreground - #ec5f67 + #"{syntax.tag.hex}" @@ -392,7 +390,7 @@ a { fontStyle italic foreground - #6699cc + #"{syntax.tag.hex}" diff --git a/src/templates/sublime.syntax.yml b/src/templates/sublime.syntax.yml index a3ae51b6..4ba08e14 100644 --- a/src/templates/sublime.syntax.yml +++ b/src/templates/sublime.syntax.yml @@ -103,7 +103,7 @@ settings: - name: Punctuation scope: punctuation.section settings: - foreground: '#ffffff' + foreground: *fg - name: Accessor scope: punctuation.accessor @@ -151,20 +151,19 @@ settings: - name: Function argument scope: variable.parameter settings: - fontStyle: '' - foreground: '#f9ae58' + foreground: *constant - name: Language variable scope: variable.language settings: fontStyle: italic - foreground: '#ec5f67' + foreground: &tag '#"{syntax.tag.hex}"' - name: Tag scope: entity.name.tag, meta.tag.sgml settings: fontStyle: '' - foreground: &tag '#"{syntax.tag.hex}"' + foreground: *tag - name: Tag attribute scope: entity.other.attribute-name @@ -193,7 +192,7 @@ settings: scope: support.type, support.class settings: fontStyle: italic - foreground: '#6699cc' + foreground: *tag - name: Invalid scope: invalid diff --git a/src/themes/dark.yml b/src/themes/dark.yml index f6330497..fd2ca12c 100644 --- a/src/themes/dark.yml +++ b/src/themes/dark.yml @@ -31,7 +31,7 @@ syntax: stack_guide: 1A2633 active_guide: '314559' - tag: 50B4E6 + tag: 39BAE6 func: FFB454 regexp: 95E6CB string: C2D94C diff --git a/src/themes/light.yml b/src/themes/light.yml index 0f9df1e7..c716d42e 100644 --- a/src/themes/light.yml +++ b/src/themes/light.yml @@ -31,7 +31,7 @@ syntax: stack_guide: DEDDDC active_guide: B3B2B1 - tag: 36A3D9 + tag: 55B4D4 func: F29718 regexp: 4CBF99 string: 86B300 From 1715a4a8cb8fabcd340086bac7db2e2d11f326f2 Mon Sep 17 00:00:00 2001 From: Ike Ku Date: Sat, 16 Sep 2017 13:40:33 +0300 Subject: [PATCH 04/12] Normalize light fg --- ayu-light.sublime-theme | 28 ++++++++++++++-------------- ayu-light.tmTheme | 24 ++++++++++++------------ ayu-light2.sublime-theme | 26 +++++++++++++------------- src/themes/light.yml | 4 ++-- widgets/Widget - ayu-light.stTheme | 2 +- 5 files changed, 42 insertions(+), 42 deletions(-) diff --git a/ayu-light.sublime-theme b/ayu-light.sublime-theme index 2aec5772..cd378e5c 100644 --- a/ayu-light.sublime-theme +++ b/ayu-light.sublime-theme @@ -98,7 +98,7 @@ "class": "auto_complete_label", "fg": [133, 136, 140], "match_fg": [255, 106, 0], - "selected_fg": [92, 96, 102], + "selected_fg": [110, 117, 128], "selected_match_fg": [255, 106, 0] }, @@ -158,7 +158,7 @@ "layer1.texture": "ayu/assets/overlay-border.png", "layer1.inner_margin": [25, 45, 25, 35], "layer1.opacity": 1.0, - "layer1.tint": [92, 96, 102, 30], + "layer1.tint": [110, 117, 128, 30], "layer2.texture": "ayu/assets/overlay-bg.png", "layer2.inner_margin": [25, 45, 25, 35], @@ -237,7 +237,7 @@ "class": "quick_panel_label", "fg": [133, 136, 140], "match_fg": [255, 106, 0], - "selected_fg": [92, 96, 102], + "selected_fg": [110, 117, 128], "selected_match_fg": [255, 106, 0] }, @@ -248,7 +248,7 @@ "parents": [{"class": "overlay_control"}], "fg": [133, 136, 140], "match_fg": [255, 106, 0], - "selected_fg": [92, 96, 102], + "selected_fg": [110, 117, 128], "selected_match_fg": [255, 106, 0] }, @@ -257,9 +257,9 @@ { "class": "quick_panel_path_label", "fg": [149, 156, 166], - "match_fg": [92, 96, 102], + "match_fg": [110, 117, 128], "selected_fg": [133, 136, 140], - "selected_match_fg": [92, 96, 102] + "selected_match_fg": [110, 117, 128] }, // Panels data / score @@ -418,14 +418,14 @@ "class": "tab_label", "parents": [{"class": "tab_control", "attributes": ["selected"]}], "fg": [250, 250, 250, 0], - "shadow_color": [92, 96, 102], + "shadow_color": [110, 117, 128], "shadow_offset": [0, -1], }, { "class": "tab_label", "settings": ["ui_fix_tab_labels"], "parents": [{"class": "tab_control", "attributes": ["selected"]}], - "fg": [92, 96, 102], + "fg": [110, 117, 128], "shadow_color": [250, 250, 250, 0], "shadow_offset": [0, 0] }, @@ -637,13 +637,13 @@ { "class": "sidebar_label", "parents": [{"class": "tree_row","attributes": ["hover"]}], - "color": [92, 96, 102] + "color": [110, 117, 128] }, { "class": "sidebar_label", "parents": [{"class": "tree_row","attributes": ["selected"]}], - "color": [92, 96, 102] + "color": [110, 117, 128] }, { @@ -663,13 +663,13 @@ { "class": "sidebar_label", "parents": [{"class": "tree_row", "attributes": ["expandable", "hover"]}], - "color": [92, 96, 102] + "color": [110, 117, 128] }, { "class": "sidebar_label", "parents": [{"class": "tree_row", "attributes": ["expanded"]}], - "color": [92, 96, 102] + "color": [110, 117, 128] }, { @@ -682,7 +682,7 @@ // { // "class": "sidebar_label", // "parents": [{"class": "tree_row", "attributes": ["expanded", "selected"]}], - // "color": [92, 96, 102] + // "color": [110, 117, 128] // }, { @@ -1209,7 +1209,7 @@ "class": "icon_button_control", "layer0.tint": [0, 0, 0], "layer0.opacity": 0, - "layer2.tint": [92, 96, 102], + "layer2.tint": [110, 117, 128], "layer2.opacity": { "target": 0.0, "speed": 10.0, "interpolation": "smoothstep" }, "content_margin": [10, 5] }, diff --git a/ayu-light.tmTheme b/ayu-light.tmTheme index 3feedbe7..c5e49519 100644 --- a/ayu-light.tmTheme +++ b/ayu-light.tmTheme @@ -28,7 +28,7 @@ findHighlightForeground #FAFAFA foreground - #5C6066 + #6E7580 guide #D9D8D7 gutter @@ -46,7 +46,7 @@ popupCss html, body { background-color: #FFFFFF; - color: #5C6066; + color: #6E7580; } body { padding: 1px 3px; @@ -176,7 +176,7 @@ a { settings foreground - #ED996F + #ED9366 @@ -198,7 +198,7 @@ a { settings foreground - #5C6066 + #6E7580 @@ -652,7 +652,7 @@ a { settings foreground - #ED996F + #ED9366 @@ -707,7 +707,7 @@ a { settings background - #5C606607 + #6E758007 @@ -718,7 +718,7 @@ a { settings background - #5C606610 + #6E758010 @@ -729,7 +729,7 @@ a { settings background - #5C606610 + #6E758010 fontStyle bold foreground @@ -801,7 +801,7 @@ a { settings background - #5C606610 + #6E758010 foreground #55B4D4 @@ -836,9 +836,9 @@ a { settings background - #5C606610 + #6E758010 foreground - #5C6066 + #6E7580 @@ -849,7 +849,7 @@ a { settings background - #5C606610 + #6E758010 foreground #ABB0B6 diff --git a/ayu-light2.sublime-theme b/ayu-light2.sublime-theme index 04aaab74..b92cee31 100644 --- a/ayu-light2.sublime-theme +++ b/ayu-light2.sublime-theme @@ -100,7 +100,7 @@ "class": "auto_complete_label", "fg": [133, 136, 140], "match_fg": [255, 106, 0], - "selected_fg": [92, 96, 102], + "selected_fg": [110, 117, 128], "selected_match_fg": [255, 106, 0] }, @@ -235,7 +235,7 @@ "class": "quick_panel_label", "fg": [133, 136, 140], "match_fg": [255, 106, 0], - "selected_fg": [92, 96, 102], + "selected_fg": [110, 117, 128], "selected_match_fg": [255, 106, 0] }, @@ -246,7 +246,7 @@ "parents": [{"class": "overlay_control"}], "fg": [133, 136, 140], "match_fg": [255, 106, 0], - "selected_fg": [92, 96, 102], + "selected_fg": [110, 117, 128], "selected_match_fg": [255, 106, 0] }, @@ -255,9 +255,9 @@ { "class": "quick_panel_path_label", "fg": [149, 156, 166], - "match_fg": [92, 96, 102], + "match_fg": [110, 117, 128], "selected_fg": [133, 136, 140], - "selected_match_fg": [92, 96, 102] + "selected_match_fg": [110, 117, 128] }, // Panels data / score @@ -403,14 +403,14 @@ "class": "tab_label", "parents": [{"class": "tab_control", "attributes": ["selected"]}], "fg": [250, 250, 250, 0], - "shadow_color": [92, 96, 102], + "shadow_color": [110, 117, 128], "shadow_offset": [0, -1] }, { "class": "tab_label", "settings": ["ui_fix_tab_labels"], "parents": [{"class": "tab_control", "attributes": ["selected"]}], - "fg": [92, 96, 102], + "fg": [110, 117, 128], "shadow_color": [250, 250, 250, 0], "shadow_offset": [0, 0] }, @@ -624,13 +624,13 @@ { "class": "sidebar_label", "parents": [{"class": "tree_row","attributes": ["hover"]}], - "color": [92, 96, 102] + "color": [110, 117, 128] }, { "class": "sidebar_label", "parents": [{"class": "tree_row","attributes": ["selected"]}], - "color": [92, 96, 102], + "color": [110, 117, 128], "shadow_color": [0, 0, 0], "shadow_offset": [0, 0] }, @@ -652,13 +652,13 @@ { "class": "sidebar_label", "parents": [{"class": "tree_row", "attributes": ["expandable", "hover"]}], - "color": [92, 96, 102] + "color": [110, 117, 128] }, { "class": "sidebar_label", "parents": [{"class": "tree_row", "attributes": ["expanded"]}], - "color": [92, 96, 102] + "color": [110, 117, 128] }, { @@ -671,7 +671,7 @@ // { // "class": "sidebar_label", // "parents": [{"class": "tree_row", "attributes": ["expanded", "selected"]}], - // "color": [92, 96, 102] + // "color": [110, 117, 128] // }, { @@ -1081,7 +1081,7 @@ "class": "icon_button_control", "layer0.tint": [0, 0, 0], "layer0.opacity": 0, - "layer2.tint": [92, 96, 102], + "layer2.tint": [110, 117, 128], "layer2.opacity": { "target": 0.0, "speed": 10.0, "interpolation": "smoothstep" }, "content_margin": [10, 5] }, diff --git a/src/themes/light.yml b/src/themes/light.yml index c716d42e..e2f5f1e9 100644 --- a/src/themes/light.yml +++ b/src/themes/light.yml @@ -3,7 +3,7 @@ theme: light common: accent: 'FF6A00' bg: 'FAFAFA' - fg: '5C6066' + fg: '6E7580' ui: fg: '85888C' @@ -39,5 +39,5 @@ syntax: markup: F07178 special: E6B673 keyword: FA6E32 - operator: ED996F + operator: ED9366 constant: A37ACC diff --git a/widgets/Widget - ayu-light.stTheme b/widgets/Widget - ayu-light.stTheme index 2779e83a..a8bf3424 100644 --- a/widgets/Widget - ayu-light.stTheme +++ b/widgets/Widget - ayu-light.stTheme @@ -23,7 +23,7 @@ caret #FF6A00 foreground - #5C6066 + #6E7580 inactiveSelection #F0EEE488 invisibles From 4d17aaba27407839104dda7e318d78c388f3c167 Mon Sep 17 00:00:00 2001 From: Ike Ku Date: Sat, 16 Sep 2017 14:01:08 +0300 Subject: [PATCH 05/12] Punctuation and markup --- ayu-dark.tmTheme | 37 +++++++++++++++++++++----------- ayu-light.tmTheme | 37 +++++++++++++++++++++----------- ayu-mirage.tmTheme | 37 +++++++++++++++++++++----------- src/templates/sublime.syntax.xml | 37 +++++++++++++++++++++----------- src/templates/sublime.syntax.yml | 18 ++++++++++------ 5 files changed, 112 insertions(+), 54 deletions(-) diff --git a/ayu-dark.tmTheme b/ayu-dark.tmTheme index e4e45543..e2742fc9 100644 --- a/ayu-dark.tmTheme +++ b/ayu-dark.tmTheme @@ -89,17 +89,6 @@ a { #C2D94C - - name - Punctuation - scope - punctuation.definition - settings - - foreground - #5fb3b3 - - name Number @@ -330,6 +319,17 @@ a { #39BAE6 + + name + Tag start/end + scope + punctuation.definition.tag.end, punctuation.definition.tag.begin, punctuation.definition.tag + settings + + foreground + #39BAE690 + + name Tag attribute @@ -651,8 +651,21 @@ a { string.other.link, markup.underline.link settings + fontStyle + italic underline foreground - #F29668 + #95E6CB + + + + name + Markup image + scope + punctuation.definition.image + settings + + foreground + #FFB454 diff --git a/ayu-light.tmTheme b/ayu-light.tmTheme index c5e49519..fd6b62d5 100644 --- a/ayu-light.tmTheme +++ b/ayu-light.tmTheme @@ -89,17 +89,6 @@ a { #86B300 - - name - Punctuation - scope - punctuation.definition - settings - - foreground - #5fb3b3 - - name Number @@ -330,6 +319,17 @@ a { #55B4D4 + + name + Tag start/end + scope + punctuation.definition.tag.end, punctuation.definition.tag.begin, punctuation.definition.tag + settings + + foreground + #55B4D490 + + name Tag attribute @@ -651,8 +651,21 @@ a { string.other.link, markup.underline.link settings + fontStyle + italic underline foreground - #ED9366 + #4CBF99 + + + + name + Markup image + scope + punctuation.definition.image + settings + + foreground + #F29718 diff --git a/ayu-mirage.tmTheme b/ayu-mirage.tmTheme index 23a74bf7..f1ba2858 100644 --- a/ayu-mirage.tmTheme +++ b/ayu-mirage.tmTheme @@ -89,17 +89,6 @@ a { #BAE67E - - name - Punctuation - scope - punctuation.definition - settings - - foreground - #5fb3b3 - - name Number @@ -330,6 +319,17 @@ a { #5CCFE6 + + name + Tag start/end + scope + punctuation.definition.tag.end, punctuation.definition.tag.begin, punctuation.definition.tag + settings + + foreground + #5CCFE690 + + name Tag attribute @@ -651,8 +651,21 @@ a { string.other.link, markup.underline.link settings + fontStyle + italic underline foreground - #F29E74 + #95E6CB + + + + name + Markup image + scope + punctuation.definition.image + settings + + foreground + #FFD580 diff --git a/src/templates/sublime.syntax.xml b/src/templates/sublime.syntax.xml index f7fe4fdc..64120cd8 100644 --- a/src/templates/sublime.syntax.xml +++ b/src/templates/sublime.syntax.xml @@ -89,17 +89,6 @@ a { #"{syntax.string.hex}" - - name - Punctuation - scope - punctuation.definition - settings - - foreground - #5fb3b3 - - name Number @@ -330,6 +319,17 @@ a { #"{syntax.tag.hex}" + + name + Tag start/end + scope + punctuation.definition.tag.end, punctuation.definition.tag.begin, punctuation.definition.tag + settings + + foreground + #"{syntax.tag.hex}"90 + + name Tag attribute @@ -651,8 +651,21 @@ a { string.other.link, markup.underline.link settings + fontStyle + italic underline foreground - #"{syntax.operator.hex}" + #"{syntax.regexp.hex}" + + + + name + Markup image + scope + punctuation.definition.image + settings + + foreground + #"{syntax.func.hex}" diff --git a/src/templates/sublime.syntax.yml b/src/templates/sublime.syntax.yml index 4ba08e14..d6e8b5de 100644 --- a/src/templates/sublime.syntax.yml +++ b/src/templates/sublime.syntax.yml @@ -54,11 +54,6 @@ settings: settings: foreground: &string '#"{syntax.string.hex}"' -- name: Punctuation - scope: punctuation.definition - settings: - foreground: '#5fb3b3' - - name: Number scope: constant.numeric settings: @@ -165,6 +160,11 @@ settings: fontStyle: '' foreground: *tag +- name: Tag start/end + scope: punctuation.definition.tag.end, punctuation.definition.tag.begin, punctuation.definition.tag + settings: + foreground: '#"{syntax.tag.hex}"90' # opacity of tag verson of &tag_punctag + - name: Tag attribute scope: entity.other.attribute-name settings: @@ -313,7 +313,13 @@ settings: - name: Markup Links scope: string.other.link, markup.underline.link settings: - foreground: *operator + fontStyle: italic underline + foreground: *regexp + +- name: Markup image + scope: punctuation.definition.image + settings: + foreground: *function - name: Markup Italic scope: markup.italic From ff3e2f22c197794d946c8a11091519a9d1dd1083 Mon Sep 17 00:00:00 2001 From: Ike Ku Date: Sat, 16 Sep 2017 14:11:12 +0300 Subject: [PATCH 06/12] Remove duplicate definitions --- ayu-dark.tmTheme | 44 ++++++++------------------------ ayu-light.tmTheme | 44 ++++++++------------------------ ayu-mirage.tmTheme | 44 ++++++++------------------------ src/templates/sublime.syntax.xml | 44 ++++++++------------------------ src/templates/sublime.syntax.yml | 20 ++++----------- 5 files changed, 49 insertions(+), 147 deletions(-) diff --git a/ayu-dark.tmTheme b/ayu-dark.tmTheme index e2742fc9..857242a0 100644 --- a/ayu-dark.tmTheme +++ b/ayu-dark.tmTheme @@ -450,39 +450,6 @@ a { #c594c5 - - name - diff.deleted - scope - markup.deleted - settings - - foreground - #FF3333 - - - - name - diff.inserted - scope - markup.inserted - settings - - foreground - #99c794 - - - - name - diff.changed - scope - markup.changed - settings - - foreground - #f9ae58 - - name CSS Properties @@ -784,6 +751,17 @@ a { #C2D94C + + name + Markup Changed + scope + markup.changed + settings + + foreground + #39BAE6 + + name Markup Deleted diff --git a/ayu-light.tmTheme b/ayu-light.tmTheme index fd6b62d5..353dbc61 100644 --- a/ayu-light.tmTheme +++ b/ayu-light.tmTheme @@ -450,39 +450,6 @@ a { #c594c5 - - name - diff.deleted - scope - markup.deleted - settings - - foreground - #F51818 - - - - name - diff.inserted - scope - markup.inserted - settings - - foreground - #99c794 - - - - name - diff.changed - scope - markup.changed - settings - - foreground - #f9ae58 - - name CSS Properties @@ -784,6 +751,17 @@ a { #86B300 + + name + Markup Changed + scope + markup.changed + settings + + foreground + #55B4D4 + + name Markup Deleted diff --git a/ayu-mirage.tmTheme b/ayu-mirage.tmTheme index f1ba2858..3d19171e 100644 --- a/ayu-mirage.tmTheme +++ b/ayu-mirage.tmTheme @@ -450,39 +450,6 @@ a { #c594c5 - - name - diff.deleted - scope - markup.deleted - settings - - foreground - #FF3333 - - - - name - diff.inserted - scope - markup.inserted - settings - - foreground - #99c794 - - - - name - diff.changed - scope - markup.changed - settings - - foreground - #f9ae58 - - name CSS Properties @@ -784,6 +751,17 @@ a { #BAE67E + + name + Markup Changed + scope + markup.changed + settings + + foreground + #5CCFE6 + + name Markup Deleted diff --git a/src/templates/sublime.syntax.xml b/src/templates/sublime.syntax.xml index 64120cd8..72caeabc 100644 --- a/src/templates/sublime.syntax.xml +++ b/src/templates/sublime.syntax.xml @@ -450,39 +450,6 @@ a { #c594c5 - - name - diff.deleted - scope - markup.deleted - settings - - foreground - #"{syntax.error.hex}" - - - - name - diff.inserted - scope - markup.inserted - settings - - foreground - #99c794 - - - - name - diff.changed - scope - markup.changed - settings - - foreground - #f9ae58 - - name CSS Properties @@ -784,6 +751,17 @@ a { #"{syntax.string.hex}" + + name + Markup Changed + scope + markup.changed + settings + + foreground + #"{syntax.tag.hex}" + + name Markup Deleted diff --git a/src/templates/sublime.syntax.yml b/src/templates/sublime.syntax.yml index d6e8b5de..7a0a95d0 100644 --- a/src/templates/sublime.syntax.yml +++ b/src/templates/sublime.syntax.yml @@ -220,21 +220,6 @@ settings: settings: foreground: '#c594c5' -- name: diff.deleted - scope: markup.deleted - settings: - foreground: *error - -- name: diff.inserted - scope: markup.inserted - settings: - foreground: '#99c794' - -- name: diff.changed - scope: markup.changed - settings: - foreground: '#f9ae58' - - name: CSS Properties scope: support.type.property-name settings: @@ -374,6 +359,11 @@ settings: settings: foreground: *string +- name: Markup Changed + scope: markup.changed + settings: + foreground: *tag + - name: Markup Deleted scope: markup.deleted settings: From 883b9b78d2ea88a43aed6c1aadd93870134c2ece Mon Sep 17 00:00:00 2001 From: Ike Ku Date: Sat, 16 Sep 2017 15:47:38 +0300 Subject: [PATCH 07/12] Update styles for css --- ayu-dark.tmTheme | 49 ++++++-------------------------- ayu-light.tmTheme | 49 ++++++-------------------------- ayu-mirage.tmTheme | 49 ++++++-------------------------- src/templates/sublime.syntax.xml | 49 ++++++-------------------------- src/templates/sublime.syntax.yml | 33 ++++++--------------- src/themes/dark.yml | 1 + src/themes/light.yml | 1 + src/themes/mirage.yml | 1 + 8 files changed, 44 insertions(+), 188 deletions(-) diff --git a/ayu-dark.tmTheme b/ayu-dark.tmTheme index 857242a0..d154551f 100644 --- a/ayu-dark.tmTheme +++ b/ayu-dark.tmTheme @@ -176,7 +176,7 @@ a { settings foreground - #A7ADBA + #E6E1CFAA @@ -198,7 +198,7 @@ a { settings foreground - #A7ADBA + #E6E1CFCC @@ -209,7 +209,7 @@ a { settings foreground - #5fb3b3 + #E6E1CFCC @@ -266,7 +266,7 @@ a { settings foreground - #f9ae58 + #59C2FF @@ -279,7 +279,7 @@ a { fontStyle italic underline foreground - #5fb3b3 + #59C2FF @@ -338,7 +338,7 @@ a { settings foreground - #c594c5 + #FFB454 @@ -417,28 +417,6 @@ a { #FFFFFF - - name - YAML Key - scope - entity.name.tag.yaml - settings - - foreground - #5fb3b3 - - - - name - YAML String - scope - source.yaml string.unquoted - settings - - foreground - #D8DEE9 - - name diff.header @@ -458,7 +436,7 @@ a { settings foreground - #D8DEE9 + #39BAE6 @@ -476,7 +454,7 @@ a { settings foreground - #ec5f67 + #FF3333 @@ -600,17 +578,6 @@ a { #FF7733 - - name - Markup h1 - scope - markup.heading.1 punctuation.definition.heading - settings - - foreground - #ec5f67 - - name Markup Links diff --git a/ayu-light.tmTheme b/ayu-light.tmTheme index 353dbc61..1480e1ed 100644 --- a/ayu-light.tmTheme +++ b/ayu-light.tmTheme @@ -176,7 +176,7 @@ a { settings foreground - #A7ADBA + #6E7580AA @@ -198,7 +198,7 @@ a { settings foreground - #A7ADBA + #6E7580CC @@ -209,7 +209,7 @@ a { settings foreground - #5fb3b3 + #6E7580CC @@ -266,7 +266,7 @@ a { settings foreground - #f9ae58 + #399EE6 @@ -279,7 +279,7 @@ a { fontStyle italic underline foreground - #5fb3b3 + #399EE6 @@ -338,7 +338,7 @@ a { settings foreground - #c594c5 + #F29718 @@ -417,28 +417,6 @@ a { #FFFFFF - - name - YAML Key - scope - entity.name.tag.yaml - settings - - foreground - #5fb3b3 - - - - name - YAML String - scope - source.yaml string.unquoted - settings - - foreground - #D8DEE9 - - name diff.header @@ -458,7 +436,7 @@ a { settings foreground - #D8DEE9 + #55B4D4 @@ -476,7 +454,7 @@ a { settings foreground - #ec5f67 + #F51818 @@ -600,17 +578,6 @@ a { #FA6E32 - - name - Markup h1 - scope - markup.heading.1 punctuation.definition.heading - settings - - foreground - #ec5f67 - - name Markup Links diff --git a/ayu-mirage.tmTheme b/ayu-mirage.tmTheme index 3d19171e..e2b3b326 100644 --- a/ayu-mirage.tmTheme +++ b/ayu-mirage.tmTheme @@ -176,7 +176,7 @@ a { settings foreground - #A7ADBA + #D9D7CEAA @@ -198,7 +198,7 @@ a { settings foreground - #A7ADBA + #D9D7CECC @@ -209,7 +209,7 @@ a { settings foreground - #5fb3b3 + #D9D7CECC @@ -266,7 +266,7 @@ a { settings foreground - #f9ae58 + #73D0FF @@ -279,7 +279,7 @@ a { fontStyle italic underline foreground - #5fb3b3 + #73D0FF @@ -338,7 +338,7 @@ a { settings foreground - #c594c5 + #FFD580 @@ -417,28 +417,6 @@ a { #FFFFFF - - name - YAML Key - scope - entity.name.tag.yaml - settings - - foreground - #5fb3b3 - - - - name - YAML String - scope - source.yaml string.unquoted - settings - - foreground - #D8DEE9 - - name diff.header @@ -458,7 +436,7 @@ a { settings foreground - #D8DEE9 + #5CCFE6 @@ -476,7 +454,7 @@ a { settings foreground - #ec5f67 + #FF3333 @@ -600,17 +578,6 @@ a { #FFAE57 - - name - Markup h1 - scope - markup.heading.1 punctuation.definition.heading - settings - - foreground - #ec5f67 - - name Markup Links diff --git a/src/templates/sublime.syntax.xml b/src/templates/sublime.syntax.xml index 72caeabc..66d5f0f4 100644 --- a/src/templates/sublime.syntax.xml +++ b/src/templates/sublime.syntax.xml @@ -176,7 +176,7 @@ a { settings foreground - #A7ADBA + #"{common.fg.hex}"AA @@ -198,7 +198,7 @@ a { settings foreground - #A7ADBA + #"{common.fg.hex}"CC @@ -209,7 +209,7 @@ a { settings foreground - #5fb3b3 + #"{common.fg.hex}"CC @@ -266,7 +266,7 @@ a { settings foreground - #f9ae58 + #"{syntax.entity.hex}" @@ -279,7 +279,7 @@ a { fontStyle italic underline foreground - #5fb3b3 + #"{syntax.entity.hex}" @@ -338,7 +338,7 @@ a { settings foreground - #c594c5 + #"{syntax.func.hex}" @@ -417,28 +417,6 @@ a { #FFFFFF - - name - YAML Key - scope - entity.name.tag.yaml - settings - - foreground - #5fb3b3 - - - - name - YAML String - scope - source.yaml string.unquoted - settings - - foreground - #D8DEE9 - - name diff.header @@ -458,7 +436,7 @@ a { settings foreground - #D8DEE9 + #"{syntax.tag.hex}" @@ -476,7 +454,7 @@ a { settings foreground - #ec5f67 + #"{syntax.error.hex}" @@ -600,17 +578,6 @@ a { #"{syntax.keyword.hex}" - - name - Markup h1 - scope - markup.heading.1 punctuation.definition.heading - settings - - foreground - #ec5f67 - - name Markup Links diff --git a/src/templates/sublime.syntax.yml b/src/templates/sublime.syntax.yml index 7a0a95d0..1cea9fb7 100644 --- a/src/templates/sublime.syntax.yml +++ b/src/templates/sublime.syntax.yml @@ -93,7 +93,7 @@ settings: - name: Punctuation scope: punctuation.separator, punctuation.terminator settings: - foreground: '#A7ADBA' + foreground: '#"{common.fg.hex}"AA' - name: Punctuation scope: punctuation.section @@ -103,12 +103,12 @@ settings: - name: Accessor scope: punctuation.accessor settings: - foreground: '#A7ADBA' + foreground: '#"{common.fg.hex}"CC' - name: Annotation Punctuation scope: punctuation.definition.annotation settings: - foreground: '#5fb3b3' + foreground: '#"{common.fg.hex}"CC' - name: JavaScript Dollar scope: variable.other.dollar.only.js, variable.other.object.dollar.only.js, variable.type.dollar.only.js, @@ -135,13 +135,13 @@ settings: - name: Entity name scope: entity.name - (entity.name.section | entity.name.tag | entity.name.label) settings: - foreground: '#f9ae58' + foreground: &entity '#"{syntax.entity.hex}"' - name: Inherited class scope: entity.other.inherited-class settings: fontStyle: italic underline - foreground: '#5fb3b3' + foreground: *entity - name: Function argument scope: variable.parameter @@ -168,13 +168,13 @@ settings: - name: Tag attribute scope: entity.other.attribute-name settings: - foreground: '#c594c5' + foreground: *function - name: Function call scope: variable.function, variable.annotation settings: fontStyle: '' - foreground: '#6699cc' + foreground: '#6699cc' # TODO - name: Library function scope: support.function, support.macro @@ -205,16 +205,6 @@ settings: background: *keyword foreground: &white '#FFFFFF' -- name: YAML Key - scope: entity.name.tag.yaml - settings: - foreground: '#5fb3b3' - -- name: YAML String - scope: source.yaml string.unquoted - settings: - foreground: '#D8DEE9' - - name: diff.header scope: meta.diff, meta.diff.header settings: @@ -223,7 +213,7 @@ settings: - name: CSS Properties scope: support.type.property-name settings: - foreground: '#D8DEE9' + foreground: *tag - scope: constant.numeric.line-number.match settings: @@ -231,7 +221,7 @@ settings: - scope: message.error settings: - foreground: '#ec5f67' + foreground: *error # JSON - name: JSON Key - Level 8 @@ -290,11 +280,6 @@ settings: settings: foreground: *keyword -- name: Markup h1 - scope: markup.heading.1 punctuation.definition.heading - settings: - foreground: '#ec5f67' - - name: Markup Links scope: string.other.link, markup.underline.link settings: diff --git a/src/themes/dark.yml b/src/themes/dark.yml index fd2ca12c..eed93e36 100644 --- a/src/themes/dark.yml +++ b/src/themes/dark.yml @@ -33,6 +33,7 @@ syntax: tag: 39BAE6 func: FFB454 + entity: 59C2FF regexp: 95E6CB string: C2D94C markup: F07178 diff --git a/src/themes/light.yml b/src/themes/light.yml index e2f5f1e9..c15b31e2 100644 --- a/src/themes/light.yml +++ b/src/themes/light.yml @@ -33,6 +33,7 @@ syntax: tag: 55B4D4 func: F29718 + entity: 399EE6 regexp: 4CBF99 string: 86B300 comment: ABB0B6 diff --git a/src/themes/mirage.yml b/src/themes/mirage.yml index 66dd095f..25f679f7 100644 --- a/src/themes/mirage.yml +++ b/src/themes/mirage.yml @@ -33,6 +33,7 @@ syntax: tag: 5CCFE6 func: FFD580 + entity: 73D0FF string: BAE67E regexp: 95E6CB markup: F07178 From f1c508982d94a02632fe7964392875a9ccd3f760 Mon Sep 17 00:00:00 2001 From: Ike Ku Date: Sat, 16 Sep 2017 18:28:54 +0300 Subject: [PATCH 08/12] Update colors for functions --- README.md | 4 ++-- ayu-dark.tmTheme | 8 +++----- ayu-light.tmTheme | 14 ++++++-------- ayu-mirage.tmTheme | 8 +++----- src/templates/sublime.syntax.xml | 8 +++----- src/templates/sublime.syntax.yml | 7 +++---- src/themes/dark.yml | 2 +- src/themes/light.yml | 10 +++++----- 8 files changed, 26 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 700e6655..ed06c06c 100644 --- a/README.md +++ b/README.md @@ -37,8 +37,8 @@ "ui_font_size_small": true, // smaller UI font size(sidebar, statusbar etc) "ui_big_tabs": true, // increased tab height "ui_fix_tab_labels": true, // to fix tab labels if they look not right -"ui_font_source_code_pro": true, // use [Source Code Pro](https://fonts.google.com/specimen/Source+Code+Pro) for UI -"ui_font_default": true, // use Sublime Text's default UI font +"ui_font_source_code_pro": true, // use Source Code Pro (https://fonts.google.com/specimen/Source+Code+Pro) as UI font +"ui_font_default": true, // use Sublime's default UI font "ui_wide_scrollbars": true, // wider scrollbars ``` diff --git a/ayu-dark.tmTheme b/ayu-dark.tmTheme index d154551f..fd0b81f9 100644 --- a/ayu-dark.tmTheme +++ b/ayu-dark.tmTheme @@ -277,7 +277,7 @@ a { settings fontStyle - italic underline + underline foreground #59C2FF @@ -348,10 +348,8 @@ a { variable.function, variable.annotation settings - fontStyle - foreground - #6699cc + #FFB454 @@ -377,7 +375,7 @@ a { fontStyle italic foreground - #c594c5 + #F29668 diff --git a/ayu-light.tmTheme b/ayu-light.tmTheme index 1480e1ed..42fb9bca 100644 --- a/ayu-light.tmTheme +++ b/ayu-light.tmTheme @@ -277,7 +277,7 @@ a { settings fontStyle - italic underline + underline foreground #399EE6 @@ -348,10 +348,8 @@ a { variable.function, variable.annotation settings - fontStyle - foreground - #6699cc + #F29718 @@ -364,7 +362,7 @@ a { fontStyle italic foreground - #F07178 + #F07171 @@ -377,7 +375,7 @@ a { fontStyle italic foreground - #c594c5 + #ED9366 @@ -643,7 +641,7 @@ a { settings foreground - #F07178 + #F07171 @@ -936,7 +934,7 @@ a { settings background - #F07178 + #F07171 foreground #FFFFFF diff --git a/ayu-mirage.tmTheme b/ayu-mirage.tmTheme index e2b3b326..363b778f 100644 --- a/ayu-mirage.tmTheme +++ b/ayu-mirage.tmTheme @@ -277,7 +277,7 @@ a { settings fontStyle - italic underline + underline foreground #73D0FF @@ -348,10 +348,8 @@ a { variable.function, variable.annotation settings - fontStyle - foreground - #6699cc + #FFD580 @@ -377,7 +375,7 @@ a { fontStyle italic foreground - #c594c5 + #F29E74 diff --git a/src/templates/sublime.syntax.xml b/src/templates/sublime.syntax.xml index 66d5f0f4..6b53e809 100644 --- a/src/templates/sublime.syntax.xml +++ b/src/templates/sublime.syntax.xml @@ -277,7 +277,7 @@ a { settings fontStyle - italic underline + underline foreground #"{syntax.entity.hex}" @@ -348,10 +348,8 @@ a { variable.function, variable.annotation settings - fontStyle - foreground - #6699cc + #"{syntax.func.hex}" @@ -377,7 +375,7 @@ a { fontStyle italic foreground - #c594c5 + #"{syntax.operator.hex}" diff --git a/src/templates/sublime.syntax.yml b/src/templates/sublime.syntax.yml index 1cea9fb7..b2465166 100644 --- a/src/templates/sublime.syntax.yml +++ b/src/templates/sublime.syntax.yml @@ -140,7 +140,7 @@ settings: - name: Inherited class scope: entity.other.inherited-class settings: - fontStyle: italic underline + fontStyle: underline foreground: *entity - name: Function argument @@ -173,8 +173,7 @@ settings: - name: Function call scope: variable.function, variable.annotation settings: - fontStyle: '' - foreground: '#6699cc' # TODO + foreground: *function - name: Library function scope: support.function, support.macro @@ -186,7 +185,7 @@ settings: scope: support.constant settings: fontStyle: italic - foreground: '#c594c5' + foreground: *operator - name: Library class/type scope: support.type, support.class diff --git a/src/themes/dark.yml b/src/themes/dark.yml index eed93e36..3bbe2210 100644 --- a/src/themes/dark.yml +++ b/src/themes/dark.yml @@ -34,8 +34,8 @@ syntax: tag: 39BAE6 func: FFB454 entity: 59C2FF - regexp: 95E6CB string: C2D94C + regexp: 95E6CB markup: F07178 keyword: FF7733 special: E6B673 diff --git a/src/themes/light.yml b/src/themes/light.yml index c15b31e2..9c968e63 100644 --- a/src/themes/light.yml +++ b/src/themes/light.yml @@ -34,11 +34,11 @@ syntax: tag: 55B4D4 func: F29718 entity: 399EE6 - regexp: 4CBF99 string: 86B300 - comment: ABB0B6 - markup: F07178 - special: E6B673 + regexp: 4CBF99 + markup: F07171 keyword: FA6E32 - operator: ED9366 + special: E6B673 + comment: ABB0B6 constant: A37ACC + operator: ED9366 From c31d0ef3ac9f05bcde0639c886b16ec1e04aa4c6 Mon Sep 17 00:00:00 2001 From: Ike Ku Date: Sat, 16 Sep 2017 18:42:58 +0300 Subject: [PATCH 09/12] Update colors for find window --- ayu-dark.tmTheme | 28 ++++++++++++++++++++++++++-- ayu-light.tmTheme | 28 ++++++++++++++++++++++++++-- ayu-mirage.tmTheme | 28 ++++++++++++++++++++++++++-- gulpfile.js | 4 +--- src/templates/sublime.syntax.xml | 28 ++++++++++++++++++++++++++-- src/templates/sublime.syntax.yml | 18 +++++++++++++++--- 6 files changed, 120 insertions(+), 14 deletions(-) diff --git a/ayu-dark.tmTheme b/ayu-dark.tmTheme index fd0b81f9..9a7d20a8 100644 --- a/ayu-dark.tmTheme +++ b/ayu-dark.tmTheme @@ -82,7 +82,7 @@ a { name String scope - string + string, constant.other.symbol settings foreground @@ -438,12 +438,36 @@ a { + name + Search Results Nums + scope + constant.numeric.line-number.find-in-files - match + settings + + foreground + #5C6773 + + + + name + Search Results Match Nums scope constant.numeric.line-number.match settings foreground - #ec5f67 + #FF7733 + + + + name + Search Results Lines + scope + entity.name.filename.find-in-files + settings + + foreground + #C2D94C diff --git a/ayu-light.tmTheme b/ayu-light.tmTheme index 42fb9bca..6e5a5afa 100644 --- a/ayu-light.tmTheme +++ b/ayu-light.tmTheme @@ -82,7 +82,7 @@ a { name String scope - string + string, constant.other.symbol settings foreground @@ -438,12 +438,36 @@ a { + name + Search Results Nums + scope + constant.numeric.line-number.find-in-files - match + settings + + foreground + #ABB0B6 + + + + name + Search Results Match Nums scope constant.numeric.line-number.match settings foreground - #ec5f67 + #FA6E32 + + + + name + Search Results Lines + scope + entity.name.filename.find-in-files + settings + + foreground + #86B300 diff --git a/ayu-mirage.tmTheme b/ayu-mirage.tmTheme index 363b778f..a9f3e6f5 100644 --- a/ayu-mirage.tmTheme +++ b/ayu-mirage.tmTheme @@ -82,7 +82,7 @@ a { name String scope - string + string, constant.other.symbol settings foreground @@ -438,12 +438,36 @@ a { + name + Search Results Nums + scope + constant.numeric.line-number.find-in-files - match + settings + + foreground + #5C6773 + + + + name + Search Results Match Nums scope constant.numeric.line-number.match settings foreground - #ec5f67 + #FFAE57 + + + + name + Search Results Lines + scope + entity.name.filename.find-in-files + settings + + foreground + #BAE67E diff --git a/gulpfile.js b/gulpfile.js index e4517094..35eb84b1 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -93,6 +93,4 @@ gulp.task('themes', () => gulp.task('default', ['themes', 'widgets']) -gulp.task('watch', () => { - gulp.watch('./src/**/*', ['themes', 'widgets']) -}) +gulp.task('watch', () => gulp.watch('./src/**/*', ['themes', 'widgets'])) diff --git a/src/templates/sublime.syntax.xml b/src/templates/sublime.syntax.xml index 6b53e809..6334c834 100644 --- a/src/templates/sublime.syntax.xml +++ b/src/templates/sublime.syntax.xml @@ -82,7 +82,7 @@ a { name String scope - string + string, constant.other.symbol settings foreground @@ -438,12 +438,36 @@ a { + name + Search Results Nums + scope + constant.numeric.line-number.find-in-files - match + settings + + foreground + #"{syntax.comment.hex}" + + + + name + Search Results Match Nums scope constant.numeric.line-number.match settings foreground - #ec5f67 + #"{syntax.keyword.hex}" + + + + name + Search Results Lines + scope + entity.name.filename.find-in-files + settings + + foreground + #"{syntax.string.hex}" diff --git a/src/templates/sublime.syntax.yml b/src/templates/sublime.syntax.yml index b2465166..1ccc789d 100644 --- a/src/templates/sublime.syntax.yml +++ b/src/templates/sublime.syntax.yml @@ -50,7 +50,7 @@ settings: foreground: &comment '#"{syntax.comment.hex}"' - name: String - scope: string + scope: string, constant.other.symbol settings: foreground: &string '#"{syntax.string.hex}"' @@ -214,9 +214,21 @@ settings: settings: foreground: *tag -- scope: constant.numeric.line-number.match +- name: Search Results Nums + scope: constant.numeric.line-number.find-in-files - match settings: - foreground: '#ec5f67' + foreground: *comment + +- name: Search Results Match Nums + scope: constant.numeric.line-number.match + settings: + foreground: *keyword + +- name: Search Results Lines + scope: entity.name.filename.find-in-files + settings: + foreground: *string + - scope: message.error settings: From f76c9227b9d616fbad69bc9ebf3c8a0dbac398cb Mon Sep 17 00:00:00 2001 From: Ike Ku Date: Sat, 16 Sep 2017 18:53:44 +0300 Subject: [PATCH 10/12] Update markup for mirage --- ayu-dark.tmTheme | 2 +- ayu-light.tmTheme | 2 +- ayu-mirage.tmTheme | 8 ++++---- src/templates/sublime.syntax.xml | 2 +- src/templates/sublime.syntax.yml | 2 +- src/themes/mirage.yml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ayu-dark.tmTheme b/ayu-dark.tmTheme index 9a7d20a8..daf1e454 100644 --- a/ayu-dark.tmTheme +++ b/ayu-dark.tmTheme @@ -176,7 +176,7 @@ a { settings foreground - #E6E1CFAA + #E6E1CFCC diff --git a/ayu-light.tmTheme b/ayu-light.tmTheme index 6e5a5afa..bee7c4d4 100644 --- a/ayu-light.tmTheme +++ b/ayu-light.tmTheme @@ -176,7 +176,7 @@ a { settings foreground - #6E7580AA + #6E7580CC diff --git a/ayu-mirage.tmTheme b/ayu-mirage.tmTheme index a9f3e6f5..a3bba296 100644 --- a/ayu-mirage.tmTheme +++ b/ayu-mirage.tmTheme @@ -176,7 +176,7 @@ a { settings foreground - #D9D7CEAA + #D9D7CECC @@ -362,7 +362,7 @@ a { fontStyle italic foreground - #F07178 + #F28779 @@ -665,7 +665,7 @@ a { settings foreground - #F07178 + #F28779 @@ -958,7 +958,7 @@ a { settings background - #F07178 + #F28779 foreground #FFFFFF diff --git a/src/templates/sublime.syntax.xml b/src/templates/sublime.syntax.xml index 6334c834..86359b83 100644 --- a/src/templates/sublime.syntax.xml +++ b/src/templates/sublime.syntax.xml @@ -176,7 +176,7 @@ a { settings foreground - #"{common.fg.hex}"AA + #"{common.fg.hex}"CC diff --git a/src/templates/sublime.syntax.yml b/src/templates/sublime.syntax.yml index 1ccc789d..b3c19851 100644 --- a/src/templates/sublime.syntax.yml +++ b/src/templates/sublime.syntax.yml @@ -93,7 +93,7 @@ settings: - name: Punctuation scope: punctuation.separator, punctuation.terminator settings: - foreground: '#"{common.fg.hex}"AA' + foreground: '#"{common.fg.hex}"CC' - name: Punctuation scope: punctuation.section diff --git a/src/themes/mirage.yml b/src/themes/mirage.yml index 25f679f7..834b756a 100644 --- a/src/themes/mirage.yml +++ b/src/themes/mirage.yml @@ -36,7 +36,7 @@ syntax: entity: 73D0FF string: BAE67E regexp: 95E6CB - markup: F07178 + markup: F28779 keyword: FFAE57 special: FFC44C comment: 5C6773 From 9453285cbd6a43e521bb5e89ef5609f0d0de1e03 Mon Sep 17 00:00:00 2001 From: Ike Ku Date: Sat, 16 Sep 2017 19:48:27 +0300 Subject: [PATCH 11/12] Last touches before update --- README.md | 2 +- ayu-dark.tmTheme | 23 +++++++++++---- ayu-light.tmTheme | 23 +++++++++++---- ayu-mirage.tmTheme | 43 +++++++++++++++++++---------- messages.json | 3 +- messages/3.1.0.md | 11 ++++++++ src/templates/old.yaml | 2 +- src/templates/sublime.syntax.xml | 25 +++++++++++++---- src/templates/sublime.syntax.yml | 13 ++++----- src/templates/widget.xml | 2 +- src/themes/dark.yml | 2 +- src/themes/light.yml | 2 +- src/themes/mirage.yml | 8 +++--- widgets/Widget - ayu-mirage.stTheme | 2 +- 14 files changed, 112 insertions(+), 49 deletions(-) create mode 100644 messages/3.1.0.md diff --git a/README.md b/README.md index ed06c06c..c5566766 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![ayu](https://i.imgur.com/M1JfmKF.png) +![ayu](https://i.imgur.com/zDJHi5D.png) `ayu` is a simple theme with bright colors and comes in three versions — *dark*, *mirage* and *light* for all day long comfortable work. diff --git a/ayu-dark.tmTheme b/ayu-dark.tmTheme index daf1e454..8412cdae 100644 --- a/ayu-dark.tmTheme +++ b/ayu-dark.tmTheme @@ -198,7 +198,7 @@ a { settings foreground - #E6E1CFCC + #F29668 @@ -479,6 +479,19 @@ a { #FF3333 + + name + Decorators + scope + tag.decorator.js entity.name.tag.js, tag.decorator.js punctuation.definition.tag.js + settings + + fontStyle + italic + foreground + #F07178 + + name JSON Key - Level 8 @@ -764,7 +777,7 @@ a { name - Markup - Strike + Markup Strike scope markup.strike settings @@ -775,7 +788,7 @@ a { name - Markup - Table + Markup Table scope markup.table settings @@ -788,13 +801,13 @@ a { name - Markdown - Markup Raw Inline + Markup Raw Inline scope text.html.markdown markup.raw.inline settings foreground - #39BAE6 + #F29668 diff --git a/ayu-light.tmTheme b/ayu-light.tmTheme index bee7c4d4..870a58b7 100644 --- a/ayu-light.tmTheme +++ b/ayu-light.tmTheme @@ -198,7 +198,7 @@ a { settings foreground - #6E7580CC + #ED9366 @@ -479,6 +479,19 @@ a { #F51818 + + name + Decorators + scope + tag.decorator.js entity.name.tag.js, tag.decorator.js punctuation.definition.tag.js + settings + + fontStyle + italic + foreground + #F07171 + + name JSON Key - Level 8 @@ -764,7 +777,7 @@ a { name - Markup - Strike + Markup Strike scope markup.strike settings @@ -775,7 +788,7 @@ a { name - Markup - Table + Markup Table scope markup.table settings @@ -788,13 +801,13 @@ a { name - Markdown - Markup Raw Inline + Markup Raw Inline scope text.html.markdown markup.raw.inline settings foreground - #55B4D4 + #ED9366 diff --git a/ayu-mirage.tmTheme b/ayu-mirage.tmTheme index a3bba296..d93b2411 100644 --- a/ayu-mirage.tmTheme +++ b/ayu-mirage.tmTheme @@ -18,7 +18,7 @@ accent #FFCC66 activeGuide - #606F80 + #737D87 background #212733 caret @@ -30,11 +30,11 @@ foreground #D9D7CE guide - #3D4752 + #434E59 gutter #212733 gutterForeground - #3D4752 + #434E59 inactiveBackground #212733 inactiveSelection @@ -154,7 +154,7 @@ a { settings foreground - #FFAE57 + #FFA759 @@ -198,7 +198,7 @@ a { settings foreground - #D9D7CECC + #F29E74 @@ -231,7 +231,7 @@ a { settings foreground - #FFAE57 + #FFA759 @@ -244,7 +244,7 @@ a { fontStyle italic foreground - #FFAE57 + #FFA759 @@ -410,7 +410,7 @@ a { settings background - #FFAE57 + #FFA759 foreground #FFFFFF @@ -456,7 +456,7 @@ a { settings foreground - #FFAE57 + #FFA759 @@ -479,6 +479,19 @@ a { #FF3333 + + name + Decorators + scope + tag.decorator.js entity.name.tag.js, tag.decorator.js punctuation.definition.tag.js + settings + + fontStyle + italic + foreground + #F28779 + + name JSON Key - Level 8 @@ -597,7 +610,7 @@ a { settings foreground - #FFAE57 + #FFA759 @@ -764,7 +777,7 @@ a { name - Markup - Strike + Markup Strike scope markup.strike settings @@ -775,7 +788,7 @@ a { name - Markup - Table + Markup Table scope markup.table settings @@ -788,13 +801,13 @@ a { name - Markdown - Markup Raw Inline + Markup Raw Inline scope text.html.markdown markup.raw.inline settings foreground - #5CCFE6 + #F29E74 @@ -945,7 +958,7 @@ a { settings background - #FFAE57 + #FFA759 foreground #FFFFFF diff --git a/messages.json b/messages.json index 21bced91..2808a774 100644 --- a/messages.json +++ b/messages.json @@ -15,5 +15,6 @@ "2.2.1": "messages/2.2.1.txt", "2.2.2": "messages/2.2.2.txt", "3.0.0": "messages/3.0.0.md", - "3.0.1": "messages/3.0.1.md" + "3.0.1": "messages/3.0.1.md", + "3.1.0": "messages/3.1.0.md" } diff --git a/messages/3.1.0.md b/messages/3.1.0.md new file mode 100644 index 00000000..b1eb4c51 --- /dev/null +++ b/messages/3.1.0.md @@ -0,0 +1,11 @@ +**ayu theme for Sublime Text** +https://github.com/dempfi/ayu/releases + +# Version 3.1.0 +ayu from version 3.0.0 supports customization via A File Icon package +(https://github.com/ihodev/a-file-icon). Please install it for better expereince. + +CHANGES +================================================================================ +🌈 Massive update to syntax highlighning and contrast of all 3 themes. + diff --git a/src/templates/old.yaml b/src/templates/old.yaml index 530b0558..6b2f2bae 100644 --- a/src/templates/old.yaml +++ b/src/templates/old.yaml @@ -25,7 +25,7 @@ settings: gutter: *bg gutterForeground: *gutter invisibles: '#FF0000' - lineHighlight: '#"{syntax.line_hg.hex}"' + lineHighlight: '#"{syntax.line.hex}"' selection: &selection '#"{syntax.selection.hex}"' selectionBorder: *selection inactiveSelection: '#"{syntax.selection.hex}"88' diff --git a/src/templates/sublime.syntax.xml b/src/templates/sublime.syntax.xml index 86359b83..76038589 100644 --- a/src/templates/sublime.syntax.xml +++ b/src/templates/sublime.syntax.xml @@ -42,7 +42,7 @@ invisibles #FF0000 lineHighlight - #"{syntax.line_hg.hex}" + #"{syntax.line.hex}" popupCss html, body { background-color: #"{ui.panel.bg.hex}"; @@ -198,7 +198,7 @@ a { settings foreground - #"{common.fg.hex}"CC + #"{syntax.operator.hex}" @@ -479,6 +479,19 @@ a { #"{syntax.error.hex}" + + name + Decorators + scope + tag.decorator.js entity.name.tag.js, tag.decorator.js punctuation.definition.tag.js + settings + + fontStyle + italic + foreground + #"{syntax.markup.hex}" + + name JSON Key - Level 8 @@ -764,7 +777,7 @@ a { name - Markup - Strike + Markup Strike scope markup.strike settings @@ -775,7 +788,7 @@ a { name - Markup - Table + Markup Table scope markup.table settings @@ -788,13 +801,13 @@ a { name - Markdown - Markup Raw Inline + Markup Raw Inline scope text.html.markdown markup.raw.inline settings foreground - #"{syntax.tag.hex}" + #"{syntax.operator.hex}" diff --git a/src/templates/sublime.syntax.yml b/src/templates/sublime.syntax.yml index b3c19851..0153b087 100644 --- a/src/templates/sublime.syntax.yml +++ b/src/templates/sublime.syntax.yml @@ -25,7 +25,7 @@ settings: gutter: *bg gutterForeground: *gutter invisibles: '#FF0000' - lineHighlight: '#"{syntax.line_hg.hex}"' + lineHighlight: '#"{syntax.line.hex}"' selection: &selection '#"{syntax.selection.hex}"' selectionBorder: *selection inactiveSelection: '#"{syntax.selection.hex}"88' @@ -103,7 +103,7 @@ settings: - name: Accessor scope: punctuation.accessor settings: - foreground: '#"{common.fg.hex}"CC' + foreground: *operator - name: Annotation Punctuation scope: punctuation.definition.annotation @@ -229,7 +229,6 @@ settings: settings: foreground: *string - - scope: message.error settings: foreground: *error @@ -365,21 +364,21 @@ settings: settings: foreground: *error -- name: Markup - Strike +- name: Markup Strike scope: markup.strike settings: foreground: *special -- name: Markup - Table +- name: Markup Table scope: markup.table settings: background: '#"{common.fg.hex}"10' foreground: *tag -- name: Markdown - Markup Raw Inline +- name: Markup Raw Inline scope: text.html.markdown markup.raw.inline settings: - foreground: *tag + foreground: *operator - name: Markdown - Line Break scope: text.html.markdown meta.dummy.line-break diff --git a/src/templates/widget.xml b/src/templates/widget.xml index 5fb38cba..b2325f57 100644 --- a/src/templates/widget.xml +++ b/src/templates/widget.xml @@ -29,7 +29,7 @@ invisibles #343434 lineHighlight - #"{syntax.line_hg.hex}" + #"{syntax.line.hex}" selection #"{syntax.selection.hex}" selectionBorder diff --git a/src/themes/dark.yml b/src/themes/dark.yml index 3bbe2210..4d1148ef 100644 --- a/src/themes/dark.yml +++ b/src/themes/dark.yml @@ -24,8 +24,8 @@ ui: opacity: '0.3' syntax: + line: 151A1F error: FF3333 - line_hg: 151A1F gutter: 35404C selection: '253340' stack_guide: 1A2633 diff --git a/src/themes/light.yml b/src/themes/light.yml index 9c968e63..fa929ac5 100644 --- a/src/themes/light.yml +++ b/src/themes/light.yml @@ -24,8 +24,8 @@ ui: opacity: '0.2' syntax: + line: F2F2F2 error: F51818 - line_hg: F2F2F2 gutter: D9D8D7 selection: F0EEE4 stack_guide: DEDDDC diff --git a/src/themes/mirage.yml b/src/themes/mirage.yml index 834b756a..37b32a2f 100644 --- a/src/themes/mirage.yml +++ b/src/themes/mirage.yml @@ -24,12 +24,12 @@ ui: opacity: '0.3' syntax: + line: '242B38' error: FF3333 - gutter: 3D4752 - line_hg: '242B38' + gutter: '434E59' selection: '343F4C' stack_guide: '39434D' - active_guide: '606F80' + active_guide: '737D87' tag: 5CCFE6 func: FFD580 @@ -37,7 +37,7 @@ syntax: string: BAE67E regexp: 95E6CB markup: F28779 - keyword: FFAE57 + keyword: FFA759 special: FFC44C comment: 5C6773 constant: D4BFFF diff --git a/widgets/Widget - ayu-mirage.stTheme b/widgets/Widget - ayu-mirage.stTheme index 51a75166..28054674 100644 --- a/widgets/Widget - ayu-mirage.stTheme +++ b/widgets/Widget - ayu-mirage.stTheme @@ -57,7 +57,7 @@ settings foreground - #FFAE57 + #FFA759 From ed7a5282f33d355056232440116ed94ed5379681 Mon Sep 17 00:00:00 2001 From: Ike Ku Date: Sun, 17 Sep 2017 01:59:33 +0300 Subject: [PATCH 12/12] Update screenshots in readme --- README.md | 6 +- ayu-dark.sublime-theme | 2 +- ayu-dark.tmTheme | 13 - ayu-light.sublime-theme | 2 +- ayu-light.tmTheme | 13 - ayu-mirage.sublime-theme | 2 +- ayu-mirage.tmTheme | 13 - src/templates/old.yaml | 413 ------------------------------- src/templates/sublime.syntax.xml | 13 - src/templates/sublime.ui.json | 2 +- 10 files changed, 7 insertions(+), 472 deletions(-) delete mode 100644 src/templates/old.yaml diff --git a/README.md b/README.md index c5566766..40fe6755 100644 --- a/README.md +++ b/README.md @@ -14,20 +14,20 @@
Light with ui_separator option on
-![Light with separators on](https://i.imgur.com/HP4EqoZ.png) +![Light with separators on](https://i.imgur.com/xiiPGbC.png) ---
Mirage with ui_separator option off
-![Mirage with separators off](https://i.imgur.com/GJpZ2yT.png) +![Mirage with separators off](https://i.imgur.com/IYmV8Wb.png) ---
Dark with ui_separator option on
-![Dark with separators on](https://i.imgur.com/ruMY2eJ.png) +![Dark with separators on](https://i.imgur.com/YrNneOD.png) ### Settings diff --git a/ayu-dark.sublime-theme b/ayu-dark.sublime-theme index 46911727..f5a35c0d 100644 --- a/ayu-dark.sublime-theme +++ b/ayu-dark.sublime-theme @@ -1383,7 +1383,7 @@ { "class": "title_bar", "bg": [15, 20, 25], - "fg": [81, 92, 102] + "fg": [230, 225, 207] }, { "class": "title_bar", diff --git a/ayu-dark.tmTheme b/ayu-dark.tmTheme index 8412cdae..7b93a214 100644 --- a/ayu-dark.tmTheme +++ b/ayu-dark.tmTheme @@ -479,19 +479,6 @@ a { #FF3333 - - name - Decorators - scope - tag.decorator.js entity.name.tag.js, tag.decorator.js punctuation.definition.tag.js - settings - - fontStyle - italic - foreground - #F07178 - - name JSON Key - Level 8 diff --git a/ayu-light.sublime-theme b/ayu-light.sublime-theme index cd378e5c..8f5f86a7 100644 --- a/ayu-light.sublime-theme +++ b/ayu-light.sublime-theme @@ -1383,7 +1383,7 @@ { "class": "title_bar", "bg": [250, 250, 250], - "fg": [133, 136, 140] + "fg": [110, 117, 128] }, { "class": "title_bar", diff --git a/ayu-light.tmTheme b/ayu-light.tmTheme index 870a58b7..42318992 100644 --- a/ayu-light.tmTheme +++ b/ayu-light.tmTheme @@ -479,19 +479,6 @@ a { #F51818 - - name - Decorators - scope - tag.decorator.js entity.name.tag.js, tag.decorator.js punctuation.definition.tag.js - settings - - fontStyle - italic - foreground - #F07171 - - name JSON Key - Level 8 diff --git a/ayu-mirage.sublime-theme b/ayu-mirage.sublime-theme index 34405359..59fc3c48 100644 --- a/ayu-mirage.sublime-theme +++ b/ayu-mirage.sublime-theme @@ -1383,7 +1383,7 @@ { "class": "title_bar", "bg": [33, 39, 51], - "fg": [115, 134, 153] + "fg": [217, 215, 206] }, { "class": "title_bar", diff --git a/ayu-mirage.tmTheme b/ayu-mirage.tmTheme index d93b2411..77865c39 100644 --- a/ayu-mirage.tmTheme +++ b/ayu-mirage.tmTheme @@ -479,19 +479,6 @@ a { #FF3333 - - name - Decorators - scope - tag.decorator.js entity.name.tag.js, tag.decorator.js punctuation.definition.tag.js - settings - - fontStyle - italic - foreground - #F28779 - - name JSON Key - Level 8 diff --git a/src/templates/old.yaml b/src/templates/old.yaml deleted file mode 100644 index 6b2f2bae..00000000 --- a/src/templates/old.yaml +++ /dev/null @@ -1,413 +0,0 @@ -# [PackageDev] target_format: plist, ext: xml -# prefix="" -# sublime="" -# ext="yml" ---- - -name: ayu -author: Ike Ku -uuid: 0e709986-46a0-40a0-b3bf-c8dfe525c455 -colorSpaceName: sRGB -semanticClass: ayu."{theme}" - -settings: - -- settings: - activeGuide: '#"{syntax.active_guide.hex}"' - background: &bg '#"{common.bg.hex}"' - inactiveBackground: *bg - caret: &accent '#"{common.accent.hex}"' - findHighlight: &constant '#"{syntax.constant.hex}"' - findHighlightForeground: *bg - foreground: &fg '#"{common.fg.hex}"' - guide: &gutter '#"{syntax.gutter.hex}"' - accent: *accent - gutter: *bg - gutterForeground: *gutter - invisibles: '#FF0000' - lineHighlight: '#"{syntax.line.hex}"' - selection: &selection '#"{syntax.selection.hex}"' - selectionBorder: *selection - inactiveSelection: '#"{syntax.selection.hex}"88' - shadow: '#00000010' - stackGuide: '#"{syntax.stack_guide.hex}"' - popupCss: | - html, body { - background-color: #"{ui.panel.bg.hex}"; - color: #"{common.fg.hex}"; - } - body { - padding: 1px 3px; - } - a { - color: rgba("{syntax.tag.rgb}", .7); - } - -- name: Comments - scope: comment, punctuation.definition.comment - settings: - fontStyle: italic - foreground: &comment '#"{syntax.comment.hex}"' - -# Punctuation -- name: Separators, Comma and alike - scope: punctuation.separator, punctuation.terminator - settings: - foreground: '#"{common.fg.hex}"dd' - -- name: Variable - scope: variable - settings: - foreground: *fg - -- name: Keyword, Storage - scope: keyword, storage.type, storage.modifier - settings: - foreground: &keyword '#"{syntax.keyword.hex}"' - -- name: Operator, Misc - scope: constant.other.color, meta.tag, punctuation.separator.inheritance.php, punctuation.section.embedded, keyword.other.substitution - settings: - foreground: &operator '#"{syntax.operator.hex}"' - -- name: Tag - scope: entity.name.tag, meta.tag.sgml - settings: - foreground: &tag '#"{syntax.tag.hex}"' - -- name: Function, Special Method, Block Level - scope: entity.name.function, meta.function-call, variable.function, support.function, keyword.other.special-method, meta.block-level - settings: - foreground: &function '#"{syntax.func.hex}"' - -- name: Other Variable, String Link - scope: support.other.variable, string.other.link - settings: - foreground: &markup '#"{syntax.markup.hex}"' - -- name: Number, Constant, Function Argument, Tag Attribute, Embedded - scope: constant.numeric, constant.language, support.constant, constant.character, variable.parameter, keyword.other.unit - settings: - foreground: *constant - -- name: String, Symbols, Inherited Class - scope: string, keyword.other.template, constant.other.symbol, constant.other.key, entity.other.inherited-class, meta.group.braces.curly constant.other.object.key.js string.unquoted.label.js - settings: - fontStyle: normal - foreground: &string '#"{syntax.string.hex}"' - -- name: Class, Support - scope: entity.name.class, entity.name.type.class, support.type, support.class, support.orther.namespace.use.php, meta.use.php, support.other.namespace.php - settings: - foreground: *tag - -- name: Sub-methods - scope: entity.name.module.js, variable.import.parameter.js, variable.other.class.js - settings: - foreground: *tag - -- name: Language methods - scope: variable.language - settings: - fontStyle: italic - foreground: *tag - -- name: Invalid - scope: invalid - settings: - foreground: &error '#"{syntax.error.hex}"' - -- name: Deprecated - scope: invalid.deprecated - settings: - background: *keyword - foreground: &white '#FFFFFF' - -- name: Html punctuations tags - scope: punctuation.definition.tag.end, punctuation.definition.tag.begin, punctuation.definition.tag - settings: - foreground: '#"{syntax.tag.hex}"90' # opacity of tag verson of &tag_punctag - -- name: Attributes - scope: entity.other.attribute-name - settings: - foreground: *keyword - -- name: Regular Expressions and Escape Characters - scope: string.regexp, constant.character.escape - settings: - foreground: ®exp '#"{syntax.regexp.hex}"' - -- name: URL - scope: '*url*, *link*, *uri*' - settings: - fontStyle: underline - -- name: Search Results Nums - scope: constant.numeric.line-number.find-in-files - match - settings: - foreground: *comment - -- name: Search Results Lines - scope: entity.name.filename.find-in-files - settings: - foreground: *string - -# ES6 -- name: Decorators - scope: tag.decorator.js entity.name.tag.js, tag.decorator.js punctuation.definition.tag.js - settings: - fontStyle: italic - foreground: &special '#"{syntax.special.hex}"' - -- name: ES7 Bind Operator - scope: source.js constant.other.object.key.js string.unquoted.label.js - settings: - fontStyle: italic - foreground: *tag - -- name: entity.name.method.js - scope: entity.name.method.js - settings: - fontStyle: italic - foreground: *special - -- name: meta.method.js - scope: meta.class-method.js entity.name.function.js, variable.function.constructor - settings: - foreground: *special - -# JSON -- name: JSON Key - Level 8 - scope: source.json meta meta meta meta meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string - settings: - foreground: *tag - -- name: JSON Key - Level 7 - scope: source.json meta meta meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string - settings: - foreground: *tag - -- name: JSON Key - Level 6 - scope: source.json meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string - settings: - foreground: *tag - -- name: JSON Key - Level 5 - scope: source.json meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string - settings: - foreground: *tag - -- name: JSON Key - Level 4 - scope: source.json meta meta meta meta meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string - settings: - foreground: *tag - -- name: JSON Key - Level 3 - scope: source.json meta meta meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string - settings: - foreground: *tag - -- name: JSON Key - Level 2 - scope: source.json meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string - settings: - foreground: *tag - -- name: JSON Key - Level 1 - scope: source.json meta meta.structure.dictionary.json string.quoted.double.json - meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta.structure.dictionary.json punctuation.definition.string - meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string - settings: - foreground: *tag - -- name: JSON Key - Level 0 - scope: source.json meta.structure.dictionary.json string.quoted.double.json - meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta.structure.dictionary.json punctuation.definition.string - meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string - settings: - foreground: *tag - -# Markup and Markdown -- name: Markup Heading - scope: markup.heading - settings: - fontStyle: bold - -- name: Markup headings - scope: markup.heading punctuation.definition.heading - settings: - foreground: *keyword - -- name: Markup h1 - scope: markup.heading.1 punctuation.definition.heading - settings: - foreground: '#ec5f67' - -- name: Markup Links - scope: string.other.link, markup.underline.link - settings: - foreground: *operator - -- name: Markup Italic - scope: markup.italic - settings: - fontStyle: italic - -- name: Markup Bold - scope: markup.bold - settings: - fontStyle: bold - -- name: Markup Bold/italic - scope: markup.italic markup.bold | markup.bold markup.italic - settings: - fontStyle: bold italic - -- name: Markup punctuation - scope: (text punctuation.definition.italic | text punctuation.definition.bold) - settings: - foreground: *markup - -- name: Markup Code - scope: markup.raw - settings: - background: '#"{common.fg.hex}"07' - -- name: Markup Code Inline - scope: markup.raw.inline - settings: - background: '#"{common.fg.hex}"10' - -- name: Markdown Separator - scope: meta.separator - settings: - background: '#"{common.fg.hex}"10' - fontStyle: bold - foreground: *comment - -- name: Markup Blockquote - scope: markup.quote - settings: - foreground: *constant - fontStyle: italic - -- name: Markup List Bullet - scope: markup.list.numbered.bullet, markup.list punctuation.definition.list_item - settings: - foreground: *regexp - -- name: Markup Inserted - scope: markup.inserted - settings: - foreground: *string - -- name: Markup Deleted - scope: markup.deleted - settings: - foreground: *keyword - -- name: Markup - Strike - scope: markup.strike - settings: - foreground: *special - -- name: Markup - Table - scope: markup.table - settings: - background: '#3cadd71a' - foreground: *tag - -- name: Markdown - Markup Raw Inline - scope: text.html.markdown markup.raw.inline - settings: - foreground: *tag - -- name: Markdown - Line Break - scope: text.html.markdown meta.dummy.line-break - settings: - foreground: *comment - -- name: Markdown - Raw Block Fenced - scope: markup.raw.block.fenced.markdown - settings: - background: '#"{common.fg.hex}"10' - foreground: *fg - -- name: Markdown - Fenced Bode Block - scope: punctuation.definition.fenced.markdown, variable.language.fenced.markdown - settings: - background: '#"{common.fg.hex}"10' - foreground: *comment - -- name: Markdown - Fenced Language - scope: variable.language.fenced.markdown - settings: - foreground: *comment - -# GitGutter -- name: GitGutter Added - scope: markup.inserted.git_gutter - settings: - foreground: *string - -- name: GitGutter Changed - scope: markup.changed.git_gutter - settings: - foreground: *tag - -- name: GitGutter Deleted - scope: markup.deleted.git_gutter - settings: - foreground: *keyword - -- name: GitGutter Ignored - scope: markup.ignored.git_gutter - settings: - foreground: *comment - -- name: GitGutter Untracked - scope: markup.untracked.git_gutter - settings: - foreground: *comment - -- name: GutterColor - scope: gutter_color - settings: - foreground: *white - -# AceJump -- name: AceJump Label - Blue - scope: acejump.label.blue - settings: - background: *tag - foreground: *white - -- name: AceJump Label - Green - scope: acejump.label.green - settings: - background: *string - foreground: *white - -- name: AceJump Label - Orange - scope: acejump.label.orange - settings: - background: *keyword - foreground: *white - -- name: AceJump Label - Purple - scope: acejump.label.purple - settings: - background: *markup - foreground: *white - -# SublimeLinter -- name: SublimeLinter Warning - scope: sublimelinter.mark.warning - settings: - foreground: *tag - -- name: SublimeLinter Gutter Mark - scope: sublimelinter.gutter-mark - settings: - foreground: *white - -- name: SublimeLinter Error - scope: sublimelinter.mark.error - settings: - foreground: *error diff --git a/src/templates/sublime.syntax.xml b/src/templates/sublime.syntax.xml index 76038589..b2cea919 100644 --- a/src/templates/sublime.syntax.xml +++ b/src/templates/sublime.syntax.xml @@ -479,19 +479,6 @@ a { #"{syntax.error.hex}" - - name - Decorators - scope - tag.decorator.js entity.name.tag.js, tag.decorator.js punctuation.definition.tag.js - settings - - fontStyle - italic - foreground - #"{syntax.markup.hex}" - - name JSON Key - Level 8 diff --git a/src/templates/sublime.ui.json b/src/templates/sublime.ui.json index 05944293..4c638dc8 100644 --- a/src/templates/sublime.ui.json +++ b/src/templates/sublime.ui.json @@ -1383,7 +1383,7 @@ { "class": "title_bar", "bg": ["{common.bg.rgb}"], - "fg": ["{ui.fg.rgb}"] + "fg": ["{common.fg.rgb}"] }, { "class": "title_bar",