Merge branch 'master' into sm-screenshot-scheme

# Conflicts:
#	styles/languages/json.less

spec/json.json

@@ -6,7 +6,19 @@
   },
   {
     "title": "oranges",
-    "count": [17500, null],
-    "description": {"text": "...", "sensitive": false}
+    "count": [17500, null, "String"],
+    "description": {"text": "She said, \"Hello\"", "sensitive": false}
+  },
+  {
+    "deeply_nested": {
+      "key": {
+        "key": {
+          "key": {
+            "array": [1, "two", null],
+            "string": "hello"
+          }
+        }
+      }
+    }
   }
 ]

spec/properties.properties

@@ -2,3 +2,4 @@
 user=root
 schedule=* * 3 * * *
 retries=4
+dotted.property=true

spec/yaml.yml

@@ -0,0 +1,15 @@
+root:
+  unquoted_string: lorem ipsem
+  quotwed_string: "lorem ipsum"
+  integer: 123
+  float: 3.14
+  boolean: true
+  null: null
+  list:
+    - one
+    - two
+    - three
+  map_list:
+    - one: 1
+    - two: "two"
+    - three: 3.0

styles/languages/java.less

@@ -9,3 +9,13 @@
     }
   }
 }
+
+.source.java-properties {
+  .meta.key-pair {
+    color: @red;
+
+    & > .punctuation {
+      color: @syntax-text-color;
+    }
+  }
+}

styles/languages/json.less

@@ -1,12 +1,21 @@
 .source.json {
   .meta.structure.dictionary.json {
-    & > .string.quoted.json, .punctuation.string {
-      color: @hue-5;
+    & > .string.quoted.json {
+      & > .punctuation.string {
+        color: @red;
+      }
+      color: @red;
     }
+  }
 
+  .meta.structure.dictionary.json, .meta.structure.array.json {
     & > .value.json > .string.quoted.json,
     & > .value.json > .string.quoted.json > .punctuation {
-      color: @hue-4;
+      color: @green;
+    }
+
+    & > .constant.language.json {
+      color: @cyan;
     }
   }
 }