Merge pull request tinacious#21 from tinacious/upgrade-high-contrast

Upgrade high-contrast theme, Light theme improvements
stellarpower · Dec 28, 2020 · b0d6f3e · b0d6f3e
2 parents edc052e + bea80be
commit b0d6f3e
Show file tree

Hide file tree

Showing 8 changed files with 1,249 additions and 336 deletions.
diff --git a/README.md b/README.md
@@ -114,10 +114,11 @@ I've verified the colour combinations using the tool above but if I've missed an
 ## Changelog
 
 | Date        | Version | Change                                                                                             |
-|:------------|:--------|:---------------------------------------------------------------------------------------------------|
+| :---------- | :------ | :------------------------------------------------------------------------------------------------- |
+| 27 Dec 2020 | 2.4.0   | High-contrast theme support: convert to new JSON format, add rainbow JSON, add UI theme            |
 | 26 Apr 2020 | 2.3.0   | Added high-contrast WCAG 2.0 AA compliant syntax colour theme                                      |
-| 26 Apr 2020 | 2.2.0   | Now with even **more** rainbow JSON! 36 levels.   🌈🌈🌈                                              |
-| 26 Apr 2020 | 2.1.0   | Add support for 11 levels of nested rainbow JSON! 🌈                                                |
+| 26 Apr 2020 | 2.2.0   | Now with even **more** rainbow JSON! 36 levels.   🌈🌈🌈                                     |
+| 26 Apr 2020 | 2.1.0   | Add support for 11 levels of nested rainbow JSON! 🌈                                             |
 | 25 Apr 2020 | 2.0.0   | Add support for Markdown and Git. Sidebar and status bar design.                                   |
 | 5 Mar 2017  | 0.2.0   | Added the Tinacious Design Light syntax theme. Increased contrast of current line & selected text. |
 | 10 Oct 2016 | 0.1.0   | Initial release                                                                                    |
diff --git a/code-samples/nested-json.json b/code-samples/nested-json.json
@@ -0,0 +1,76 @@
+{
+  "one-uno-un": {
+    "two-dos-deux": {
+      "three-tres-trois": {
+        "four-cuatro-quatre": {
+          "five-cinco-cinq": {
+            "six-seis-six": {
+              "seven-siete-sept": {
+                "eight-ocho-huit": {
+                  "nine-nueve-neuf": {
+                    "ten-diez-dix": {
+                      "one-uno-un": {
+                        "two-dos-deux": {
+                          "three-tres-trois": {
+                            "four-cuatro-quatre": {
+                              "five-cinco-cinq": {
+                                "six-seis-six": {
+                                  "seven-siete-sept": {
+                                    "eight-ocho-huit": {
+                                      "nine-nueve-neuf": {
+                                        "ten-diez-dix": {
+                                          "one-uno-un": {
+                                            "two-dos-deux": {
+                                              "three-tres-trois": {
+                                                "four-cuatro-quatre": {
+                                                  "five-cinco-cinq": {
+                                                    "six-seis-six": {
+                                                      "seven-siete-sept": {
+                                                        "eight-ocho-huit": {
+                                                          "nine-nueve-neuf": {
+                                                            "ten-diez-dix": {
+                                                              "one-uno-un": {
+                                                                "two-dos-deux": {
+                                                                  "three-tres-trois": {
+                                                                    "four-cuatro-quatre": {
+                                                                      "five-cinco-cinq": {
+                                                                        "six-seis-six": {
+                                                                          "end-rainbow-support": true,
+                                                                          "should-find-new-job-if-more-needed": true
+                                                                        }
+                                                                      }
+                                                                    }
+                                                                  }
+                                                                }
+                                                              }
+                                                            }
+                                                          }
+                                                        }
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "theme-tinaciousdesign",
   "displayName": "Tinacious Design theme",
   "description": "🌈 A dark theme and a light theme with fun colours.",
-  "version": "2.3.1",
+  "version": "2.4.0",
   "publisher": "tinaciousdesign",
   "repository": "https://github.com/tinacious/vscode-tinacious-design-syntax",
   "scripts": {
@@ -22,7 +22,8 @@
     "a11y"
   ],
   "contributes": {
-    "themes": [{
+    "themes": [
+      {
         "label": "Tinacious Design",
         "uiTheme": "vs-dark",
         "path": "/themes/Tinacious Design-color-theme.json"
@@ -43,9 +44,9 @@
         "path": "./themes/Tinacious-Design-Light.tmTheme"
       },
       {
-        "label": "Tinacious Design (High Contrast) (2016)",
+        "label": "Tinacious Design (High Contrast)",
         "uiTheme": "vs-dark",
-        "path": "./themes/Tinacious-Design-High-Contrast.tmTheme"
+        "path": "/themes/Tinacious-Design-High-Contrast-color-theme.json"
       }
     ]
   },

diff --git a/scripts/generate_json_support.js b/scripts/generate_json_support.js
@@ -8,12 +8,14 @@ const colours = [
   "#00CECA", // turquoise/blue
   "#00BFFF", // blue
   "#8590EC", // indigo
+  // "#B267E6", // indigo, a11y
   "#FE3698", // pink
   "#FF7086", // orangey pink
   "#ffb070", // orange
   "#FCCC66", // yellow
   "#BBCE65", // yellowy green
   "#59D065", // green
+  // "#00D364", // green, a11y
 ];
 
 // Supporting 4 rainbows. If you need more than that, I'm sorry on so many levels. 🙃