🔖 v1.2.0

Author: evrowe

CHANGELOG.md

@@ -4,6 +4,11 @@ Updates to the the "Cold Snack" theme will be tracked and documented in this fil
 
 This project utilizes [Semantic Versioning](http://semver.org/). 
 
+## [1.2.0] - 2017-06-26
+
+### Changed
+- Updated merge conflict highlight colors to be more in light with diff editor highlight colors; addresses code readability issues in merge conflict viewer
+
 ## [1.1.0] - 2017-06-22
 
 ### Added

dist/Cold Snack.json

@@ -419,7 +419,7 @@
     "badge.background": "#BF4cB9",
     "button.background": "#ef7c11",
     "diffEditor.insertedTextBackground": "#027ddb33",
-    "diffEditor.removedTextBackground": "_maroon-lightest-fade-ultra",
+    "diffEditor.removedTextBackground": "#DF6cEF66",
     "dropdown.background": "#0a2c4f",
     "editor.background": "#0a0c29",
     "editor.foreground": "#e9e9eb",
@@ -443,10 +443,10 @@
     "list.hoverBackground": "#0a2c4f",
     "list.activeSelectionBackground": "#027ddb",
     "list.inactiveSelectionBackground": "#0a2c4f",
-    "merge.currentHeaderBackground": "#00b7e9",
-    "merge.currentContentBackground": "#027ddb",
-    "merge.incomingHeaderBackground": "#ff9c51",
-    "merge.incomingContentBackground": "#ff8c31",
+    "merge.currentHeaderBackground": "#00e9ff66",
+    "merge.currentContentBackground": "#00e9ff66",
+    "merge.incomingHeaderBackground": "#DF6cEF66",
+    "merge.incomingContentBackground": "#DF6cEF66",
     "peekViewEditor.background": "#0a0c29",
     "peekViewResult.background": "#0a0c29",
     "peekViewResult.selectionBackground": "#0a2c4f",

package.json

@@ -2,7 +2,7 @@
     "name": "cold-snack",
     "displayName": "Cold Snack",
     "description": "The crispest, most freshing theme for your editor.",
-    "version": "1.1.0",
+    "version": "1.2.0",
     "publisher": "evrowe",
     "engines": {
         "vscode": "^1.12.0"