From da1dae1fc4f1895f4f7d09ef1810d39181a813bb Mon Sep 17 00:00:00 2001
From: Young Rok Kim <rok0810@gmail.com>
Date: Mon, 12 Dec 2016 19:27:05 +0900
Subject: [PATCH] Improve CSS/SCSS colorization

---
 CHANGELOG.md           |   3 ++
 package.json           |   2 +-
 themes/Darcula.tmTheme | 113 ++++++++++++++++++++++++++++++++++++-----
 3 files changed, 103 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0682d10..07f8a1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## v1.0.7
+- Improve CSS/SCSS colorization
+
 ## v1.0.6
 - Improve JSX/TSX colorization 
 - Improve regex class colorization
diff --git a/package.json b/package.json
index 44bd8ef..fabda22 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "name": "vscode-theme-darcula",
     "displayName": "Darcula Theme",
     "description": "A theme extension for VS Code based on Darcula theme from Jetbrains IDEs",
-    "version": "1.0.5",
+    "version": "1.0.7",
     "publisher": "rokoroku",
     "repository": {
         "type": "git",
diff --git a/themes/Darcula.tmTheme b/themes/Darcula.tmTheme
index 16be639..ebf8b43 100644
--- a/themes/Darcula.tmTheme
+++ b/themes/Darcula.tmTheme
@@ -139,7 +139,7 @@ keyword.operator.static,
 keyword.operator.this,
 keyword.expression.typeof,
 keyword.expression.instanceof,
-keyword.type.expression.typeof,</string>
+keyword.type.expression.typeof</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
@@ -305,18 +305,7 @@ string.xml,</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#6A8759</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>CSS ID</string>
-			<key>scope</key>
-			<string>meta.selector.css, entity.other.attribute-name.id</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#9E7BB0</string>
+				<string>#FFC66D</string>
 			</dict>
 		</dict>
 		<dict>
@@ -422,7 +411,8 @@ type-fn-type-parameters</string>
 			<key>name</key>
 			<string>Object Key Seperator</string>
 			<key>scope</key>
-			<string>objectliteral.key.separator</string>
+			<string>objectliteral.key.separator,
+scss.token.punctuation.separator</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
@@ -608,6 +598,101 @@ object-literal.object.member.key.array.brace.square</string>
 				<string>#CCCCCC</string>
 			</dict>
 		</dict>
+		<dict>
+			<key>name</key>
+			<string>CSS Property-value</string>
+			<key>scope</key>
+			<string>property-list.property-value,
+property-list.constant,
+scss.keyword.other.unit,
+css.keyword.other.unit</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#A5C261</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>CSS Property variable</string>
+			<key>scope</key>
+			<string>property-list.variable,
+scss.set.variable</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#7A9EC2</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>CSS Property entity</string>
+			<key>scope</key>
+			<string>css.entity.attribute-name,
+scss.entity.attribute-name</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#FFC66D</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>CSS Property-value number</string>
+			<key>scope</key>
+			<string>property-list.property-value.rgb-value</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#7A9EC2</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>CSS Property-value function</string>
+			<key>scope</key>
+			<string>property-list.property-value.function</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#FFC66D</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>CSS Tag</string>
+			<key>scope</key>
+			<string>css.entity.name.tag,
+scss.entity.name.tag</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#CC8242</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>CSS ID, Selector</string>
+			<key>scope</key>
+			<string>meta.selector.css, entity.attribute-name.id</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#FFC66D</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>CSS Keyword</string>
+			<key>scope</key>
+			<string>keyword.scss,
+keyword.css</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#CC8242</string>
+			</dict>
+		</dict>
 	</array>
 	<key>uuid</key>
 	<string>693ee9de-bc28-4caf-9ae7-3258b05f1a4f</string>