From b87573bc21f6823101b12816306d61d4f5c77e04 Mon Sep 17 00:00:00 2001 From: Koen Lageveen Date: Tue, 4 Jun 2019 08:57:33 +0200 Subject: [PATCH 01/10] punctuation in embedded shouldn't have background color --- Xcode Basic.sublime-color-scheme | 5 ----- Xcode Civic.sublime-color-scheme | 5 ----- Xcode Default.sublime-color-scheme | 5 ----- Xcode Dusk.sublime-color-scheme | 5 ----- Xcode Low Key.sublime-color-scheme | 5 ----- Xcode Midnight.sublime-color-scheme | 5 ----- Xcode Sunset.sublime-color-scheme | 5 ----- 7 files changed, 35 deletions(-) diff --git a/Xcode Basic.sublime-color-scheme b/Xcode Basic.sublime-color-scheme index dbeba34..a4211ce 100644 --- a/Xcode Basic.sublime-color-scheme +++ b/Xcode Basic.sublime-color-scheme @@ -293,11 +293,6 @@ "scope": "source.yaml string.unquoted", "foreground": "var(strings)" }, - { - "name": "Embedded", - "scope": "punctuation.section.embedded", - "foreground": "var(embedded)" - }, { "name": "Embedded Variable", "scope": "variable.interpolation", diff --git a/Xcode Civic.sublime-color-scheme b/Xcode Civic.sublime-color-scheme index bc2af30..af3589a 100644 --- a/Xcode Civic.sublime-color-scheme +++ b/Xcode Civic.sublime-color-scheme @@ -293,11 +293,6 @@ "scope": "source.yaml string.unquoted", "foreground": "var(strings)" }, - { - "name": "Embedded", - "scope": "punctuation.section.embedded", - "foreground": "var(embedded)" - }, { "name": "Embedded Variable", "scope": "variable.interpolation", diff --git a/Xcode Default.sublime-color-scheme b/Xcode Default.sublime-color-scheme index f43949a..3f05563 100644 --- a/Xcode Default.sublime-color-scheme +++ b/Xcode Default.sublime-color-scheme @@ -293,11 +293,6 @@ "scope": "source.yaml string.unquoted", "foreground": "var(strings)" }, - { - "name": "Embedded", - "scope": "punctuation.section.embedded", - "foreground": "var(embedded)" - }, { "name": "Embedded Variable", "scope": "variable.interpolation", diff --git a/Xcode Dusk.sublime-color-scheme b/Xcode Dusk.sublime-color-scheme index 99af895..c9e3ece 100644 --- a/Xcode Dusk.sublime-color-scheme +++ b/Xcode Dusk.sublime-color-scheme @@ -293,11 +293,6 @@ "scope": "source.yaml string.unquoted", "foreground": "var(strings)" }, - { - "name": "Embedded", - "scope": "punctuation.section.embedded", - "foreground": "var(embedded)" - }, { "name": "Embedded Variable", "scope": "variable.interpolation", diff --git a/Xcode Low Key.sublime-color-scheme b/Xcode Low Key.sublime-color-scheme index bf326d9..7f552b1 100644 --- a/Xcode Low Key.sublime-color-scheme +++ b/Xcode Low Key.sublime-color-scheme @@ -293,11 +293,6 @@ "scope": "source.yaml string.unquoted", "foreground": "var(strings)" }, - { - "name": "Embedded", - "scope": "punctuation.section.embedded", - "foreground": "var(embedded)" - }, { "name": "Embedded Variable", "scope": "variable.interpolation", diff --git a/Xcode Midnight.sublime-color-scheme b/Xcode Midnight.sublime-color-scheme index 9110f93..6b5d026 100644 --- a/Xcode Midnight.sublime-color-scheme +++ b/Xcode Midnight.sublime-color-scheme @@ -293,11 +293,6 @@ "scope": "source.yaml string.unquoted", "foreground": "var(strings)" }, - { - "name": "Embedded", - "scope": "punctuation.section.embedded", - "foreground": "var(embedded)" - }, { "name": "Embedded Variable", "scope": "variable.interpolation", diff --git a/Xcode Sunset.sublime-color-scheme b/Xcode Sunset.sublime-color-scheme index d0d5eb3..7aa920f 100644 --- a/Xcode Sunset.sublime-color-scheme +++ b/Xcode Sunset.sublime-color-scheme @@ -293,11 +293,6 @@ "scope": "source.yaml string.unquoted", "foreground": "var(strings)" }, - { - "name": "Embedded", - "scope": "punctuation.section.embedded", - "foreground": "var(embedded)" - }, { "name": "Embedded Variable", "scope": "variable.interpolation", From e9a94cb2d5caea27816cfd21c728ca90d92e0fee Mon Sep 17 00:00:00 2001 From: Koen Lageveen Date: Tue, 22 Sep 2020 15:11:57 +0200 Subject: [PATCH 02/10] add default dark theme --- Xcode Default Dark.sublime-color-scheme | 324 ++++++++++++++++++++++++ 1 file changed, 324 insertions(+) create mode 100644 Xcode Default Dark.sublime-color-scheme diff --git a/Xcode Default Dark.sublime-color-scheme b/Xcode Default Dark.sublime-color-scheme new file mode 100644 index 0000000..94685bd --- /dev/null +++ b/Xcode Default Dark.sublime-color-scheme @@ -0,0 +1,324 @@ +{ + "name": "Xcode Default Dark", + "author": "Koen Lageveen, inspired by Apple", + "variables": + { + "plain_text" : "#FFFFFFD9", + "comments" : "#6C7986", + "documentation_markup" : "#6C7986", + "documentation_markup_keywords" : "#92A1B1", + "marks" : "#92A1B1", + "strings" : "#FC6A5D", + "characters" : "#D0BF69", + "numbers" : "#D0BF69", + "keywords" : "#FC5FA3", + "preprocessor_statements" : "#FD8F3F", + "urls" : "#5482FF", + "attributes" : "#BF8555", + "type_declarations" : "#5DD8FF", + "other_declarations" : "#41A1C0", + "project_class_names" : "#9EF1DD", + "project_method_names" : "#67B7A4", + "project_constants" : "#67B7A4", + "project_type_names" : "#9EF1DD", + "project_variables" : "#67B7A4", + "project_preprocessor_macros" : "#FD8F3F", + "other_class_names" : "#D0A8FF", + "other_method_names" : "#A167E6", + "other_constants" : "#A167E6", + "other_type_names" : "#D0A8FF", + "other_variables" : "#A167E6", + "other_preprocessor_macros" : "#FD8F3F", + + "heading" : "#AA0D91", + + "background" : "#1F1F24", + "current_line" : "#23252B", + "selection" : "#515B70", + "cursor" : "#FFFFFF", + "invisibles" : "#424D5B", + + "embedded": "color(var(background) blend(var(invisibles) 86%))", + "invalid": "var(strings)", + }, + "globals": + { + "foreground": "var(plain_text)", + "background": "var(background)", + "caret": "var(cursor)", + "line_highlight": "var(current_line)", + "selection": "var(selection)", + "selection_border": "color(var(selection) blend(#000 92%)", + "inactive_selection": "color(var(selection) blend(var(background) 72%)", + "misspelling": "var(strings)", + "shadow": "color(var(background) blend(#000 50%))" + }, + "rules": + [ + { + "name": "Error", + "scope": "markup.error", + "foreground": "var(strings)" + }, + { + "name": "Warning", + "scope": "markup.warning", + "foreground": "var(attributes)" + }, + { + "name": "Parameters", + "scope": "variable.parameter", + "foreground": "var(attributes)" + }, + { + "name": "Comments", + "scope": "comment, punctuation.definition.comment", + "foreground": "var(comments)" + }, + { + "name": "Punctuation", + "scope": "punctuation.definition", + "foreground": "var(plain_text)" + }, + { + "name": "Operators", + "scope": "keyword.operator", + "foreground": "var(plain_text)" + }, + { + "name": "Keywords", + "scope": "keyword, keyword.operator.word", + "foreground": "var(keywords)" + }, + { + "name": "Keywords", + "scope": "keyword.control.import", + "foreground": "var(preprocessor_statements)" + }, + { + "name": "Variables", + "scope": "variable", + "foreground": "var(plain_text)" + }, + { + "name": "Variable function", + "scope": "variable.function", + "foreground": "var(project_method_names)" + }, + { + "name": "Functions", + "scope": "entity.name.function", + "foreground": "var(project_method_names)" + }, + { + "name": "Classes", + "scope": "entity.name - (entity.name.section | entity.name.tag | entity.name.label)", + "foreground": "var(project_class_names)" + }, + { + "name": "Storage", + "scope": "storage", + "foreground": "var(keywords)" + }, + { + "name": "Support Functions", + "scope": "support.function", + "foreground": "var(other_method_names)" + }, + { + "name": "Method Call", + "scope": "meta.method-call variable.function", + "foreground": "var(other_method_names)" + }, + { + "name": "Method Call", + "scope": "meta.method-call variable.function.member", + "foreground": "var(other_preprocessor_macros)" + }, + { + "name": "Support Classes", + "scope": "support.class", + "foreground": "var(other_class_names)" + }, + { + "name": "Support Constants", + "scope": "support.constant, constant.language", + "foreground": "var(keywords)", + "font_style": "italic" + }, + { + "name": "CSS Support Constants", + "scope": "source.css support.constant", + "foreground": "var(preprocessor_statements)" + }, + { + "name": "Strings, Inherited Class", + "scope": "string, entity.other.inherited-class", + "foreground": "var(strings)" + }, + { + "name": "Strings Punctuation", + "scope": "string punctuation.definition.string", + "foreground": "var(strings)" + }, + { + "name": "Variables in Strings", + "scope": "string variable", + "foreground": "var(plain_text)" + }, + { + "name": "Misc Punctuation", + "scope": "punctuation.separator, punctuation.terminator, punctuation.accessor", + "foreground": "var(plain_text)" + }, + { + "name": "Misc Punctuation", + "scope": "punctuation.section", + "foreground": "var(plain_text)" + }, + { + "name": "Integers", + "scope": "constant.numeric", + "foreground": "var(numbers)" + }, + { + "name": "Constants", + "scope": "constant", + "foreground": "var(project_constants)" + }, + { + "name": "Tags", + "scope": "entity.name.tag", + "foreground": "var(strings)" + }, + { + "name": "Attributes", + "scope": "entity.other.attribute-name", + "foreground": "var(attributes)" + }, + { + "name": "Types", + "scope": "entity.name.type", + "foreground": "var(project_type_names)" + }, + { + "name": "Types", + "scope": "support.type", + "foreground": "var(other_type_names)" + }, + { + "name": "Headings", + "scope": "markup.heading", + "foreground": "var(project_constants)", + "font_style": "bold" + }, + { + "name": "Bold", + "scope": "markup.bold", + "font_style": "bold" + }, + { + "name": "Italic", + "scope": "markup.italic", + "font_style": "italic" + }, + { + "name": "Code", + "scope": "markup.raw", + "background": "var(embedded)" + }, + { + "name": "Code", + "scope": "markup.raw.inline", + "foreground": "var(preprocessor_statements)", + "background": "var(embedded)" + }, + { + "name": "Strings Punctuation", + "scope": "markup.raw.inline punctuation.definition.raw", + "foreground": "var(characters)" + }, + { + "name": "Link Text", + "scope": "string.other.link, markup.underline.link", + "foreground": "var(urls)" + }, + { + "name": "Lists", + "scope": "punctuation.definition.list_item, markup.list.numbered.bullet", + "foreground": "var(documentation_markup)" + }, + { + "name": "Quotes", + "scope": "punctuation.definition.blockquote", + "background": "var(invisibles)" + }, + { + "name": "Link/Image Punctuation", + "scope": "punctuation.definition.image, punctuation.definition.link, punctuation.definition.metadata", + "foreground": "var(urls)" + }, + { + "name": "Inserted", + "scope": "markup.inserted", + "foreground": "var(comments)" + }, + { + "name": "Deleted", + "scope": "markup.deleted", + "foreground": "var(invalid)" + }, + { + "name": "Changed", + "scope": "markup.changed", + "foreground": "var(attributes)" + }, + { + "name": "Colors", + "scope": "constant.other.color", + "foreground": "var(characters)" + }, + { + "name": "Regular Expressions", + "scope": "string.regexp", + "foreground": "var(characters)" + }, + { + "name": "Regular Expressions Operator", + "scope": "string.regexp keyword.operator", + "foreground": "var(plain_text)" + }, + { + "name": "Escape Characters", + "scope": "constant.character.escape", + "foreground": "var(other_preprocessor_macros)" + }, + { + "name": "YAML String", + "scope": "source.yaml string.unquoted", + "foreground": "var(strings)" + }, + { + "name": "Embedded Variable", + "scope": "variable.interpolation", + "foreground": "var(project_preprocessor_macros)" + }, + { + "name": "Illegal", + "scope": "invalid.illegal", + "foreground": "#FFF", + "background": "var(invalid)" + }, + { + "name": "Invalid deprecated", + "scope": "invalid.deprecated", + "foreground": "#FFF", + "background": "var(invalid)" + }, + { + "name": "Markdown Line Break", + "scope": "punctuation.definition.hard-line-break", + "background": "var(invisibles)" + } + ] +} From b67c136279d7129065197c9f43e87b787f908d29 Mon Sep 17 00:00:00 2001 From: Koen Lageveen Date: Tue, 22 Sep 2020 15:12:11 +0200 Subject: [PATCH 03/10] update default theme --- Xcode Default.sublime-color-scheme | 60 ++++++++++++++++-------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/Xcode Default.sublime-color-scheme b/Xcode Default.sublime-color-scheme index 3f05563..8f4fe7a 100644 --- a/Xcode Default.sublime-color-scheme +++ b/Xcode Default.sublime-color-scheme @@ -3,35 +3,39 @@ "author": "Koen Lageveen, inspired by Apple", "variables": { - "plain_text" : "#000", // black - "comments" : "#008400", // green - "documentation_markup" : "#008400", // green - "documentation_markup_keywords" : "#008400", // green - "strings" : "#D12F1B", // red - "characters" : "#272AD8", // blue - "numbers" : "#272AD8", // blue - "keywords" : "#BA2DA2", // pink - "preprocessor_statements" : "#78492A", // dark brown - "urls" : "#1337FF", // hot blue - "attributes" : "#957E35", // light brown - "project_class_names" : "#4F8187", // light bondi - "project_method_names" : "#31595D", // dark bondi - "project_constants" : "#31595D", // dark bondi - "project_type_names" : "#4F8187", // light bondi - "project_variables" : "#4F8187", // light bondi - "project_preprocessor_macros" : "#78492A", // dark brown - "other_class_names" : "#703DAA", // purple - "other_method_names" : "#3E1E81", // light purple - "other_constants" : "#3E1E81", // light purple - "other_type_names" : "#703DAA", // purple - "other_variables" : "#703DAA", // purple - "other_preprocessor_macros" : "#78492A", // dark brown + "plain_text" : "#000000D9", + "comments" : "#5D6C79", + "documentation_markup" : "#5D6C79", + "documentation_markup_keywords" : "#4A5560", + "marks" : "#4A5560", + "strings" : "#C41A16", + "characters" : "#1C00CF", + "numbers" : "#1C00CF", + "keywords" : "#9B2393", + "preprocessor_statements" : "#643820", + "urls" : "#0E0EFF", + "attributes" : "#815F03", + "type_declarations" : "#0B4F79", + "other_declarations" : "#0F68A0", + "project_class_names" : "#1C464A", + "project_method_names" : "#326D74", + "project_constants" : "#326D74", + "project_type_names" : "#1C464A", + "project_variables" : "#326D74", + "project_preprocessor_macros" : "#643820", + "other_class_names" : "#3900A0", + "other_method_names" : "#6C36A9", + "other_constants" : "#6C36A9", + "other_type_names" : "#3900A0", + "other_variables" : "#6C36A9", + "other_preprocessor_macros" : "#643820", + "heading" : "#AA0D91", - "background" : "#FFF", // white - "current_line" : "#EDF5FF", // brighter blue - "selection" : "#B2D7FF", // bright blue - "cursor" : "#000", // black - "invisibles" : "#D6D6D6", // grey + "background" : "#FFF", + "current_line" : "#E8F2FF", + "selection" : "#A4CDFF", + "cursor" : "#000", + "invisibles" : "#CCCCCC", "embedded": "color(var(background) blend(var(invisibles) 86%))", "invalid": "var(strings)", From 691ecee6ca101a2389b38734181ff1af44d8f07c Mon Sep 17 00:00:00 2001 From: Koen Lageveen Date: Tue, 22 Sep 2020 21:23:45 +0200 Subject: [PATCH 04/10] add classic theme same as default, but with green comments etc --- Xcode Classic Dark.sublime-color-scheme | 324 ++++++++++++++++++++++++ Xcode Classic.sublime-color-scheme | 323 +++++++++++++++++++++++ 2 files changed, 647 insertions(+) create mode 100644 Xcode Classic Dark.sublime-color-scheme create mode 100644 Xcode Classic.sublime-color-scheme diff --git a/Xcode Classic Dark.sublime-color-scheme b/Xcode Classic Dark.sublime-color-scheme new file mode 100644 index 0000000..eea21f2 --- /dev/null +++ b/Xcode Classic Dark.sublime-color-scheme @@ -0,0 +1,324 @@ +{ + "name": "Xcode Classic Dark", + "author": "Koen Lageveen, inspired by Apple", + "variables": + { + "plain_text" : "#FFFFFFD9", + "comments" : "#73A74E", + "documentation_markup" : "#73A74E", + "documentation_markup_keywords" : "#A2E474", + "marks" : "#A2E474", + "strings" : "#FC6A5D", + "characters" : "#D0BF69", + "numbers" : "#D0BF69", + "keywords" : "#FC5FA3", + "preprocessor_statements" : "#FD8F3F", + "urls" : "#5482FF", + "attributes" : "#BF8555", + "type_declarations" : "#5DD8FF", + "other_declarations" : "#41A1C0", + "project_class_names" : "#9EF1DD", + "project_method_names" : "#67B7A4", + "project_constants" : "#67B7A4", + "project_type_names" : "#9EF1DD", + "project_variables" : "#67B7A4", + "project_preprocessor_macros" : "#FD8F3F", + "other_class_names" : "#D0A8FF", + "other_method_names" : "#A167E6", + "other_constants" : "#A167E6", + "other_type_names" : "#D0A8FF", + "other_variables" : "#A167E6", + "other_preprocessor_macros" : "#FD8F3F", + + "heading" : "#AA0D91", + + "background" : "#1F1F24", + "current_line" : "#23252B", + "selection" : "#515B70", + "cursor" : "#FFFFFF", + "invisibles" : "#424D5B", + + "embedded": "color(var(background) blend(var(invisibles) 86%))", + "invalid": "var(strings)", + }, + "globals": + { + "foreground": "var(plain_text)", + "background": "var(background)", + "caret": "var(cursor)", + "line_highlight": "var(current_line)", + "selection": "var(selection)", + "selection_border": "color(var(selection) blend(#000 92%)", + "inactive_selection": "color(var(selection) blend(var(background) 72%)", + "misspelling": "var(strings)", + "shadow": "color(var(background) blend(#000 50%))" + }, + "rules": + [ + { + "name": "Error", + "scope": "markup.error", + "foreground": "var(strings)" + }, + { + "name": "Warning", + "scope": "markup.warning", + "foreground": "var(attributes)" + }, + { + "name": "Parameters", + "scope": "variable.parameter", + "foreground": "var(attributes)" + }, + { + "name": "Comments", + "scope": "comment, punctuation.definition.comment", + "foreground": "var(comments)" + }, + { + "name": "Punctuation", + "scope": "punctuation.definition", + "foreground": "var(plain_text)" + }, + { + "name": "Operators", + "scope": "keyword.operator", + "foreground": "var(plain_text)" + }, + { + "name": "Keywords", + "scope": "keyword, keyword.operator.word", + "foreground": "var(keywords)" + }, + { + "name": "Keywords", + "scope": "keyword.control.import", + "foreground": "var(preprocessor_statements)" + }, + { + "name": "Variables", + "scope": "variable", + "foreground": "var(plain_text)" + }, + { + "name": "Variable function", + "scope": "variable.function", + "foreground": "var(project_method_names)" + }, + { + "name": "Functions", + "scope": "entity.name.function", + "foreground": "var(project_method_names)" + }, + { + "name": "Classes", + "scope": "entity.name - (entity.name.section | entity.name.tag | entity.name.label)", + "foreground": "var(project_class_names)" + }, + { + "name": "Storage", + "scope": "storage", + "foreground": "var(keywords)" + }, + { + "name": "Support Functions", + "scope": "support.function", + "foreground": "var(other_method_names)" + }, + { + "name": "Method Call", + "scope": "meta.method-call variable.function", + "foreground": "var(other_method_names)" + }, + { + "name": "Method Call", + "scope": "meta.method-call variable.function.member", + "foreground": "var(other_preprocessor_macros)" + }, + { + "name": "Support Classes", + "scope": "support.class", + "foreground": "var(other_class_names)" + }, + { + "name": "Support Constants", + "scope": "support.constant, constant.language", + "foreground": "var(keywords)", + "font_style": "italic" + }, + { + "name": "CSS Support Constants", + "scope": "source.css support.constant", + "foreground": "var(preprocessor_statements)" + }, + { + "name": "Strings, Inherited Class", + "scope": "string, entity.other.inherited-class", + "foreground": "var(strings)" + }, + { + "name": "Strings Punctuation", + "scope": "string punctuation.definition.string", + "foreground": "var(strings)" + }, + { + "name": "Variables in Strings", + "scope": "string variable", + "foreground": "var(plain_text)" + }, + { + "name": "Misc Punctuation", + "scope": "punctuation.separator, punctuation.terminator, punctuation.accessor", + "foreground": "var(plain_text)" + }, + { + "name": "Misc Punctuation", + "scope": "punctuation.section", + "foreground": "var(plain_text)" + }, + { + "name": "Integers", + "scope": "constant.numeric", + "foreground": "var(numbers)" + }, + { + "name": "Constants", + "scope": "constant", + "foreground": "var(project_constants)" + }, + { + "name": "Tags", + "scope": "entity.name.tag", + "foreground": "var(strings)" + }, + { + "name": "Attributes", + "scope": "entity.other.attribute-name", + "foreground": "var(attributes)" + }, + { + "name": "Types", + "scope": "entity.name.type", + "foreground": "var(project_type_names)" + }, + { + "name": "Types", + "scope": "support.type", + "foreground": "var(other_type_names)" + }, + { + "name": "Headings", + "scope": "markup.heading", + "foreground": "var(project_constants)", + "font_style": "bold" + }, + { + "name": "Bold", + "scope": "markup.bold", + "font_style": "bold" + }, + { + "name": "Italic", + "scope": "markup.italic", + "font_style": "italic" + }, + { + "name": "Code", + "scope": "markup.raw", + "background": "var(embedded)" + }, + { + "name": "Code", + "scope": "markup.raw.inline", + "foreground": "var(preprocessor_statements)", + "background": "var(embedded)" + }, + { + "name": "Strings Punctuation", + "scope": "markup.raw.inline punctuation.definition.raw", + "foreground": "var(characters)" + }, + { + "name": "Link Text", + "scope": "string.other.link, markup.underline.link", + "foreground": "var(urls)" + }, + { + "name": "Lists", + "scope": "punctuation.definition.list_item, markup.list.numbered.bullet", + "foreground": "var(documentation_markup)" + }, + { + "name": "Quotes", + "scope": "punctuation.definition.blockquote", + "background": "var(invisibles)" + }, + { + "name": "Link/Image Punctuation", + "scope": "punctuation.definition.image, punctuation.definition.link, punctuation.definition.metadata", + "foreground": "var(urls)" + }, + { + "name": "Inserted", + "scope": "markup.inserted", + "foreground": "var(comments)" + }, + { + "name": "Deleted", + "scope": "markup.deleted", + "foreground": "var(invalid)" + }, + { + "name": "Changed", + "scope": "markup.changed", + "foreground": "var(attributes)" + }, + { + "name": "Colors", + "scope": "constant.other.color", + "foreground": "var(characters)" + }, + { + "name": "Regular Expressions", + "scope": "string.regexp", + "foreground": "var(characters)" + }, + { + "name": "Regular Expressions Operator", + "scope": "string.regexp keyword.operator", + "foreground": "var(plain_text)" + }, + { + "name": "Escape Characters", + "scope": "constant.character.escape", + "foreground": "var(other_preprocessor_macros)" + }, + { + "name": "YAML String", + "scope": "source.yaml string.unquoted", + "foreground": "var(strings)" + }, + { + "name": "Embedded Variable", + "scope": "variable.interpolation", + "foreground": "var(project_preprocessor_macros)" + }, + { + "name": "Illegal", + "scope": "invalid.illegal", + "foreground": "#FFF", + "background": "var(invalid)" + }, + { + "name": "Invalid deprecated", + "scope": "invalid.deprecated", + "foreground": "#FFF", + "background": "var(invalid)" + }, + { + "name": "Markdown Line Break", + "scope": "punctuation.definition.hard-line-break", + "background": "var(invisibles)" + } + ] +} diff --git a/Xcode Classic.sublime-color-scheme b/Xcode Classic.sublime-color-scheme new file mode 100644 index 0000000..fcc08d8 --- /dev/null +++ b/Xcode Classic.sublime-color-scheme @@ -0,0 +1,323 @@ +{ + "name": "Xcode Default", + "author": "Koen Lageveen, inspired by Apple", + "variables": + { + "plain_text" : "#000000D9", + "comments" : "#267507", + "documentation_markup" : "#267507", + "documentation_markup_keywords" : "#267507", + "marks" : "#267507", + "strings" : "#C41A16", + "characters" : "#1C00CF", + "numbers" : "#1C00CF", + "keywords" : "#9B2393", + "preprocessor_statements" : "#643820", + "urls" : "#0E0EFF", + "attributes" : "#815F03", + "type_declarations" : "#0B4F79", + "other_declarations" : "#0F68A0", + "project_class_names" : "#1C464A", + "project_method_names" : "#326D74", + "project_constants" : "#326D74", + "project_type_names" : "#1C464A", + "project_variables" : "#326D74", + "project_preprocessor_macros" : "#643820", + "other_class_names" : "#3900A0", + "other_method_names" : "#6C36A9", + "other_constants" : "#6C36A9", + "other_type_names" : "#3900A0", + "other_variables" : "#6C36A9", + "other_preprocessor_macros" : "#643820", + "heading" : "#AA0D91", + + "background" : "#FFF", + "current_line" : "#E8F2FF", + "selection" : "#A4CDFF", + "cursor" : "#000", + "invisibles" : "#CCCCCC", + + "embedded": "color(var(background) blend(var(invisibles) 86%))", + "invalid": "var(strings)", + }, + "globals": + { + "foreground": "var(plain_text)", + "background": "var(background)", + "caret": "var(cursor)", + "line_highlight": "var(current_line)", + "selection": "var(selection)", + "selection_border": "color(var(selection) blend(#000 92%)", + "inactive_selection": "color(var(selection) blend(var(background) 72%)", + "misspelling": "var(strings)", + "shadow": "color(var(background) blend(#000 50%))" + }, + "rules": + [ + { + "name": "Error", + "scope": "markup.error", + "foreground": "var(strings)" + }, + { + "name": "Warning", + "scope": "markup.warning", + "foreground": "var(attributes)" + }, + { + "name": "Parameters", + "scope": "variable.parameter", + "foreground": "var(attributes)" + }, + { + "name": "Comments", + "scope": "comment, punctuation.definition.comment", + "foreground": "var(comments)" + }, + { + "name": "Punctuation", + "scope": "punctuation.definition", + "foreground": "var(plain_text)" + }, + { + "name": "Operators", + "scope": "keyword.operator", + "foreground": "var(plain_text)" + }, + { + "name": "Keywords", + "scope": "keyword, keyword.operator.word", + "foreground": "var(keywords)" + }, + { + "name": "Keywords", + "scope": "keyword.control.import", + "foreground": "var(preprocessor_statements)" + }, + { + "name": "Variables", + "scope": "variable", + "foreground": "var(plain_text)" + }, + { + "name": "Variable function", + "scope": "variable.function", + "foreground": "var(project_method_names)" + }, + { + "name": "Functions", + "scope": "entity.name.function", + "foreground": "var(project_method_names)" + }, + { + "name": "Classes", + "scope": "entity.name - (entity.name.section | entity.name.tag | entity.name.label)", + "foreground": "var(project_class_names)" + }, + { + "name": "Storage", + "scope": "storage", + "foreground": "var(keywords)" + }, + { + "name": "Support Functions", + "scope": "support.function", + "foreground": "var(other_method_names)" + }, + { + "name": "Method Call", + "scope": "meta.method-call variable.function", + "foreground": "var(other_method_names)" + }, + { + "name": "Method Call", + "scope": "meta.method-call variable.function.member", + "foreground": "var(other_preprocessor_macros)" + }, + { + "name": "Support Classes", + "scope": "support.class", + "foreground": "var(other_class_names)" + }, + { + "name": "Support Constants", + "scope": "support.constant, constant.language", + "foreground": "var(keywords)", + "font_style": "italic" + }, + { + "name": "CSS Support Constants", + "scope": "source.css support.constant", + "foreground": "var(preprocessor_statements)" + }, + { + "name": "Strings, Inherited Class", + "scope": "string, entity.other.inherited-class", + "foreground": "var(strings)" + }, + { + "name": "Strings Punctuation", + "scope": "string punctuation.definition.string", + "foreground": "var(strings)" + }, + { + "name": "Variables in Strings", + "scope": "string variable", + "foreground": "var(plain_text)" + }, + { + "name": "Misc Punctuation", + "scope": "punctuation.separator, punctuation.terminator, punctuation.accessor", + "foreground": "var(plain_text)" + }, + { + "name": "Misc Punctuation", + "scope": "punctuation.section", + "foreground": "var(plain_text)" + }, + { + "name": "Integers", + "scope": "constant.numeric", + "foreground": "var(numbers)" + }, + { + "name": "Constants", + "scope": "constant", + "foreground": "var(project_constants)" + }, + { + "name": "Tags", + "scope": "entity.name.tag", + "foreground": "var(strings)" + }, + { + "name": "Attributes", + "scope": "entity.other.attribute-name", + "foreground": "var(attributes)" + }, + { + "name": "Types", + "scope": "entity.name.type", + "foreground": "var(project_type_names)" + }, + { + "name": "Types", + "scope": "support.type", + "foreground": "var(other_type_names)" + }, + { + "name": "Headings", + "scope": "markup.heading", + "foreground": "var(project_constants)", + "font_style": "bold" + }, + { + "name": "Bold", + "scope": "markup.bold", + "font_style": "bold" + }, + { + "name": "Italic", + "scope": "markup.italic", + "font_style": "italic" + }, + { + "name": "Code", + "scope": "markup.raw", + "background": "var(embedded)" + }, + { + "name": "Code", + "scope": "markup.raw.inline", + "foreground": "var(preprocessor_statements)", + "background": "var(embedded)" + }, + { + "name": "Strings Punctuation", + "scope": "markup.raw.inline punctuation.definition.raw", + "foreground": "var(characters)" + }, + { + "name": "Link Text", + "scope": "string.other.link, markup.underline.link", + "foreground": "var(urls)" + }, + { + "name": "Lists", + "scope": "punctuation.definition.list_item, markup.list.numbered.bullet", + "foreground": "var(documentation_markup)" + }, + { + "name": "Quotes", + "scope": "punctuation.definition.blockquote", + "background": "var(invisibles)" + }, + { + "name": "Link/Image Punctuation", + "scope": "punctuation.definition.image, punctuation.definition.link, punctuation.definition.metadata", + "foreground": "var(urls)" + }, + { + "name": "Inserted", + "scope": "markup.inserted", + "foreground": "var(comments)" + }, + { + "name": "Deleted", + "scope": "markup.deleted", + "foreground": "var(invalid)" + }, + { + "name": "Changed", + "scope": "markup.changed", + "foreground": "var(attributes)" + }, + { + "name": "Colors", + "scope": "constant.other.color", + "foreground": "var(characters)" + }, + { + "name": "Regular Expressions", + "scope": "string.regexp", + "foreground": "var(characters)" + }, + { + "name": "Regular Expressions Operator", + "scope": "string.regexp keyword.operator", + "foreground": "var(plain_text)" + }, + { + "name": "Escape Characters", + "scope": "constant.character.escape", + "foreground": "var(other_preprocessor_macros)" + }, + { + "name": "YAML String", + "scope": "source.yaml string.unquoted", + "foreground": "var(strings)" + }, + { + "name": "Embedded Variable", + "scope": "variable.interpolation", + "foreground": "var(project_preprocessor_macros)" + }, + { + "name": "Illegal", + "scope": "invalid.illegal", + "foreground": "#FFF", + "background": "var(invalid)" + }, + { + "name": "Invalid deprecated", + "scope": "invalid.deprecated", + "foreground": "#FFF", + "background": "var(invalid)" + }, + { + "name": "Markdown Line Break", + "scope": "punctuation.definition.hard-line-break", + "background": "var(invisibles)" + } + ] +} From 7c6b6d7d43f7225d5cb84a2b8e2fc2d5b5a41eb7 Mon Sep 17 00:00:00 2001 From: Koen Lageveen Date: Tue, 22 Sep 2020 22:16:50 +0200 Subject: [PATCH 05/10] various nuances and other improvements todo: sync to other color schemes --- Xcode Default Dark.sublime-color-scheme | 39 +++++++++++++++++-------- 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/Xcode Default Dark.sublime-color-scheme b/Xcode Default Dark.sublime-color-scheme index 94685bd..6f319b2 100644 --- a/Xcode Default Dark.sublime-color-scheme +++ b/Xcode Default Dark.sublime-color-scheme @@ -92,7 +92,7 @@ }, { "name": "Keywords", - "scope": "keyword.control.import", + "scope": "keyword.control, keyword.control punctuation.definition", "foreground": "var(preprocessor_statements)" }, { @@ -112,13 +112,18 @@ }, { "name": "Classes", - "scope": "entity.name - (entity.name.section | entity.name.tag | entity.name.label)", + "scope": "entity.name - (entity.name.section | entity.name.tag | entity.name.label), variable.other.dollar.only.js", "foreground": "var(project_class_names)" }, { "name": "Storage", "scope": "storage", - "foreground": "var(keywords)" + "foreground": "var(other_declarations)" + }, + { + "name": "Function Storage", + "scope": "meta.function.declaration storage.type.function, storage.type.function keyword.declaration, storage.type.class keyword.declaration", + "foreground": "var(other_declarations)" }, { "name": "Support Functions", @@ -143,7 +148,7 @@ { "name": "Support Constants", "scope": "support.constant, constant.language", - "foreground": "var(keywords)", + "foreground": "var(other_constants)", "font_style": "italic" }, { @@ -164,7 +169,7 @@ { "name": "Variables in Strings", "scope": "string variable", - "foreground": "var(plain_text)" + "foreground": "var(other_variables)" }, { "name": "Misc Punctuation", @@ -178,7 +183,7 @@ }, { "name": "Integers", - "scope": "constant.numeric", + "scope": "constant.numeric, constant.numeric punctuation.separator", "foreground": "var(numbers)" }, { @@ -189,12 +194,12 @@ { "name": "Tags", "scope": "entity.name.tag", - "foreground": "var(strings)" + "foreground": "var(project_class_names)" }, { "name": "Attributes", - "scope": "entity.other.attribute-name", - "foreground": "var(attributes)" + "scope": "entity.other.attribute-name, entity.other.attribute-name punctuation.definition", + "foreground": "var(project_method_names)" }, { "name": "Types", @@ -206,10 +211,20 @@ "scope": "support.type", "foreground": "var(other_type_names)" }, + { + "name": "Types", + "scope": "entity.other support.type", + "foreground": "var(preprocessor_statements)" + }, + { + "name": "Types", + "scope": "entity.other.pseudo-element, entity.other.pseudo-element punctuation.definition, entity.other.pseudo-class, entity.other.pseudo-class punctuation.definition", + "foreground": "var(preprocessor_statements)" + }, { "name": "Headings", "scope": "markup.heading", - "foreground": "var(project_constants)", + "foreground": "var(heading)", "font_style": "bold" }, { @@ -275,7 +290,7 @@ }, { "name": "Colors", - "scope": "constant.other.color", + "scope": "constant.other.color, constant.other.color punctuation.definition", "foreground": "var(characters)" }, { @@ -301,7 +316,7 @@ { "name": "Embedded Variable", "scope": "variable.interpolation", - "foreground": "var(project_preprocessor_macros)" + "foreground": "var(other_variables)" }, { "name": "Illegal", From 1541d3c6ada738305d29a60ea2279c075f3bfad9 Mon Sep 17 00:00:00 2001 From: Koen Lageveen Date: Sun, 4 Oct 2020 21:03:12 +0200 Subject: [PATCH 06/10] sync --- Xcode Default.sublime-color-scheme | 39 +++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/Xcode Default.sublime-color-scheme b/Xcode Default.sublime-color-scheme index 8f4fe7a..75187b2 100644 --- a/Xcode Default.sublime-color-scheme +++ b/Xcode Default.sublime-color-scheme @@ -91,7 +91,7 @@ }, { "name": "Keywords", - "scope": "keyword.control.import", + "scope": "keyword.control, keyword.control punctuation.definition", "foreground": "var(preprocessor_statements)" }, { @@ -111,13 +111,18 @@ }, { "name": "Classes", - "scope": "entity.name - (entity.name.section | entity.name.tag | entity.name.label)", + "scope": "entity.name - (entity.name.section | entity.name.tag | entity.name.label), variable.other.dollar.only.js", "foreground": "var(project_class_names)" }, { "name": "Storage", "scope": "storage", - "foreground": "var(keywords)" + "foreground": "var(other_declarations)" + }, + { + "name": "Function Storage", + "scope": "meta.function.declaration storage.type.function, storage.type.function keyword.declaration, storage.type.class keyword.declaration", + "foreground": "var(other_declarations)" }, { "name": "Support Functions", @@ -142,7 +147,7 @@ { "name": "Support Constants", "scope": "support.constant, constant.language", - "foreground": "var(keywords)", + "foreground": "var(other_constants)", "font_style": "italic" }, { @@ -163,7 +168,7 @@ { "name": "Variables in Strings", "scope": "string variable", - "foreground": "var(plain_text)" + "foreground": "var(other_variables)" }, { "name": "Misc Punctuation", @@ -177,7 +182,7 @@ }, { "name": "Integers", - "scope": "constant.numeric", + "scope": "constant.numeric, constant.numeric punctuation.separator", "foreground": "var(numbers)" }, { @@ -188,12 +193,12 @@ { "name": "Tags", "scope": "entity.name.tag", - "foreground": "var(strings)" + "foreground": "var(project_class_names)" }, { "name": "Attributes", - "scope": "entity.other.attribute-name", - "foreground": "var(attributes)" + "scope": "entity.other.attribute-name, entity.other.attribute-name punctuation.definition", + "foreground": "var(project_method_names)" }, { "name": "Types", @@ -205,10 +210,20 @@ "scope": "support.type", "foreground": "var(other_type_names)" }, + { + "name": "Types", + "scope": "entity.other support.type", + "foreground": "var(preprocessor_statements)" + }, + { + "name": "Types", + "scope": "entity.other.pseudo-element, entity.other.pseudo-element punctuation.definition, entity.other.pseudo-class, entity.other.pseudo-class punctuation.definition", + "foreground": "var(preprocessor_statements)" + }, { "name": "Headings", "scope": "markup.heading", - "foreground": "var(project_constants)", + "foreground": "var(heading)", "font_style": "bold" }, { @@ -274,7 +289,7 @@ }, { "name": "Colors", - "scope": "constant.other.color", + "scope": "constant.other.color, constant.other.color punctuation.definition", "foreground": "var(characters)" }, { @@ -300,7 +315,7 @@ { "name": "Embedded Variable", "scope": "variable.interpolation", - "foreground": "var(project_preprocessor_macros)" + "foreground": "var(other_variables)" }, { "name": "Illegal", From 54b71f1bf1ade4ebbf06a9d6be96089d688ec5f2 Mon Sep 17 00:00:00 2001 From: Koen Lageveen Date: Sun, 13 Jun 2021 22:28:22 +0200 Subject: [PATCH 07/10] improved implementation for Default (light/dark) --- Xcode Default Dark.sublime-color-scheme | 58 +++++++++++++++++++----- Xcode Default.sublime-color-scheme | 59 ++++++++++++++++++++----- 2 files changed, 97 insertions(+), 20 deletions(-) diff --git a/Xcode Default Dark.sublime-color-scheme b/Xcode Default Dark.sublime-color-scheme index 6f319b2..e36ff2b 100644 --- a/Xcode Default Dark.sublime-color-scheme +++ b/Xcode Default Dark.sublime-color-scheme @@ -5,24 +5,30 @@ { "plain_text" : "#FFFFFFD9", "comments" : "#6C7986", + "documentation_markup" : "#6C7986", "documentation_markup_keywords" : "#92A1B1", "marks" : "#92A1B1", + "strings" : "#FC6A5D", "characters" : "#D0BF69", "numbers" : "#D0BF69", "keywords" : "#FC5FA3", + "preprocessor_statements" : "#FD8F3F", "urls" : "#5482FF", "attributes" : "#BF8555", + "type_declarations" : "#5DD8FF", "other_declarations" : "#41A1C0", + "project_class_names" : "#9EF1DD", "project_method_names" : "#67B7A4", "project_constants" : "#67B7A4", "project_type_names" : "#9EF1DD", "project_variables" : "#67B7A4", "project_preprocessor_macros" : "#FD8F3F", + "other_class_names" : "#D0A8FF", "other_method_names" : "#A167E6", "other_constants" : "#A167E6", @@ -40,18 +46,50 @@ "embedded": "color(var(background) blend(var(invisibles) 86%))", "invalid": "var(strings)", + + "yellow": "var(characters)" }, "globals": { - "foreground": "var(plain_text)", "background": "var(background)", - "caret": "var(cursor)", + "foreground": "var(plain_text)", "line_highlight": "var(current_line)", - "selection": "var(selection)", - "selection_border": "color(var(selection) blend(#000 92%)", - "inactive_selection": "color(var(selection) blend(var(background) 72%)", + "gutter": "var(background)", + "minimap_border": "var(comments)", + + "caret": "var(cursor)", + "block_caret": "var(cursor)", + "invisibles": "var(invisibles)", "misspelling": "var(strings)", - "shadow": "color(var(background) blend(#000 50%))" + + "highlight": "color(var(selection) lightness(+ 10%))", + "find_highlight": "var(current_line)", + "find_highlight_foreground": "var(plain_text)", + + "accent": "var(other_declarations)", + "fold_marker": "var(yellow)", + + "guide": "color(var(project_variables) alpha(20%))", + "active_guide": "color(var(project_variables) alpha(60%))", + "stack_guide": "color(var(project_variables) alpha(40%))", + + "selection": "var(selection)", + "selection_border": "color(var(selection) lightness(+ 10%))", + "inactive_selection": "color(var(selection) alpha(50%))", + + "brackets_options": "underline", + "brackets_foreground": "var(other_declarations)", + "bracket_contents_options": "underline", + "bracket_contents_foreground": "var(other_declarations)", + "tags_options": "stippled_underline", + "tags_foreground": "var(other_declarations)", + + "shadow": "color(#000 alpha(50%))", + "shadow_width": "4", + + "line_diff_added" : "var(project_variables)", + "line_diff_modified" : "var(yellow)", + "line_diff_deleted" : "var(strings)" }, "rules": [ @@ -321,14 +359,14 @@ { "name": "Illegal", "scope": "invalid.illegal", - "foreground": "#FFF", - "background": "var(invalid)" + "foreground": "var(invalid)", + "background": "color(var(invalid) blend(var(background) 50%))" }, { "name": "Invalid deprecated", "scope": "invalid.deprecated", - "foreground": "#FFF", - "background": "var(invalid)" + "foreground": "var(invalid)", + "background": "color(var(invalid) blend(var(background) 50%))" }, { "name": "Markdown Line Break", diff --git a/Xcode Default.sublime-color-scheme b/Xcode Default.sublime-color-scheme index 75187b2..dcd49c1 100644 --- a/Xcode Default.sublime-color-scheme +++ b/Xcode Default.sublime-color-scheme @@ -5,30 +5,37 @@ { "plain_text" : "#000000D9", "comments" : "#5D6C79", + "documentation_markup" : "#5D6C79", "documentation_markup_keywords" : "#4A5560", "marks" : "#4A5560", + "strings" : "#C41A16", "characters" : "#1C00CF", "numbers" : "#1C00CF", "keywords" : "#9B2393", + "preprocessor_statements" : "#643820", "urls" : "#0E0EFF", "attributes" : "#815F03", + "type_declarations" : "#0B4F79", "other_declarations" : "#0F68A0", + "project_class_names" : "#1C464A", "project_method_names" : "#326D74", "project_constants" : "#326D74", "project_type_names" : "#1C464A", "project_variables" : "#326D74", "project_preprocessor_macros" : "#643820", + "other_class_names" : "#3900A0", "other_method_names" : "#6C36A9", "other_constants" : "#6C36A9", "other_type_names" : "#3900A0", "other_variables" : "#6C36A9", "other_preprocessor_macros" : "#643820", + "heading" : "#AA0D91", "background" : "#FFF", @@ -39,18 +46,50 @@ "embedded": "color(var(background) blend(var(invisibles) 86%))", "invalid": "var(strings)", + + "yellow": "#BFB149" }, "globals": { - "foreground": "var(plain_text)", "background": "var(background)", - "caret": "var(cursor)", + "foreground": "var(plain_text)", "line_highlight": "var(current_line)", - "selection": "var(selection)", - "selection_border": "color(var(selection) blend(#000 92%)", - "inactive_selection": "color(var(selection) blend(var(background) 72%)", + "gutter": "var(background)", + "minimap_border": "var(comments)", + + "caret": "var(cursor)", + "block_caret": "var(cursor)", + "invisibles": "var(invisibles)", "misspelling": "var(strings)", - "shadow": "color(var(background) blend(#000 50%))" + + "highlight": "color(var(selection) lightness(- 10%))", + "find_highlight": "var(current_line)", + "find_highlight_foreground": "var(plain_text)", + + "accent": "var(other_declarations)", + "fold_marker": "var(yellow)", + + "guide": "color(var(project_variables) alpha(20%))", + "active_guide": "color(var(project_variables) alpha(60%))", + "stack_guide": "color(var(project_variables) alpha(40%))", + + "selection": "var(selection)", + "selection_border": "color(var(selection) lightness(- 10%))", + "inactive_selection": "color(var(selection) alpha(50%))", + + "brackets_options": "underline", + "brackets_foreground": "var(other_declarations)", + "bracket_contents_options": "underline", + "bracket_contents_foreground": "var(other_declarations)", + "tags_options": "stippled_underline", + "tags_foreground": "var(other_declarations)", + + "shadow": "color(#000 alpha(30%))", + "shadow_width": "4", + + "line_diff_added" : "var(project_variables)", + "line_diff_modified" : "var(yellow)", + "line_diff_deleted" : "var(strings)" }, "rules": [ @@ -320,14 +359,14 @@ { "name": "Illegal", "scope": "invalid.illegal", - "foreground": "#FFF", - "background": "var(invalid)" + "foreground": "var(invalid)", + "background": "color(var(invalid) blend(var(background) 50%))" }, { "name": "Invalid deprecated", "scope": "invalid.deprecated", - "foreground": "#FFF", - "background": "var(invalid)" + "foreground": "var(invalid)", + "background": "color(var(invalid) blend(var(background) 50%))" }, { "name": "Markdown Line Break", From ff6a269f39c87a8f66030cb417ac31be5544b25e Mon Sep 17 00:00:00 2001 From: Koen Lageveen Date: Mon, 14 Jun 2021 12:09:03 +0200 Subject: [PATCH 08/10] differentiate on/inside brackets --- Xcode Default Dark.sublime-color-scheme | 2 +- Xcode Default.sublime-color-scheme | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Xcode Default Dark.sublime-color-scheme b/Xcode Default Dark.sublime-color-scheme index e36ff2b..53b0e49 100644 --- a/Xcode Default Dark.sublime-color-scheme +++ b/Xcode Default Dark.sublime-color-scheme @@ -78,7 +78,7 @@ "inactive_selection": "color(var(selection) alpha(50%))", "brackets_options": "underline", - "brackets_foreground": "var(other_declarations)", + "brackets_foreground": "var(other_constants)", "bracket_contents_options": "underline", "bracket_contents_foreground": "var(other_declarations)", "tags_options": "stippled_underline", diff --git a/Xcode Default.sublime-color-scheme b/Xcode Default.sublime-color-scheme index dcd49c1..cf11f79 100644 --- a/Xcode Default.sublime-color-scheme +++ b/Xcode Default.sublime-color-scheme @@ -78,7 +78,7 @@ "inactive_selection": "color(var(selection) alpha(50%))", "brackets_options": "underline", - "brackets_foreground": "var(other_declarations)", + "brackets_foreground": "var(other_constants)", "bracket_contents_options": "underline", "bracket_contents_foreground": "var(other_declarations)", "tags_options": "stippled_underline", From a4a0fc0dcfcbbafce2f2d775b4441b0cf718aae5 Mon Sep 17 00:00:00 2001 From: Koen Lageveen Date: Mon, 14 Jun 2021 18:40:35 +0200 Subject: [PATCH 09/10] markup colors and readable variables --- Xcode Default Dark.sublime-color-scheme | 19 +++--- Xcode Default.sublime-color-scheme | 87 +++++++++++++++---------- 2 files changed, 63 insertions(+), 43 deletions(-) diff --git a/Xcode Default Dark.sublime-color-scheme b/Xcode Default Dark.sublime-color-scheme index 53b0e49..051c45a 100644 --- a/Xcode Default Dark.sublime-color-scheme +++ b/Xcode Default Dark.sublime-color-scheme @@ -3,6 +3,11 @@ "author": "Koen Lageveen, inspired by Apple", "variables": { + "yellow": "#D0BF69", + "red": "#FC6A5D", + "green": "#67B7A4", + + "plain_text" : "#FFFFFFD9", "comments" : "#6C7986", @@ -45,9 +50,7 @@ "invisibles" : "#424D5B", "embedded": "color(var(background) blend(var(invisibles) 86%))", - "invalid": "var(strings)", - - "yellow": "var(characters)" + "invalid": "var(strings)" }, "globals": { @@ -96,12 +99,12 @@ { "name": "Error", "scope": "markup.error", - "foreground": "var(strings)" + "foreground": "var(red)" }, { "name": "Warning", "scope": "markup.warning", - "foreground": "var(attributes)" + "foreground": "var(yellow)" }, { "name": "Parameters", @@ -314,17 +317,17 @@ { "name": "Inserted", "scope": "markup.inserted", - "foreground": "var(comments)" + "foreground": "var(green)" }, { "name": "Deleted", "scope": "markup.deleted", - "foreground": "var(invalid)" + "foreground": "var(red)" }, { "name": "Changed", "scope": "markup.changed", - "foreground": "var(attributes)" + "foreground": "var(yellow)" }, { "name": "Colors", diff --git a/Xcode Default.sublime-color-scheme b/Xcode Default.sublime-color-scheme index cf11f79..64a1037 100644 --- a/Xcode Default.sublime-color-scheme +++ b/Xcode Default.sublime-color-scheme @@ -3,40 +3,59 @@ "author": "Koen Lageveen, inspired by Apple", "variables": { + "blue": "#0B4F79", + "light_blue": "#0F68A0", + "hard_blue": "#1C00CF", + "bondi": "#1C464A", + "light_bondi": "#326D74", + "purple": "#3900A0", + "light_purple": "#6C36A9", + "fuchsia": "#9B2393", + "light_fuchsia": "#AA0D91", + "grey": "#4A5560", + "light_grey": "#5D6C79", + "brown": "#643820", + "light_brown": "#815F03", + + "red": "#C41A16", + "green": "#007826", + "yellow": "#BFB149", + + "plain_text" : "#000000D9", - "comments" : "#5D6C79", + "comments" : "var(light_grey)", - "documentation_markup" : "#5D6C79", - "documentation_markup_keywords" : "#4A5560", - "marks" : "#4A5560", + "documentation_markup" : "var(light_grey)", + "documentation_markup_keywords" : "var(grey)", + "marks" : "var(grey)", - "strings" : "#C41A16", - "characters" : "#1C00CF", - "numbers" : "#1C00CF", - "keywords" : "#9B2393", + "strings" : "var(red)", + "characters" : "var(hard_blue)", + "numbers" : "var(hard_blue)", + "keywords" : "var(fuchsia)", - "preprocessor_statements" : "#643820", + "preprocessor_statements" : "var(brown)", "urls" : "#0E0EFF", - "attributes" : "#815F03", + "attributes" : "var(light_brown)", - "type_declarations" : "#0B4F79", - "other_declarations" : "#0F68A0", + "type_declarations" : "var(blue)", + "other_declarations" : "var(light_blue)", - "project_class_names" : "#1C464A", - "project_method_names" : "#326D74", - "project_constants" : "#326D74", - "project_type_names" : "#1C464A", - "project_variables" : "#326D74", - "project_preprocessor_macros" : "#643820", + "project_class_names" : "var(bondi)", + "project_method_names" : "var(light_bondi)", + "project_constants" : "var(light_bondi)", + "project_type_names" : "var(bondi)", + "project_variables" : "var(light_bondi)", + "project_preprocessor_macros" : "var(brown)", - "other_class_names" : "#3900A0", - "other_method_names" : "#6C36A9", - "other_constants" : "#6C36A9", - "other_type_names" : "#3900A0", - "other_variables" : "#6C36A9", - "other_preprocessor_macros" : "#643820", + "other_class_names" : "var(purple)", + "other_method_names" : "var(light_purple)", + "other_constants" : "var(light_purple)", + "other_type_names" : "var(purple)", + "other_variables" : "var(light_purple)", + "other_preprocessor_macros" : "var(brown)", - "heading" : "#AA0D91", + "heading" : "var(light_fuchsia)", "background" : "#FFF", "current_line" : "#E8F2FF", @@ -45,9 +64,7 @@ "invisibles" : "#CCCCCC", "embedded": "color(var(background) blend(var(invisibles) 86%))", - "invalid": "var(strings)", - - "yellow": "#BFB149" + "invalid": "var(red)" }, "globals": { @@ -87,21 +104,21 @@ "shadow": "color(#000 alpha(30%))", "shadow_width": "4", - "line_diff_added" : "var(project_variables)", + "line_diff_added" : "var(green)", "line_diff_modified" : "var(yellow)", - "line_diff_deleted" : "var(strings)" + "line_diff_deleted" : "var(red)" }, "rules": [ { "name": "Error", "scope": "markup.error", - "foreground": "var(strings)" + "foreground": "var(red)" }, { "name": "Warning", "scope": "markup.warning", - "foreground": "var(attributes)" + "foreground": "var(yellow)" }, { "name": "Parameters", @@ -314,17 +331,17 @@ { "name": "Inserted", "scope": "markup.inserted", - "foreground": "var(comments)" + "foreground": "var(green)" }, { "name": "Deleted", "scope": "markup.deleted", - "foreground": "var(invalid)" + "foreground": "var(red)" }, { "name": "Changed", "scope": "markup.changed", - "foreground": "var(attributes)" + "foreground": "var(yellow)" }, { "name": "Colors", From f9b7465cdfaabe5f14ce8c14d55bf4511bb0d392 Mon Sep 17 00:00:00 2001 From: Koen Lageveen Date: Mon, 14 Jun 2021 20:05:28 +0200 Subject: [PATCH 10/10] specify gutter colors --- Xcode Default Dark.sublime-color-scheme | 4 ++++ Xcode Default.sublime-color-scheme | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Xcode Default Dark.sublime-color-scheme b/Xcode Default Dark.sublime-color-scheme index 051c45a..a1beba7 100644 --- a/Xcode Default Dark.sublime-color-scheme +++ b/Xcode Default Dark.sublime-color-scheme @@ -57,7 +57,11 @@ "background": "var(background)", "foreground": "var(plain_text)", "line_highlight": "var(current_line)", + "gutter": "var(background)", + "gutter_foreground": "var(invisibles)", + "gutter_foreground_highlight": "var(comments)", + "minimap_border": "var(comments)", "caret": "var(cursor)", diff --git a/Xcode Default.sublime-color-scheme b/Xcode Default.sublime-color-scheme index 64a1037..2ef6e61 100644 --- a/Xcode Default.sublime-color-scheme +++ b/Xcode Default.sublime-color-scheme @@ -71,7 +71,11 @@ "background": "var(background)", "foreground": "var(plain_text)", "line_highlight": "var(current_line)", + "gutter": "var(background)", + "gutter_foreground": "var(invisibles)", + "gutter_foreground_highlight": "var(comments)", + "minimap_border": "var(comments)", "caret": "var(cursor)",