From 10ddbade841551393d17e7e925209981b32986cf Mon Sep 17 00:00:00 2001 From: Snack Date: Wed, 9 Sep 2015 18:25:03 +0900 Subject: [PATCH 1/3] Clean up Added UUID All color codes are in lowercase Fixed some indents Reordered Sublime Linter rules at the bottom to the existing rules --- Solarized (dark).tmTheme | 227 ++++++++++++++++++------------------- Solarized (light).tmTheme | 233 +++++++++++++++++++------------------- 2 files changed, 225 insertions(+), 235 deletions(-) diff --git a/Solarized (dark).tmTheme b/Solarized (dark).tmTheme index c15a125..e26be5e 100644 --- a/Solarized (dark).tmTheme +++ b/Solarized (dark).tmTheme @@ -3,7 +3,7 @@ name - Solarized (light) + Solarized (dark) settings @@ -13,34 +13,25 @@ background #002b36 - caret #eee8d5 - foreground #839496 - + gutter + #073642 invisibles #586e75 - lineHighlight #073642 - selection - #2C4C55 - + #2c4c55 selectionBorder #586e75 - - gutter - #073642 - - + - - - + + + @@ -80,7 +71,7 @@ name - Escape \char + Escape \ char scope constant.character.escape settings @@ -130,7 +121,7 @@ settings foreground - #CB4B16 + #cb4b16 @@ -140,8 +131,8 @@ keyword.operator.comparison, keyword.operator.assignment, keyword.operator.arithmetic settings - foreground - #657b83 + foreground + #657b83 @@ -207,7 +198,7 @@ settings foreground - #B58900 + #b58900 @@ -218,7 +209,7 @@ settings foreground - #DC322F + #dc322f @@ -229,7 +220,7 @@ settings foreground - #CB4B16 + #cb4b16 @@ -240,7 +231,7 @@ settings foreground - #268BD2 + #268bd2 @@ -273,7 +264,7 @@ settings foreground - #DC322F + #dc322f @@ -295,7 +286,7 @@ settings foreground - #CB4B16 + #cb4b16 @@ -306,7 +297,7 @@ settings foreground - #CB4B16 + #cb4b16 @@ -317,7 +308,7 @@ settings background - #6E2E32 + #6e2e32 @@ -350,7 +341,7 @@ settings foreground - #268BD2 + #268bd2 @@ -392,13 +383,13 @@ name - CSS: Selector > [] and non-spec tags + CSS: Selector > [] and non-spec tags scope meta.selector.css settings foreground - #657B83 + #657b83 @@ -455,7 +446,7 @@ settings foreground - #657B83 + #657b83 @@ -490,7 +481,7 @@ settings foreground - #B58900 + #b58900 @@ -501,7 +492,7 @@ settings foreground - #2AA198 + #2aa198 @@ -512,7 +503,7 @@ settings foreground - #CB4B16 + #cb4b16 @@ -538,7 +529,7 @@ settings foreground - #CB4B16 + #cb4b16 @@ -562,7 +553,7 @@ settings foreground - #DC322F + #dc322f @@ -573,7 +564,7 @@ settings foreground - #2AA198 + #2aa198 @@ -586,7 +577,7 @@ settings foreground - #DC322F + #dc322f @@ -597,7 +588,7 @@ settings foreground - #B58900 + #b58900 @@ -608,7 +599,7 @@ settings foreground - #B58900 + #b58900 @@ -619,7 +610,7 @@ settings foreground - #CB4B16 + #cb4b16 @@ -630,7 +621,7 @@ settings foreground - #DC322F + #dc322f @@ -641,7 +632,7 @@ settings foreground - #2AA198 + #2aa198 @@ -652,7 +643,7 @@ settings foreground - #B58900 + #b58900 @@ -663,7 +654,7 @@ settings foreground - #DC322F + #dc322f @@ -674,7 +665,7 @@ settings foreground - #2AA198 + #2aa198 @@ -685,7 +676,7 @@ settings foreground - #DC322F + #dc322f @@ -707,7 +698,7 @@ settings foreground - #CB4B16 + #cb4b16 @@ -718,7 +709,7 @@ settings foreground - #2AA198 + #2aa198 @@ -729,7 +720,7 @@ settings foreground - #2AA198 + #2aa198 @@ -753,7 +744,7 @@ settings foreground - #B58900 + #b58900 @@ -788,7 +779,7 @@ settings foreground - #DC322F + #dc322f @@ -849,7 +840,7 @@ settings foreground - #DC322F + #dc322f @@ -882,32 +873,32 @@ scope markup.heading, punctuation.definition.heading.markdown settings - - foreground - #b58900 - + + foreground + #b58900 + - Name + name Markdown quote scope markup.quote settings - - foreground - #859900 - + + foreground + #859900 + - Name + name Markdown em scope markup.italic settings - - fontStyle - italic - + + fontStyle + italic + Name @@ -915,10 +906,10 @@ scope markup.bold settings - - fontStyle - bold - + + fontStyle + bold + Name @@ -926,32 +917,32 @@ scope markup.underline.link.markdown, meta.link.reference constant.other.reference.link.markdown settings - - foreground - #2aa198 - + + foreground + #2aa198 + - Name + name Markdown reference list scope constant.other.reference.link.markdown settings - - foreground - #6c71c4 - + + foreground + #6c71c4 + - Name + name Markdown linebreak scope meta.paragraph.markdown meta.dummy.line-break settings - - background - #586e75 - + + background + #586e75 + @@ -1042,107 +1033,111 @@ name - SublimeBracketHighlighter + SublimeLinter Warning scope - brackethighlighter.all + sublimelinter.mark.warning settings foreground - #586e75 + #b58900 name - Find In Files: File Name + SublimeLinter Error scope - entity.name.filename.find-in-files + sublimelinter.mark.error settings foreground - #2AA198 + #dc322f name - Find In Files: Line numbers + SublimeLinter Gutter Mark scope - constant.numeric.line-number.find-in-files + sublimelinter.gutter-mark settings foreground - #586e75 + #657b83 - + name - GitGutter deleted + SublimeBracketHighlighter scope - markup.deleted.git_gutter + brackethighlighter.all settings foreground - #dc322f + #586e75 + + name - GitGutter inserted + Find In Files: File Name scope - markup.inserted.git_gutter + entity.name.filename.find-in-files settings foreground - #859900 + #2aa198 name - GitGutter changed + Find In Files: Line numbers scope - markup.changed.git_gutter + constant.numeric.line-number.find-in-files settings foreground - #b58900 + #586e75 - + name - SublimeLinter Warning + GitGutter deleted scope - sublimelinter.mark.warning + markup.deleted.git_gutter settings foreground - #b58900 + #dc322f name - SublimeLinter Error + GitGutter inserted scope - sublimelinter.mark.error + markup.inserted.git_gutter settings foreground - #dc322f + #859900 name - SublimeLinter Gutter Mark + GitGutter changed scope - sublimelinter.gutter-mark + markup.changed.git_gutter settings foreground - #657b83 + #b58900 + uuid + 5815b34d-fb7d-4593-bf0c-4f41f8b1f0a9 diff --git a/Solarized (light).tmTheme b/Solarized (light).tmTheme index d1b903f..a6be845 100644 --- a/Solarized (light).tmTheme +++ b/Solarized (light).tmTheme @@ -13,34 +13,25 @@ background #fdf6e3 - caret #073642 - foreground #657b83 - + gutter + #eee8d5 invisibles #eee8d5 - lineHighlight #eee8d5 - selection #eee8d5 - selectionBorder #c0c4bb - - gutter - #eee8d5 - - + - - - + + + @@ -53,7 +44,7 @@ settings foreground - #93a1a1 + #586e75 @@ -80,7 +71,7 @@ name - Escape \char + Escape \ char scope constant.character.escape settings @@ -130,7 +121,7 @@ settings foreground - #CB4B16 + #cb4b16 @@ -140,8 +131,8 @@ keyword.operator.comparison, keyword.operator.assignment, keyword.operator.arithmetic settings - foreground - #657b83 + foreground + #657b83 @@ -207,7 +198,7 @@ settings foreground - #B58900 + #b58900 @@ -218,7 +209,7 @@ settings foreground - #DC322F + #dc322f @@ -229,7 +220,7 @@ settings foreground - #CB4B16 + #cb4b16 @@ -240,7 +231,7 @@ settings foreground - #268BD2 + #268bd2 @@ -251,7 +242,7 @@ settings foreground - #93A1A1 + #93a1a1 @@ -273,7 +264,7 @@ settings foreground - #DC322F + #dc322f @@ -295,7 +286,7 @@ settings foreground - #CB4B16 + #cb4b16 @@ -306,7 +297,7 @@ settings foreground - #CB4B16 + #cb4b16 @@ -350,7 +341,7 @@ settings foreground - #268BD2 + #268bd2 @@ -392,13 +383,13 @@ name - CSS: Selector > [] and non-spec tags + CSS: Selector > [] and non-spec tags scope meta.selector.css settings foreground - #657B83 + #657b83 @@ -455,7 +446,7 @@ settings foreground - #657B83 + #657b83 @@ -490,7 +481,7 @@ settings foreground - #B58900 + #b58900 @@ -501,7 +492,7 @@ settings foreground - #2AA198 + #2aa198 @@ -512,7 +503,7 @@ settings foreground - #CB4B16 + #cb4b16 @@ -538,12 +529,12 @@ settings foreground - #CB4B16 + #cb4b16 name - C: Include + C: include scope meta.preprocessor.c.include string.quoted.other.lt-gt.include.c, meta.preprocessor.c.include punctuation.definition.string.begin.c, meta.preprocessor.c.include punctuation.definition.string.end.c settings @@ -562,7 +553,7 @@ settings foreground - #DC322F + #dc322f @@ -573,7 +564,7 @@ settings foreground - #2AA198 + #2aa198 @@ -586,7 +577,7 @@ settings foreground - #DC322F + #dc322f @@ -597,7 +588,7 @@ settings foreground - #B58900 + #b58900 @@ -608,7 +599,7 @@ settings foreground - #B58900 + #b58900 @@ -619,7 +610,7 @@ settings foreground - #CB4B16 + #cb4b16 @@ -630,7 +621,7 @@ settings foreground - #DC322F + #dc322f @@ -641,7 +632,7 @@ settings foreground - #2AA198 + #2aa198 @@ -652,7 +643,7 @@ settings foreground - #B58900 + #b58900 @@ -663,7 +654,7 @@ settings foreground - #DC322F + #dc322f @@ -674,7 +665,7 @@ settings foreground - #2AA198 + #2aa198 @@ -685,7 +676,7 @@ settings foreground - #DC322F + #dc322f @@ -707,7 +698,7 @@ settings foreground - #CB4B16 + #cb4b16 @@ -718,7 +709,7 @@ settings foreground - #2AA198 + #2aa198 @@ -729,7 +720,7 @@ settings foreground - #2AA198 + #2aa198 @@ -753,7 +744,7 @@ settings foreground - #B58900 + #b58900 @@ -766,7 +757,7 @@ settings foreground - #586E75 + #586e75 @@ -777,7 +768,7 @@ settings foreground - #586E75 + #586e75 @@ -788,7 +779,7 @@ settings foreground - #DC322F + #dc322f @@ -801,7 +792,7 @@ settings foreground - #586E75 + #586e75 @@ -849,7 +840,7 @@ settings foreground - #DC322F + #dc322f @@ -882,32 +873,32 @@ scope markup.heading, punctuation.definition.heading.markdown settings - - foreground - #b58900 - + + foreground + #b58900 + - Name + name Markdown quote scope markup.quote settings - - foreground - #859900 - + + foreground + #859900 + - Name + name Markdown em scope markup.italic settings - - fontStyle - italic - + + fontStyle + italic + Name @@ -915,10 +906,10 @@ scope markup.bold settings - - fontStyle - bold - + + fontStyle + bold + Name @@ -926,32 +917,32 @@ scope markup.underline.link.markdown, meta.link.reference constant.other.reference.link.markdown settings - - foreground - #2aa198 - + + foreground + #2aa198 + - Name + name Markdown reference list scope constant.other.reference.link.markdown settings - - foreground - #6c71c4 - + + foreground + #6c71c4 + - Name + name Markdown linebreak scope meta.paragraph.markdown meta.dummy.line-break settings - - background - #eee8d5 - + + background + #eee8d5 + @@ -1042,107 +1033,111 @@ name - SublimeBracketHighlighter + SublimeLinter Warning scope - brackethighlighter.all + sublimelinter.mark.warning settings foreground - #93a1a1 + #b58900 name - Find In Files: File Name + SublimeLinter Error scope - entity.name.filename.find-in-files + sublimelinter.mark.error settings foreground - #2AA198 + #dc322f name - Find In Files: Line numbers + SublimeLinter Gutter Mark scope - constant.numeric.line-number.find-in-files + sublimelinter.gutter-mark settings foreground - #93a1a1 + #657b83 - + name - GitGutter deleted + SublimeBracketHighlighter scope - markup.deleted.git_gutter + brackethighlighter.all settings foreground - #dc322f + #93a1a1 + + name - GitGutter inserted + Find In Files: File Name scope - markup.inserted.git_gutter + entity.name.filename.find-in-files settings foreground - #859900 + #2aa198 name - GitGutter changed + Find In Files: Line numbers scope - markup.changed.git_gutter + constant.numeric.line-number.find-in-files settings foreground - #b58900 + #93a1a1 - + name - SublimeLinter Warning + GitGutter deleted scope - sublimelinter.mark.warning + markup.deleted.git_gutter settings foreground - #b58900 + #dc322f name - SublimeLinter Error + GitGutter inserted scope - sublimelinter.mark.error + markup.inserted.git_gutter settings foreground - #dc322f + #859900 name - SublimeLinter Gutter Mark + GitGutter changed scope - sublimelinter.gutter-mark + markup.changed.git_gutter settings foreground - #657b83 + #b58900 + uuid + ca238b9c-28f7-42d4-9670-bd0829ef864e From 7283b0bcf1cf6198b8e9a128e03957e1ac3aff61 Mon Sep 17 00:00:00 2001 From: Snack Date: Wed, 9 Sep 2015 18:28:12 +0900 Subject: [PATCH 2/3] Add JavaScript Next support --- Solarized (dark).tmTheme | 13 +++++++++++++ Solarized (light).tmTheme | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/Solarized (dark).tmTheme b/Solarized (dark).tmTheme index e26be5e..b075a10 100644 --- a/Solarized (dark).tmTheme +++ b/Solarized (dark).tmTheme @@ -1136,6 +1136,19 @@ #b58900 + + + + name + JavaScriptNext: Variables + scope + variable.other.readwrite + settings + + foreground + #839496 + + uuid 5815b34d-fb7d-4593-bf0c-4f41f8b1f0a9 diff --git a/Solarized (light).tmTheme b/Solarized (light).tmTheme index a6be845..d4ff564 100644 --- a/Solarized (light).tmTheme +++ b/Solarized (light).tmTheme @@ -1136,6 +1136,19 @@ #b58900 + + + + name + JavaScriptNext: Variables + scope + variable.other.readwrite + settings + + foreground + #657b83 + + uuid ca238b9c-28f7-42d4-9670-bd0829ef864e From 4f0b3fad321641eaede984c9a4f6a576dc494dba Mon Sep 17 00:00:00 2001 From: Snack Date: Thu, 10 Sep 2015 11:23:23 +0900 Subject: [PATCH 3/3] Revert some clean-ups, scoping JS Next --- Solarized (dark).tmTheme | 8 ++++---- Solarized (light).tmTheme | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Solarized (dark).tmTheme b/Solarized (dark).tmTheme index b075a10..ac00f67 100644 --- a/Solarized (dark).tmTheme +++ b/Solarized (dark).tmTheme @@ -383,7 +383,7 @@ name - CSS: Selector > [] and non-spec tags + CSS: Selector > [] and non-spec tags scope meta.selector.css settings @@ -923,7 +923,7 @@ - name + Name Markdown reference list scope constant.other.reference.link.markdown @@ -934,7 +934,7 @@ - name + Name Markdown linebreak scope meta.paragraph.markdown meta.dummy.line-break @@ -1142,7 +1142,7 @@ name JavaScriptNext: Variables scope - variable.other.readwrite + variable.other.readwrite.js settings foreground diff --git a/Solarized (light).tmTheme b/Solarized (light).tmTheme index d4ff564..0565e0c 100644 --- a/Solarized (light).tmTheme +++ b/Solarized (light).tmTheme @@ -383,7 +383,7 @@ name - CSS: Selector > [] and non-spec tags + CSS: Selector > [] and non-spec tags scope meta.selector.css settings @@ -923,7 +923,7 @@ - name + Name Markdown reference list scope constant.other.reference.link.markdown @@ -934,7 +934,7 @@ - name + Name Markdown linebreak scope meta.paragraph.markdown meta.dummy.line-break @@ -1142,7 +1142,7 @@ name JavaScriptNext: Variables scope - variable.other.readwrite + variable.other.readwrite.js settings foreground