From 28aab3f9b268f47dd675e7bf8b63d239d6c617d0 Mon Sep 17 00:00:00 2001
From: Kristi <enkia77@gmail.com>
Date: Wed, 30 Oct 2019 22:59:50 -0400
Subject: [PATCH] Fix CSS punctuation in certain situations

---
 CHANGELOG.md                              |  4 ++
 themes/tokyo-night-color-theme.json       | 57 ++++++++++++++++-------
 themes/tokyo-night-storm-color-theme.json | 57 ++++++++++++++++-------
 3 files changed, 84 insertions(+), 34 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c5bea8..514eabf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release Notes
 
+## 0.3.7
+`2019-10-30`
+- Fix CSS punctuation in certain situations
+
 ## 0.3.6
 `2019-10-30`
 - Update editor and misc foreground color
diff --git a/themes/tokyo-night-color-theme.json b/themes/tokyo-night-color-theme.json
index c7d9dba..15e19c7 100644
--- a/themes/tokyo-night-color-theme.json
+++ b/themes/tokyo-night-color-theme.json
@@ -453,7 +453,10 @@
                 "punctuation.definition.tag.html",
                 "keyword.other.template",
                 "keyword.other.substitution",
-                "entity.name.operator"
+                "entity.name.operator",
+                "meta.property-list punctuation.separator.key-value",
+                "meta.at-rule.mixin punctuation.separator.key-value",
+                "meta.at-rule.function variable.parameter.url"
             ],
             "settings": {
                 "foreground": "#89ddff"
@@ -775,36 +778,56 @@
         },
         {
             "name": "CSS Tag",
-            "scope": [
-                "entity.name.tag.css",
-                "entity.name.tag.reference"
-            ],
+            "scope": "entity.name.tag.css",
             "settings": {
                 "foreground": "#0db9d7"
             }
         },
         {
-            "name": "CSS Tag Reference",
-            "scope": "entity.name.tag.reference",
+            "name": "CSS Tag Reference, Pseudo & Class Punctuation",
+            "scope": [
+                "entity.other.attribute-name.pseudo-class punctuation.definition.entity",
+                "entity.other.attribute-name.pseudo-element punctuation.definition.entity",
+                "entity.other.attribute-name.class punctuation.definition.entity",
+                "entity.name.tag.reference"
+            ],
             "settings": {
                 "foreground": "#e0af68"
             }
         },
-        {
-            "name": "CSS Property Separator",
-            "scope": "meta.property-list punctuation.separator.key-value",
-            "settings": {
-                "foreground": "#9abdf5"
-            }
-        },
         {
             "name": "CSS Punctuation",
+            "scope": "meta.property-list",
+            "settings": {
+                "foreground": "#9abdf5" //"#e0af68"
+            }
+        },
+        {
+            "name": "CSS at-rule fix",
             "scope": [
-                "meta.property-list",
-                "punctuation.definition.entity.css"
+                "meta.property-list meta.at-rule.if",
+                "meta.at-rule.return variable.parameter.url",
+                "meta.property-list meta.at-rule.else"
             ],
             "settings": {
-                "foreground": "#e0af68"
+                "foreground": "#ff9e64"
+            }
+        },
+        {
+            "name": "CSS Parent Selector Entity",
+            "scope": [
+                "entity.other.attribute-name.parent-selector-suffix punctuation.definition.entity.css"
+            ],
+            "settings": {
+                "foreground": "#73daca"
+            }
+        },
+        {
+            "name": "CSS Punctuation comma fix",
+            "scope":
+                "meta.property-list meta.property-list",
+            "settings": {
+                "foreground": "#9abdf5"
             }
         },
         {
diff --git a/themes/tokyo-night-storm-color-theme.json b/themes/tokyo-night-storm-color-theme.json
index 2f220f1..f5d37ea 100644
--- a/themes/tokyo-night-storm-color-theme.json
+++ b/themes/tokyo-night-storm-color-theme.json
@@ -452,7 +452,10 @@
                 "punctuation.definition.tag.html",
                 "keyword.other.template",
                 "keyword.other.substitution",
-                "entity.name.operator"
+                "entity.name.operator",
+                "meta.property-list punctuation.separator.key-value",
+                "meta.at-rule.mixin punctuation.separator.key-value",
+                "meta.at-rule.function variable.parameter.url"
             ],
             "settings": {
                 "foreground": "#89ddff"
@@ -775,36 +778,56 @@
         },
         {
             "name": "CSS Tag",
-            "scope": [
-                "entity.name.tag.css",
-                "entity.name.tag.reference"
-            ],
+            "scope": "entity.name.tag.css",
             "settings": {
                 "foreground": "#2ac3de"
             }
         },
         {
-            "name": "CSS Tag Reference",
-            "scope": "entity.name.tag.reference",
+            "name": "CSS Tag Reference, Pseudo & Class Punctuation",
+            "scope": [
+                "entity.other.attribute-name.pseudo-class punctuation.definition.entity",
+                "entity.other.attribute-name.pseudo-element punctuation.definition.entity",
+                "entity.other.attribute-name.class punctuation.definition.entity",
+                "entity.name.tag.reference"
+            ],
             "settings": {
                 "foreground": "#e0af68"
             }
         },
-        {
-            "name": "CSS Property Separator",
-            "scope": "meta.property-list punctuation.separator.key-value",
-            "settings": {
-                "foreground": "#9abdf5"
-            }
-        },
         {
             "name": "CSS Punctuation",
+            "scope": "meta.property-list",
+            "settings": {
+                "foreground": "#9abdf5" //"#e0af68"
+            }
+        },
+        {
+            "name": "CSS at-rule fix",
             "scope": [
-                "meta.property-list",
-                "punctuation.definition.entity.css"
+                "meta.property-list meta.at-rule.if",
+                "meta.at-rule.return variable.parameter.url",
+                "meta.property-list meta.at-rule.else"
             ],
             "settings": {
-                "foreground": "#e0af68"
+                "foreground": "#ff9e64"
+            }
+        },
+        {
+            "name": "CSS Parent Selector Entity",
+            "scope": [
+                "entity.other.attribute-name.parent-selector-suffix punctuation.definition.entity.css"
+            ],
+            "settings": {
+                "foreground": "#73daca"
+            }
+        },
+        {
+            "name": "CSS Punctuation comma fix",
+            "scope":
+                "meta.property-list meta.property-list",
+            "settings": {
+                "foreground": "#9abdf5"
             }
         },
         {