diff --git a/README.md b/README.md index 700e6655..40fe6755 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. @@ -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 @@ -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.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 6751bfea..7b93a214 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 @@ -67,7 +67,7 @@ a { name - Comments + Comment scope comment, punctuation.definition.comment settings @@ -80,278 +80,403 @@ a { name - Separators, Comma and alike + String scope - punctuation.separator, punctuation.terminator + string, constant.other.symbol settings foreground - #E6E1CFdd + #C2D94C name - Variable + Number scope - variable + constant.numeric settings foreground - #E6E1CF + #FFEE99 name - Keyword, Storage + Regular Expressions and Escape Characters scope - keyword, storage.type, storage.modifier + string.regexp, constant.character.escape settings foreground - #FF7733 + #95E6CB name - Operator, Misc + Built-in constant scope - constant.other.color, meta.tag, punctuation.separator.inheritance.php, punctuation.section.embedded, keyword.other.substitution + constant.language settings + fontStyle + italic foreground - #E7C547 + #FFEE99 name - Tag + User-defined constant scope - entity.name.tag, meta.tag.sgml + constant.character, constant.other settings foreground - #50B4E6 + #FFEE99 name - Function, Special Method, Block Level + Member Variable scope - entity.name.function, meta.function-call, variable.function, support.function, keyword.other.special-method, meta.block-level + variable.member settings foreground - #FFB454 + #ec5f67 name - Other Variable, String Link + Keyword scope - support.other.variable, string.other.link + keyword - keyword.operator, keyword.operator.word settings foreground - #F07178 + #FF7733 name - Number, Constant, Function Argument, Tag Attribute, Embedded + Operators scope - constant.numeric, constant.language, support.constant, constant.character, variable.parameter, keyword.other.unit + keyword.operator settings foreground - #FFEE99 + #F29668 name - String, Symbols, Inherited Class + Punctuation 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 + punctuation.separator, punctuation.terminator settings - fontStyle - normal foreground - #C2D94C + #E6E1CFCC 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 - #50B4E6 + #E6E1CF name - Sub-methods + Accessor scope - entity.name.module.js, variable.import.parameter.js, variable.other.class.js + punctuation.accessor settings foreground - #50B4E6 + #F29668 name - Language methods + Annotation Punctuation scope - variable.language + punctuation.definition.annotation + settings + + foreground + #E6E1CFCC + + + + 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 + #59C2FF name - Html punctuations tags + Inherited class scope - punctuation.definition.tag.end, punctuation.definition.tag.begin, punctuation.definition.tag + entity.other.inherited-class settings + fontStyle + underline foreground - #50B4E690 + #59C2FF name - Attributes + Function argument scope - entity.other.attribute-name + variable.parameter settings foreground - #FF7733 + #FFEE99 name - Regular Expressions and Escape Characters + Language variable scope - string.regexp, constant.character.escape + variable.language settings + fontStyle + italic foreground - #95E6CB + #39BAE6 name - URL + Tag scope - *url*, *link*, *uri* + entity.name.tag, meta.tag.sgml settings fontStyle - underline + + foreground + #39BAE6 name - Search Results Nums + Tag start/end scope - constant.numeric.line-number.find-in-files - match + punctuation.definition.tag.end, punctuation.definition.tag.begin, punctuation.definition.tag settings foreground - #5C6773 + #39BAE690 name - Search Results Lines + Tag attribute scope - entity.name.filename.find-in-files + entity.other.attribute-name settings foreground - #C2D94C + #FFB454 name - Decorators + Function call scope - tag.decorator.js entity.name.tag.js, tag.decorator.js punctuation.definition.tag.js + variable.function, variable.annotation + settings + + foreground + #FFB454 + + + + name + Library function + scope + 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 + #F29668 name - entity.name.method.js + Library class/type scope - entity.name.method.js + support.type, support.class settings fontStyle italic foreground - #E6B673 + #39BAE6 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 + diff.header + scope + meta.diff, meta.diff.header + settings + + foreground + #c594c5 + + + + name + CSS Properties + scope + support.type.property-name + settings + + foreground + #39BAE6 + + + + 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 + #FF7733 + + + + name + Search Results Lines + scope + entity.name.filename.find-in-files + settings + + foreground + #C2D94C + + + + scope + message.error + settings + + foreground + #FF3333 @@ -362,7 +487,7 @@ a { settings foreground - #50B4E6 + #39BAE6 @@ -373,7 +498,7 @@ a { settings foreground - #50B4E6 + #39BAE6 @@ -384,7 +509,7 @@ a { settings foreground - #50B4E6 + #39BAE6 @@ -395,7 +520,7 @@ a { settings foreground - #50B4E6 + #39BAE6 @@ -406,7 +531,7 @@ a { settings foreground - #50B4E6 + #39BAE6 @@ -417,7 +542,7 @@ a { settings foreground - #50B4E6 + #39BAE6 @@ -428,7 +553,7 @@ a { settings foreground - #50B4E6 + #39BAE6 @@ -439,7 +564,7 @@ a { settings foreground - #50B4E6 + #39BAE6 @@ -450,7 +575,7 @@ a { settings foreground - #50B4E6 + #39BAE6 @@ -477,24 +602,26 @@ a { name - Markup h1 + Markup Links scope - markup.heading.1 punctuation.definition.heading + string.other.link, markup.underline.link settings + fontStyle + italic underline foreground - #ec5f67 + #95E6CB name - Markup Links + Markup image scope - string.other.link, markup.underline.link + punctuation.definition.image settings foreground - #E7C547 + #FFB454 @@ -613,6 +740,17 @@ a { #C2D94C + + name + Markup Changed + scope + markup.changed + settings + + foreground + #39BAE6 + + name Markup Deleted @@ -621,12 +759,12 @@ a { settings foreground - #FF7733 + #FF3333 name - Markup - Strike + Markup Strike scope markup.strike settings @@ -637,26 +775,26 @@ a { name - Markup - Table + Markup Table scope markup.table settings background - #3cadd71a + #E6E1CF10 foreground - #50B4E6 + #39BAE6 name - Markdown - Markup Raw Inline + Markup Raw Inline scope text.html.markdown markup.raw.inline settings foreground - #50B4E6 + #F29668 @@ -678,7 +816,7 @@ a { settings background - #ffffff10 + #E6E1CF10 foreground #E6E1CF @@ -691,7 +829,7 @@ a { settings background - #ffffff10 + #E6E1CF10 foreground #5C6773 @@ -726,7 +864,7 @@ a { settings foreground - #50B4E6 + #39BAE6 @@ -737,7 +875,7 @@ a { settings foreground - #FF7733 + #FF3333 @@ -781,7 +919,7 @@ a { settings background - #50B4E6 + #39BAE6 foreground #FFFFFF @@ -833,7 +971,7 @@ a { settings foreground - #50B4E6 + #39BAE6 diff --git a/ayu-light.sublime-theme b/ayu-light.sublime-theme index 2aec5772..8f5f86a7 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] }, @@ -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 cb1fbf26..42318992 100644 --- a/ayu-light.tmTheme +++ b/ayu-light.tmTheme @@ -28,7 +28,7 @@ findHighlightForeground #FAFAFA foreground - #5C6066 + #6E7580 guide #D9D8D7 gutter @@ -46,13 +46,13 @@ popupCss html, body { background-color: #FFFFFF; - color: #5C6066; + color: #6E7580; } body { padding: 1px 3px; } a { - color: rgba(65, 166, 217, .7); + color: rgba(85, 180, 212, .7); } selection @@ -67,7 +67,7 @@ a { name - Comments + Comment scope comment, punctuation.definition.comment settings @@ -80,278 +80,403 @@ a { name - Separators, Comma and alike + String scope - punctuation.separator, punctuation.terminator + string, constant.other.symbol settings foreground - #5C6066dd + #86B300 name - Variable + Number scope - variable + constant.numeric settings foreground - #5C6066 + #A37ACC name - Keyword, Storage + Regular Expressions and Escape Characters scope - keyword, storage.type, storage.modifier + string.regexp, constant.character.escape settings foreground - #F2590C + #4CBF99 name - Operator, Misc + Built-in constant scope - constant.other.color, meta.tag, punctuation.separator.inheritance.php, punctuation.section.embedded, keyword.other.substitution + constant.language settings + fontStyle + italic foreground - #E7C547 + #A37ACC name - Tag + User-defined constant scope - entity.name.tag, meta.tag.sgml + constant.character, constant.other settings foreground - #41A6D9 + #A37ACC name - Function, Special Method, Block Level + Member Variable scope - entity.name.function, meta.function-call, variable.function, support.function, keyword.other.special-method, meta.block-level + variable.member settings foreground - #F29718 + #ec5f67 name - Other Variable, String Link + Keyword scope - support.other.variable, string.other.link + keyword - keyword.operator, keyword.operator.word settings foreground - #F07178 + #FA6E32 name - Number, Constant, Function Argument, Tag Attribute, Embedded + Operators scope - constant.numeric, constant.language, support.constant, constant.character, variable.parameter, keyword.other.unit + keyword.operator settings foreground - #A37ACC + #ED9366 name - String, Symbols, Inherited Class + Punctuation 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 + punctuation.separator, punctuation.terminator settings - fontStyle - normal foreground - #86B300 + #6E7580CC 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 + #6E7580 name - Sub-methods + Accessor scope - entity.name.module.js, variable.import.parameter.js, variable.other.class.js + punctuation.accessor settings foreground - #41A6D9 + #ED9366 name - Language methods + Annotation Punctuation scope - variable.language + punctuation.definition.annotation + settings + + foreground + #6E7580CC + + + + 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 + #399EE6 name - Html punctuations tags + Inherited class scope - punctuation.definition.tag.end, punctuation.definition.tag.begin, punctuation.definition.tag + entity.other.inherited-class settings + fontStyle + underline foreground - #41A6D990 + #399EE6 name - Attributes + Function argument scope - entity.other.attribute-name + variable.parameter settings foreground - #F2590C + #A37ACC name - Regular Expressions and Escape Characters + Language variable scope - string.regexp, constant.character.escape + variable.language settings + fontStyle + italic foreground - #4DBF99 + #55B4D4 name - URL + Tag scope - *url*, *link*, *uri* + entity.name.tag, meta.tag.sgml settings fontStyle - underline + + foreground + #55B4D4 name - Search Results Nums + Tag start/end scope - constant.numeric.line-number.find-in-files - match + punctuation.definition.tag.end, punctuation.definition.tag.begin, punctuation.definition.tag settings foreground - #ABB0B6 + #55B4D490 name - Search Results Lines + Tag attribute scope - entity.name.filename.find-in-files + entity.other.attribute-name settings foreground - #86B300 + #F29718 name - Decorators + Function call scope - tag.decorator.js entity.name.tag.js, tag.decorator.js punctuation.definition.tag.js + variable.function, variable.annotation + settings + + foreground + #F29718 + + + + name + Library function + scope + support.function, support.macro settings fontStyle italic foreground - #CCA37A + #F07171 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 + #ED9366 name - entity.name.method.js + Library class/type scope - entity.name.method.js + support.type, support.class settings fontStyle italic foreground - #CCA37A + #55B4D4 name - meta.method.js + Invalid scope - meta.class-method.js entity.name.function.js, variable.function.constructor + invalid + settings + + foreground + #F51818 + + + + name + Invalid deprecated + scope + invalid.deprecated + settings + + background + #FA6E32 + foreground + #FFFFFF + + + + name + diff.header + scope + meta.diff, meta.diff.header + settings + + foreground + #c594c5 + + + + name + CSS Properties + scope + support.type.property-name + settings + + foreground + #55B4D4 + + + + 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 + #FA6E32 + + + + name + Search Results Lines + scope + entity.name.filename.find-in-files + settings + + foreground + #86B300 + + + + scope + message.error settings foreground - #CCA37A + #F51818 @@ -362,7 +487,7 @@ a { settings foreground - #41A6D9 + #55B4D4 @@ -373,7 +498,7 @@ a { settings foreground - #41A6D9 + #55B4D4 @@ -384,7 +509,7 @@ a { settings foreground - #41A6D9 + #55B4D4 @@ -395,7 +520,7 @@ a { settings foreground - #41A6D9 + #55B4D4 @@ -406,7 +531,7 @@ a { settings foreground - #41A6D9 + #55B4D4 @@ -417,7 +542,7 @@ a { settings foreground - #41A6D9 + #55B4D4 @@ -428,7 +553,7 @@ a { settings foreground - #41A6D9 + #55B4D4 @@ -439,7 +564,7 @@ a { settings foreground - #41A6D9 + #55B4D4 @@ -450,7 +575,7 @@ a { settings foreground - #41A6D9 + #55B4D4 @@ -472,29 +597,31 @@ a { settings foreground - #F2590C + #FA6E32 name - Markup h1 + Markup Links scope - markup.heading.1 punctuation.definition.heading + string.other.link, markup.underline.link settings + fontStyle + italic underline foreground - #ec5f67 + #4CBF99 name - Markup Links + Markup image scope - string.other.link, markup.underline.link + punctuation.definition.image settings foreground - #E7C547 + #F29718 @@ -538,7 +665,7 @@ a { settings foreground - #F07178 + #F07171 @@ -549,7 +676,7 @@ a { settings background - #5C606607 + #6E758007 @@ -560,7 +687,7 @@ a { settings background - #5C606610 + #6E758010 @@ -571,7 +698,7 @@ a { settings background - #5C606610 + #6E758010 fontStyle bold foreground @@ -599,7 +726,7 @@ a { settings foreground - #4DBF99 + #4CBF99 @@ -613,6 +740,17 @@ a { #86B300 + + name + Markup Changed + scope + markup.changed + settings + + foreground + #55B4D4 + + name Markup Deleted @@ -621,42 +759,42 @@ a { settings foreground - #F2590C + #F51818 name - Markup - Strike + Markup Strike scope markup.strike settings foreground - #CCA37A + #E6B673 name - Markup - Table + Markup Table scope markup.table settings background - #3cadd71a + #6E758010 foreground - #41A6D9 + #55B4D4 name - Markdown - Markup Raw Inline + Markup Raw Inline scope text.html.markdown markup.raw.inline settings foreground - #41A6D9 + #ED9366 @@ -678,9 +816,9 @@ a { settings background - #ffffff10 + #6E758010 foreground - #5C6066 + #6E7580 @@ -691,7 +829,7 @@ a { settings background - #ffffff10 + #6E758010 foreground #ABB0B6 @@ -726,7 +864,7 @@ a { settings foreground - #41A6D9 + #55B4D4 @@ -737,7 +875,7 @@ a { settings foreground - #F2590C + #F51818 @@ -781,7 +919,7 @@ a { settings background - #41A6D9 + #55B4D4 foreground #FFFFFF @@ -807,7 +945,7 @@ a { settings background - #F2590C + #FA6E32 foreground #FFFFFF @@ -820,7 +958,7 @@ a { settings background - #F07178 + #F07171 foreground #FFFFFF @@ -833,7 +971,7 @@ a { settings foreground - #41A6D9 + #55B4D4 @@ -855,7 +993,7 @@ a { settings foreground - #FF3333 + #F51818 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/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 6ac035f6..77865c39 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 @@ -67,7 +67,7 @@ a { name - Comments + Comment scope comment, punctuation.definition.comment settings @@ -80,278 +80,403 @@ a { name - Separators, Comma and alike + String scope - punctuation.separator, punctuation.terminator + string, constant.other.symbol settings foreground - #D9D7CEdd + #BAE67E name - Variable + Number scope - variable + constant.numeric settings foreground - #D9D7CE + #D4BFFF name - Keyword, Storage + Regular Expressions and Escape Characters scope - keyword, storage.type, storage.modifier + string.regexp, constant.character.escape settings foreground - #FFAE57 + #95E6CB name - Operator, Misc + Built-in constant scope - constant.other.color, meta.tag, punctuation.separator.inheritance.php, punctuation.section.embedded, keyword.other.substitution + constant.language settings + fontStyle + italic foreground - #80D4FF + #D4BFFF name - Tag + User-defined constant scope - entity.name.tag, meta.tag.sgml + constant.character, constant.other settings foreground - #5CCFE6 + #D4BFFF name - Function, Special Method, Block Level + Member Variable scope - entity.name.function, meta.function-call, variable.function, support.function, keyword.other.special-method, meta.block-level + variable.member settings foreground - #FFD580 + #ec5f67 name - Other Variable, String Link + Keyword scope - support.other.variable, string.other.link + keyword - keyword.operator, keyword.operator.word settings foreground - #F07178 + #FFA759 name - Number, Constant, Function Argument, Tag Attribute, Embedded + Operators scope - constant.numeric, constant.language, support.constant, constant.character, variable.parameter, keyword.other.unit + keyword.operator settings foreground - #D4BFFF + #F29E74 name - String, Symbols, Inherited Class + Punctuation 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 + punctuation.separator, punctuation.terminator settings - fontStyle - normal foreground - #BAE67E + #D9D7CECC 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 - #5CCFE6 + #D9D7CE name - Sub-methods + Accessor scope - entity.name.module.js, variable.import.parameter.js, variable.other.class.js + punctuation.accessor settings foreground - #5CCFE6 + #F29E74 name - Language methods + Annotation Punctuation scope - variable.language + punctuation.definition.annotation + settings + + foreground + #D9D7CECC + + + + 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 + #FFA759 + + + + name + Storage type + scope + storage.type settings fontStyle italic foreground - #5CCFE6 + #FFA759 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 + #73D0FF name - Html punctuations tags + Inherited class scope - punctuation.definition.tag.end, punctuation.definition.tag.begin, punctuation.definition.tag + entity.other.inherited-class settings + fontStyle + underline foreground - #5CCFE690 + #73D0FF name - Attributes + Function argument scope - entity.other.attribute-name + variable.parameter settings foreground - #FFAE57 + #D4BFFF name - Regular Expressions and Escape Characters + Language variable scope - string.regexp, constant.character.escape + variable.language settings + fontStyle + italic foreground - #95E6CB + #5CCFE6 name - URL + Tag scope - *url*, *link*, *uri* + entity.name.tag, meta.tag.sgml settings fontStyle - underline + + foreground + #5CCFE6 name - Search Results Nums + Tag start/end scope - constant.numeric.line-number.find-in-files - match + punctuation.definition.tag.end, punctuation.definition.tag.begin, punctuation.definition.tag settings foreground - #5C6773 + #5CCFE690 name - Search Results Lines + Tag attribute scope - entity.name.filename.find-in-files + entity.other.attribute-name settings foreground - #BAE67E + #FFD580 + + + + name + Function call + scope + variable.function, variable.annotation + settings + + foreground + #FFD580 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 + #F28779 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 + #F29E74 name - entity.name.method.js + Library class/type scope - entity.name.method.js + support.type, support.class settings fontStyle italic foreground - #FFC44C + #5CCFE6 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 + #FFA759 + foreground + #FFFFFF + + + + name + diff.header + scope + meta.diff, meta.diff.header + settings + + foreground + #c594c5 + + + + name + CSS Properties + scope + support.type.property-name + settings + + foreground + #5CCFE6 + + + + 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 + #FFA759 + + + + name + Search Results Lines + scope + entity.name.filename.find-in-files + settings + + foreground + #BAE67E + + + + scope + message.error + settings + + foreground + #FF3333 @@ -472,29 +597,31 @@ a { settings foreground - #FFAE57 + #FFA759 name - Markup h1 + Markup Links scope - markup.heading.1 punctuation.definition.heading + string.other.link, markup.underline.link settings + fontStyle + italic underline foreground - #ec5f67 + #95E6CB name - Markup Links + Markup image scope - string.other.link, markup.underline.link + punctuation.definition.image settings foreground - #80D4FF + #FFD580 @@ -538,7 +665,7 @@ a { settings foreground - #F07178 + #F28779 @@ -613,6 +740,17 @@ a { #BAE67E + + name + Markup Changed + scope + markup.changed + settings + + foreground + #5CCFE6 + + name Markup Deleted @@ -621,12 +759,12 @@ a { settings foreground - #FFAE57 + #FF3333 name - Markup - Strike + Markup Strike scope markup.strike settings @@ -637,26 +775,26 @@ a { name - Markup - Table + Markup Table scope markup.table settings background - #3cadd71a + #D9D7CE10 foreground #5CCFE6 name - Markdown - Markup Raw Inline + Markup Raw Inline scope text.html.markdown markup.raw.inline settings foreground - #5CCFE6 + #F29E74 @@ -678,7 +816,7 @@ a { settings background - #ffffff10 + #D9D7CE10 foreground #D9D7CE @@ -691,7 +829,7 @@ a { settings background - #ffffff10 + #D9D7CE10 foreground #5C6773 @@ -737,7 +875,7 @@ a { settings foreground - #FFAE57 + #FF3333 @@ -807,7 +945,7 @@ a { settings background - #FFAE57 + #FFA759 foreground #FFFFFF @@ -820,7 +958,7 @@ a { settings background - #F07178 + #F28779 foreground #FFFFFF 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/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/sublime.syntax.xml b/src/templates/sublime.syntax.xml index 3b3a595c..b2cea919 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}"; @@ -67,7 +67,7 @@ a { name - Comments + Comment scope comment, punctuation.definition.comment settings @@ -80,278 +80,403 @@ a { name - Separators, Comma and alike + String scope - punctuation.separator, punctuation.terminator + string, constant.other.symbol settings foreground - #"{common.fg.hex}"dd + #"{syntax.string.hex}" name - Variable + Number scope - variable + constant.numeric settings foreground - #"{common.fg.hex}" + #"{syntax.constant.hex}" name - Keyword, Storage + Regular Expressions and Escape Characters scope - keyword, storage.type, storage.modifier + string.regexp, constant.character.escape settings foreground - #"{syntax.keyword.hex}" + #"{syntax.regexp.hex}" name - Operator, Misc + Built-in constant scope - constant.other.color, meta.tag, punctuation.separator.inheritance.php, punctuation.section.embedded, keyword.other.substitution + constant.language settings + fontStyle + italic foreground - #"{syntax.operator.hex}" + #"{syntax.constant.hex}" name - Tag + User-defined constant scope - entity.name.tag, meta.tag.sgml + constant.character, constant.other settings foreground - #"{syntax.tag.hex}" + #"{syntax.constant.hex}" name - Function, Special Method, Block Level + Member Variable scope - entity.name.function, meta.function-call, variable.function, support.function, keyword.other.special-method, meta.block-level + variable.member settings foreground - #"{syntax.func.hex}" + #ec5f67 name - Other Variable, String Link + Keyword scope - support.other.variable, string.other.link + keyword - keyword.operator, keyword.operator.word settings foreground - #"{syntax.sup_var.hex}" + #"{syntax.keyword.hex}" name - Number, Constant, Function Argument, Tag Attribute, Embedded + Operators scope - constant.numeric, constant.language, support.constant, constant.character, variable.parameter, keyword.other.unit + keyword.operator settings foreground - #"{syntax.constant.hex}" + #"{syntax.operator.hex}" name - String, Symbols, Inherited Class + Punctuation 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 + punctuation.separator, punctuation.terminator settings - fontStyle - normal foreground - #"{syntax.string.hex}" + #"{common.fg.hex}"CC 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 - #"{syntax.tag.hex}" + #"{common.fg.hex}" name - Sub-methods + Accessor scope - entity.name.module.js, variable.import.parameter.js, variable.other.class.js + punctuation.accessor settings foreground - #"{syntax.tag.hex}" + #"{syntax.operator.hex}" name - Language methods + Annotation Punctuation scope - variable.language + punctuation.definition.annotation + settings + + 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, 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 + #"{syntax.entity.hex}" name - Html punctuations tags + Inherited class scope - punctuation.definition.tag.end, punctuation.definition.tag.begin, punctuation.definition.tag + entity.other.inherited-class settings + fontStyle + underline foreground - #"{syntax.tag.hex}"90 + #"{syntax.entity.hex}" name - Attributes + Function argument scope - entity.other.attribute-name + variable.parameter settings foreground - #"{syntax.keyword.hex}" + #"{syntax.constant.hex}" name - Regular Expressions and Escape Characters + Language variable scope - string.regexp, constant.character.escape + variable.language settings + fontStyle + italic foreground - #"{syntax.regexp.hex}" + #"{syntax.tag.hex}" 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 start/end scope - constant.numeric.line-number.find-in-files - match + punctuation.definition.tag.end, punctuation.definition.tag.begin, punctuation.definition.tag settings foreground - #"{syntax.comment.hex}" + #"{syntax.tag.hex}"90 name - Search Results Lines + Tag attribute scope - entity.name.filename.find-in-files + entity.other.attribute-name settings foreground - #"{syntax.string.hex}" + #"{syntax.func.hex}" + + + + name + Function call + scope + variable.function, variable.annotation + settings + + foreground + #"{syntax.func.hex}" 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}" + #"{syntax.operator.hex}" 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}" + #"{syntax.tag.hex}" + + + + name + Invalid + scope + invalid + settings + + foreground + #"{syntax.error.hex}" + + + + name + Invalid deprecated + scope + invalid.deprecated + settings + + background + #"{syntax.keyword.hex}" + foreground + #FFFFFF name - meta.method.js + diff.header scope - meta.class-method.js entity.name.function.js, variable.function.constructor + meta.diff, meta.diff.header settings foreground - #"{syntax.es_spec.hex}" + #c594c5 + + + + name + CSS Properties + scope + support.type.property-name + settings + + foreground + #"{syntax.tag.hex}" + + + + 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 + #"{syntax.keyword.hex}" + + + + name + Search Results Lines + scope + entity.name.filename.find-in-files + settings + + foreground + #"{syntax.string.hex}" + + + + scope + message.error + settings + + foreground + #"{syntax.error.hex}" @@ -477,24 +602,26 @@ a { name - Markup h1 + Markup Links scope - markup.heading.1 punctuation.definition.heading + string.other.link, markup.underline.link settings + fontStyle + italic underline foreground - #ec5f67 + #"{syntax.regexp.hex}" name - Markup Links + Markup image scope - string.other.link, markup.underline.link + punctuation.definition.image settings foreground - #"{syntax.operator.hex}" + #"{syntax.func.hex}" @@ -538,7 +665,7 @@ a { settings foreground - #"{syntax.sup_var.hex}" + #"{syntax.markup.hex}" @@ -613,6 +740,17 @@ a { #"{syntax.string.hex}" + + name + Markup Changed + scope + markup.changed + settings + + foreground + #"{syntax.tag.hex}" + + name Markup Deleted @@ -621,42 +759,42 @@ a { settings foreground - #"{syntax.keyword.hex}" + #"{syntax.error.hex}" name - Markup - Strike + Markup Strike scope markup.strike settings foreground - #"{syntax.es_spec.hex}" + #"{syntax.special.hex}" name - Markup - Table + Markup Table scope markup.table settings background - #3cadd71a + #"{common.fg.hex}"10 foreground #"{syntax.tag.hex}" name - Markdown - Markup Raw Inline + Markup Raw Inline scope text.html.markdown markup.raw.inline settings foreground - #"{syntax.tag.hex}" + #"{syntax.operator.hex}" @@ -678,7 +816,7 @@ a { settings background - #ffffff10 + #"{common.fg.hex}"10 foreground #"{common.fg.hex}" @@ -691,7 +829,7 @@ a { settings background - #ffffff10 + #"{common.fg.hex}"10 foreground #"{syntax.comment.hex}" @@ -737,7 +875,7 @@ a { settings foreground - #"{syntax.keyword.hex}" + #"{syntax.error.hex}" @@ -820,7 +958,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..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' @@ -43,71 +43,152 @@ 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, constant.other.symbol settings: - foreground: '#"{common.fg.hex}"dd' + foreground: &string '#"{syntax.string.hex}"' -- name: Variable - scope: variable +- name: Number + scope: constant.numeric settings: - foreground: *fg + foreground: *constant + +- name: Regular Expressions and Escape Characters + scope: string.regexp, constant.character.escape + settings: + foreground: ®exp '#"{syntax.regexp.hex}"' + +- 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: Keyword, Storage - scope: keyword, storage.type, storage.modifier +- 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: '#"{common.fg.hex}"CC' -- 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: *fg + +- name: Accessor + scope: punctuation.accessor + settings: + foreground: *operator + +- name: Annotation Punctuation + scope: punctuation.definition.annotation + settings: + 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, + support.class.dollar.only.js + settings: + foreground: &special '#"{syntax.special.hex}"' + +- name: Storage + scope: storage + settings: + foreground: *keyword + +- name: Storage type + scope: storage.type + settings: + fontStyle: italic + foreground: *keyword + +- name: Entity name + scope: entity.name.function settings: foreground: &function '#"{syntax.func.hex}"' -- name: Other Variable, String Link - scope: support.other.variable, string.other.link +- name: Entity name + scope: entity.name - (entity.name.section | entity.name.tag | entity.name.label) settings: - foreground: &sup_var '#"{syntax.sup_var.hex}"' + foreground: &entity '#"{syntax.entity.hex}"' -- name: Number, Constant, Function Argument, Tag Attribute, Embedded - scope: constant.numeric, constant.language, support.constant, constant.character, variable.parameter, keyword.other.unit +- name: Inherited class + scope: entity.other.inherited-class + settings: + fontStyle: underline + foreground: *entity + +- name: Function argument + scope: variable.parameter 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 +- name: Language variable + scope: variable.language settings: - fontStyle: normal - foreground: &string '#"{syntax.string.hex}"' + fontStyle: italic + foreground: &tag '#"{syntax.tag.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: Tag + scope: entity.name.tag, meta.tag.sgml settings: + fontStyle: '' foreground: *tag -- name: Sub-methods - scope: entity.name.module.js, variable.import.parameter.js, variable.other.class.js +- name: Tag start/end + scope: punctuation.definition.tag.end, punctuation.definition.tag.begin, punctuation.definition.tag settings: - foreground: *tag + foreground: '#"{syntax.tag.hex}"90' # opacity of tag verson of &tag_punctag -- name: Language methods - scope: variable.language +- name: Tag attribute + scope: entity.other.attribute-name + settings: + foreground: *function + +- name: Function call + scope: variable.function, variable.annotation + settings: + foreground: *function + +- 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: *operator + +- name: Library class/type + scope: support.type, support.class settings: fontStyle: italic foreground: *tag @@ -117,65 +198,40 @@ settings: 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: diff.header + scope: meta.diff, meta.diff.header settings: - foreground: '#"{syntax.tag.hex}"90' # opacity of tag verson of &tag_punctag + foreground: '#c594c5' -- name: Attributes - scope: entity.other.attribute-name +- name: CSS Properties + scope: support.type.property-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 + foreground: *tag - name: Search Results Nums scope: constant.numeric.line-number.find-in-files - match settings: 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 -# ES6 -- name: Decorators - scope: tag.decorator.js entity.name.tag.js, tag.decorator.js punctuation.definition.tag.js - settings: - fontStyle: italic - foreground: &es_spec '#"{syntax.es_spec.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: *es_spec - -- name: meta.method.js - scope: meta.class-method.js entity.name.function.js, variable.function.constructor +- scope: message.error settings: - foreground: *es_spec + foreground: *error # JSON - name: JSON Key - Level 8 @@ -234,15 +290,16 @@ 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: - foreground: *operator + fontStyle: italic underline + foreground: *regexp + +- name: Markup image + scope: punctuation.definition.image + settings: + foreground: *function - name: Markup Italic scope: markup.italic @@ -262,7 +319,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 @@ -297,26 +354,31 @@ settings: settings: foreground: *string +- name: Markup Changed + scope: markup.changed + settings: + foreground: *tag + - name: Markup Deleted scope: markup.deleted settings: - foreground: *keyword + foreground: *error -- name: Markup - Strike +- name: Markup Strike scope: markup.strike settings: - foreground: *es_spec + foreground: *special -- name: Markup - Table +- name: Markup Table scope: markup.table settings: - background: '#3cadd71a' + 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 @@ -354,7 +416,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 +455,7 @@ settings: - name: AceJump Label - Purple scope: acejump.label.purple settings: - background: *sup_var + background: *markup foreground: *white # SublimeLinter 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", 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 c8df4631..4d1148ef 100644 --- a/src/themes/dark.yml +++ b/src/themes/dark.yml @@ -24,20 +24,21 @@ ui: opacity: '0.3' syntax: + line: 151A1F error: FF3333 - line_hg: 151A1F gutter: 35404C selection: '253340' stack_guide: 1A2633 active_guide: '314559' - tag: 50B4E6 + tag: 39BAE6 func: FFB454 - regexp: 95E6CB + entity: 59C2FF string: C2D94C - sup_var: F07178 + regexp: 95E6CB + markup: F07178 keyword: FF7733 - es_spec: E6B673 + special: E6B673 comment: 5C6773 constant: FFEE99 - operator: E7C547 + operator: F29668 diff --git a/src/themes/light.yml b/src/themes/light.yml index f732fa2c..fa929ac5 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' @@ -24,20 +24,21 @@ ui: opacity: '0.2' syntax: - error: FF3333 - line_hg: F2F2F2 + line: F2F2F2 + error: F51818 gutter: D9D8D7 selection: F0EEE4 stack_guide: DEDDDC active_guide: B3B2B1 - tag: 41A6D9 + tag: 55B4D4 func: F29718 - regexp: 4DBF99 + entity: 399EE6 string: 86B300 + regexp: 4CBF99 + markup: F07171 + keyword: FA6E32 + special: E6B673 comment: ABB0B6 - sup_var: F07178 - es_spec: CCA37A - keyword: F2590C - operator: E7C547 constant: A37ACC + operator: ED9366 diff --git a/src/themes/mirage.yml b/src/themes/mirage.yml index b5991499..37b32a2f 100644 --- a/src/themes/mirage.yml +++ b/src/themes/mirage.yml @@ -24,20 +24,21 @@ 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 + entity: 73D0FF string: BAE67E regexp: 95E6CB - sup_var: F07178 - keyword: FFAE57 - es_spec: FFC44C + markup: F28779 + keyword: FFA759 + special: FFC44C comment: 5C6773 constant: D4BFFF - operator: 80D4FF + operator: F29E74 diff --git a/widgets/Widget - ayu-light.stTheme b/widgets/Widget - ayu-light.stTheme index 0e6bcfc9..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 @@ -57,7 +57,7 @@ settings foreground - #F2590C + #FA6E32 @@ -90,7 +90,7 @@ settings foreground - #4DBF99 + #4CBF99 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