diff --git a/.gitattributes b/.gitattributes index 39c9ddb..fcdd626 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,8 +4,9 @@ .gitattributes export-ignore .editorconfig export-ignore package.json export-ignore +yarn.lock export-ignore src/ export-ignore -scripts/ export-ignore +scripts/ export-ignore .gitignore merge=ours .gitattributes merge=ours diff --git a/CHANGELOG.md b/CHANGELOG.md index bcc4d00..57d484d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,12 +7,21 @@ This change log adheres to standards from [Keep a CHANGELOG]. [Semantic Versioning]: http://semver.org/ [Keep a CHANGELOG]: http://keepachangelog.com +## [1.2.4] 2021-06-07 + +### :nail_care: Polish +* Refine Javascript spefic color scheme +* Refine Python specific color scheme +* Refine PHP specific color scheme +* Refine Bash specific color scheme +* Refine Sass specific color scheme + ## [1.2.3] 2021-06-04 -### Fix +### :bug: BugFix * Fix an issue with the graphic resolution that showed some artifacts on windows. -### Polish +### :nail_care: Polish * Refine the color scheme. * Update the tab close icon. @@ -60,6 +69,8 @@ This change log adheres to standards from [Keep a CHANGELOG]. * Add Scrollbars (Whoa, magical!) * Support for 'Skins' plugin. +[1.2.4]: https://github.com/erremauro/TwoDark/compare/v1.2.3...v1.2.4 +[1.2.3]: https://github.com/erremauro/TwoDark/compare/v1.2.2...v1.2.3 [1.2.2]: https://github.com/erremauro/TwoDark/compare/v1.2.1...v1.2.2 [1.2.1]: https://github.com/erremauro/TwoDark/compare/v1.2.0...v1.2.1 [1.2.0]: https://github.com/erremauro/TwoDark/compare/v1.1.2...v1.2.0 @@ -67,4 +78,3 @@ This change log adheres to standards from [Keep a CHANGELOG]. [1.1.1]: https://github.com/erremauro/TwoDark/compare/v1.1.0...v1.1.1 [1.1.0]: https://github.com/erremauro/TwoDark/compare/v1.0.0...v1.1.0 [1.0.0]: https://github.com/erremauro/TwoDark/releases/tag/v1.0.0 - diff --git a/README.md b/README.md index d75bf11..4fc0b27 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # TwoDark -Atom's OneDark-UI inspired theme for [Sublime Text][3]. +Atom's OneDark inspired theme for [Sublime Text][3]. ## Why? diff --git a/TwoDark.skins b/TwoDark.skins index 3e08057..790eff6 100644 --- a/TwoDark.skins +++ b/TwoDark.skins @@ -1,13 +1,13 @@ { - "TwoDark - Default": - { - "Preferences": - { - "color_scheme": "Packages/Theme - TwoDark/TwoDark.sublime-color-scheme", - "theme": "TwoDark.sublime-theme", - "draw_shadows": false, - "highlight_modified_tabs": true, - "caret_extra_width": 1 - } - } + "TwoDark - Default": { + "Preferences": { + "theme": "TwoDark.sublime-theme", + "color_scheme": "Packages/Theme - TwoDark/TwoDark.sublime-color-scheme", + "draw_shadows": false, + "highlight_modified_tabs": true, + "caret_extra_width": 1, + "caret_style": "smooth", + "highlight_line": true + } + } } diff --git a/TwoDark.sublime-color-scheme b/TwoDark.sublime-color-scheme index 70454e7..c69f544 100644 --- a/TwoDark.sublime-color-scheme +++ b/TwoDark.sublime-color-scheme @@ -22,7 +22,7 @@ "blue": "hsl(210, 73%, 68%)", "dark_blue": "hsl(222, 29%, 30%)", "cyan": "hsl(189, 39%, 59%)", - "yellow": "hsl(40, 94%, 68%)", + "yellow": "hsl(40, 59%, 70%)", "green": "hsl(90, 34%, 63%)", "mocha": "hsl(55, 5%, 43%)" }, @@ -59,7 +59,7 @@ }, { "name": "Comment", - "scope": "comment, punctuation.definition.comment", + "scope": "comment, punctuation.definition.comment, entity.other.attribute-name.documentation", "foreground": "var(light_grey)", "font_style": "italic" }, @@ -88,6 +88,11 @@ "scope": "variable.member", "foreground": "var(red)" }, + { + "name": "Language Variable", + "scope": "variable.language", + "foreground": "var(red)" + }, { "name": "Function", "scope": "entity.name.function, meta.require, support.function, support.macro", @@ -126,7 +131,7 @@ { "name": "Support", "scope": "support.function", - "foreground": "var(cyan)" + "foreground": "var(blue)" }, { "name": "String", @@ -310,55 +315,120 @@ "background": "var(mocha)", "foreground": "var(darker_grey)" }, + // Javascript specific color scheme { "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", "foreground": "var(blue)" }, { - "name": "Python logical keyword", - "scope": "source.python keyword.operator.logical.python", + "name": "Javascript Constant", + "scope": "support.constant.builtin", + "foreground": "var(orange)" + }, + { + "name": "Node Constant", + "scope": "support.constant.node.js", + "foreground": "var(red)" + }, + { + "name": "Javascript Builtin Function", + "scope": "support.function.dom, support.function.node", + "foreground": "var(cyan)" + }, + // Python specific color scheme + { + "name": "Python Builtin Function", + "scope": "support.type.python, support.function.builtin.python", + "foreground": "var(cyan)" + }, + { + "name": "Python Function Call", + "scope": "meta.function-call.python", + "foreground": "var(white)" + }, + { + "name": "Python Function Brackets", + "scope": "meta.function.parameters.python punctuation.section.parameters.begin.python, meta.function.parameters.python punctuation.section.parameters.end.python", + "foreground": "var(white)" + }, + { + "name": "Python Meta Decorator", + "scope": "meta.annotation.python", + "foreground": "var(blue)" + }, + // PHP specific color scheme + { + "name": "PHP Variable Dollar", + "scope": "punctuation.definition.variable.php", + "foreground": "var(white)" + }, + { + "name": "PHP Arrow Accessor", + "scope": "punctuation.accessor.arrow.php", "foreground": "var(pink)" }, { - "name": "Python function parameter", - "scope": "meta.function-call.python, meta.function.parameters.python, variable.parameter.function.python", - "foreground": "var(orange)" + "name": "PHP Variable", + "scope": "source.php variable", + "foreground": "var(red)" }, { - "name": "Python class begin", - "scope": "source.python meta.class.python punctuation.definition.inheritance.begin.python", - "foreground": "var(orange)" + "name": "PHP Namespace Path", + "scope": "meta.namespace.php meta.path.php", + "foreground": "var(yellow)" }, { - "name": "Python class end", - "scope": "source.python meta.class.python punctuation.definition.inheritance.end.python", - "foreground": "var(orange)" + "name": "PHP Namespace Path Separator", + "scope": "meta.path.php punctuation.separator.namespace.php", + "foreground": "var(white)" }, + // Bash specific color scheme { - "name": "Javascript meta constant", - "scope": "source.js meta.function.js support.constant.js", - "foreground": "var(orange)" + "name": "Bash Variable", + "scope": "variable.other.readwrite.shell", + "foreground": "var(red)" }, { - "name": "Laravel Blade Punctuation Begin", - "scope": "text.blade punctuation.section.embedded.begin.blade, text.blade punctuation.section.embedded.end.blade", + "name": "Shebang constant", + "scope": "comment.line.shebang.shell constant.language.shebang.shell", + "foreground": "var(light_grey)" + }, + { + "name": "Shell Double Bracket", + "scope": "support.function.double-brace.begin.shell, support.function.double-brace.end.shell, support.function.test.begin.shell, support.function.test.end.shell", + "foreground": "var(white)" + }, + { + "name": "Shell Function", + "scope": "support.function.echo.shell, support.function.set.shell", "foreground": "var(cyan)" }, { - "name": "Laravel Blade Tag", - "scope": "text.html.blade entity.name.tag.blade", - "foreground": "var(green)" + "name": "Shell Tilde", + "scope": "variable.language.tilde.shell", + "foreground": "var(white)" }, + // SASS Specific syntax { - "name": "Laravel Blade @", - "scope": "text.html.blade constant.other.inline-data.html", - "foreground": "var(pink)" + "name": "Sass Property Name", + "scope": "support.type.property-name.css", + "foreground": "var(white)" }, { - "name": "Laravel Blade @", - "scope": "custom.compiler.blade.php support.function", - "foreground": "var(pink)" + "name": "Sass Variable", + "scope": "variable.declaration.sass, variable.other.sass", + "foreground": "var(red)" + }, + { + "name": "Sass Selector", + "scope": "meta.selector.css", + "foreground": "var(orange)" + }, + { + "name": "Sass Ampersand", + "scope": "keyword.operator.ampersand.sass", + "foreground": "var(red)" } ] } diff --git a/Widget - TwoDark.sublime-settings b/Widget - TwoDark.sublime-settings index 6f7d6cc..3bad0ec 100755 --- a/Widget - TwoDark.sublime-settings +++ b/Widget - TwoDark.sublime-settings @@ -1,7 +1,8 @@ { "color_scheme": "Packages/Theme - TwoDark/Widget - TwoDark.stTheme", "draw_shadows": false, - "caret_extra_width": 1, "highlight_modified_tabs": true, + "caret_extra_width": 1, + "caret_style": "smooth", + "highlight_line": true } - diff --git a/messages.json b/messages.json index 51f7414..0b45a84 100644 --- a/messages.json +++ b/messages.json @@ -7,4 +7,5 @@ "1.2.1": "messages/1.2.1.txt", "1.2.2": "messages/1.2.2.txt", "1.2.3": "messages/1.2.3.txt", + "1.2.4": "messages/1.2.4.txt", } diff --git a/messages/1.2.4.txt b/messages/1.2.4.txt new file mode 100644 index 0000000..b36ea8c --- /dev/null +++ b/messages/1.2.4.txt @@ -0,0 +1,73 @@ +TwoDark v1.2.2 is here! + +This version migrate to `sublime-color-scheme` format! Head over to your +preferences and make the following changes: + + { + "theme": "TwoDark.sublime-theme", + "color_scheme": "Packages/Theme - TwoDark/TwoDark.sublime-color-scheme", + "draw_shadows": false, + "highlight_modified_tabs": true, + "caret_extra_width": 1, + "caret_style": "smooth", + "highlight_line": true + } + +TwoDark Changelog +================== + +## [1.2.4] 2021-06-07 + +### Polish +* Refine Javascript spefic color scheme +* Refine Python specific color scheme +* Refine PHP specific color scheme +* Refine Bash specific color scheme +* Refine Sass specific color scheme + +## [1.2.3] 2021-06-04 + +### Fix +* Fix an issue with the graphic resolution that showed some artifacts on windows. + +### Polish +* Refine the color scheme. +* Update the tab close icon. + +## [1.2.2] 2021-06-03 + +### Fix +* Fix laravel blade template syntax + +## [1.2.1] 2021-06-03 + +### Enhancement +* All rules are now updated to `sublime-color-scheme`. +* Slightly lighten minimap color. + +### Internal +* Update installation information. + +## [1.2.0] 2021-06-03 + +### Enhancement + +* Convert color theme to `sublime-color-scheme`. +* Add @3x retina icons resolution. + +### BugFix + +* Fix Sidebar icons color. + +## [1.1.1] 2016-12-08 + +### Enhancement + +* Scrollbars background color has been darkened to match the general ui palette. + +## [1.1.0] 2016-12-08 + +### Enhancement + +* Add Scrollbars (Whoa, magical!) +* Support for 'Skins' plugin. diff --git a/package.json b/package.json index 90c8ecc..35429f4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "TwoDark", - "version": "1.2.2", - "description": "It's like OneDark for Atom, but it's called TwoDark and works for SublimeText", + "version": "1.2.4", + "description": "Atom's OneDark inspired theme for Sublime Text", "author": "Roberto Mauro ", "homepage": "https://github.com/erremauro/TwoDark#readme", "license": "MIT",