From da8bd081d583854c647f7d25816b49de8ff2faab Mon Sep 17 00:00:00 2001 From: Lukas Oppermann Date: Tue, 28 Jan 2025 22:37:45 +0100 Subject: [PATCH] add some overrides --- scripts/validateTokenJson.ts | 1 + .../dark.protanopia-deuteranopia.json5 | 18 - .../dark/overrides/dark.tritanopia.json5 | 40 -- .../light.protanopia-deuteranopia.json5 | 14 - .../light/overrides/light.tritanopia.json5 | 36 -- src/tokens/functional/color/syntax.json5 | 351 +++++++++--------- 6 files changed, 176 insertions(+), 284 deletions(-) diff --git a/scripts/validateTokenJson.ts b/scripts/validateTokenJson.ts index 3d488f90d..acf645930 100644 --- a/scripts/validateTokenJson.ts +++ b/scripts/validateTokenJson.ts @@ -69,6 +69,7 @@ if (getFlag('--silent') === null) { // eslint-disable-next-line no-console console.log(`\nPath: \u001b[34;1m\u001b[1m${path}\u001b[0m`) // eslint-disable-next-line no-console + console.log(fail.errorsByPath[path][0]['errors']) console.log( fail.errorsByPath[path] .map( diff --git a/src/tokens/functional/color/dark/overrides/dark.protanopia-deuteranopia.json5 b/src/tokens/functional/color/dark/overrides/dark.protanopia-deuteranopia.json5 index 65799fc0d..a40430fee 100644 --- a/src/tokens/functional/color/dark/overrides/dark.protanopia-deuteranopia.json5 +++ b/src/tokens/functional/color/dark/overrides/dark.protanopia-deuteranopia.json5 @@ -65,10 +65,6 @@ color: { prettylights: { syntax: { - 'entity-tag': { - $value: '{base.color.blue.1}', - $type: 'color', - }, keyword: { $value: '{base.color.orange.3}', $type: 'color', @@ -95,10 +91,6 @@ }, }, }, - 'string-regexp': { - $value: '{base.color.blue.1}', - $type: 'color', - }, markup: { deleted: { text: { @@ -110,16 +102,6 @@ $type: 'color', }, }, - inserted: { - text: { - $value: '{base.color.blue.0}', - $type: 'color', - }, - bg: { - $value: '{base.color.blue.8}', - $type: 'color', - }, - }, }, }, }, diff --git a/src/tokens/functional/color/dark/overrides/dark.tritanopia.json5 b/src/tokens/functional/color/dark/overrides/dark.tritanopia.json5 index f06bd8b44..8fda24ae0 100644 --- a/src/tokens/functional/color/dark/overrides/dark.tritanopia.json5 +++ b/src/tokens/functional/color/dark/overrides/dark.tritanopia.json5 @@ -44,44 +44,4 @@ }, }, }, - color: { - prettylights: { - syntax: { - 'string-regexp': { - $value: '{base.color.blue.1}', - $type: 'color', - }, - 'entity-tag': { - $value: '{base.color.blue.1}', - $type: 'color', - }, - variable: { - $value: '{base.color.red.2}', - $type: 'color', - }, - markup: { - inserted: { - text: { - $value: '{base.color.blue.0}', - $type: 'color', - }, - bg: { - $value: '{base.color.blue.8}', - $type: 'color', - }, - }, - changed: { - text: { - $value: '{base.color.red.0}', - $type: 'color', - }, - bg: { - $value: '{base.color.red.8}', - $type: 'color', - }, - }, - }, - }, - }, - }, } diff --git a/src/tokens/functional/color/light/overrides/light.protanopia-deuteranopia.json5 b/src/tokens/functional/color/light/overrides/light.protanopia-deuteranopia.json5 index 355f41571..8a46e0da2 100644 --- a/src/tokens/functional/color/light/overrides/light.protanopia-deuteranopia.json5 +++ b/src/tokens/functional/color/light/overrides/light.protanopia-deuteranopia.json5 @@ -89,10 +89,6 @@ }, }, }, - 'string-regexp': { - $value: '{base.color.blue.6}', - $type: 'color', - }, brackethighlighter: { unmatched: { $value: '{base.color.orange.7}', @@ -110,16 +106,6 @@ $type: 'color', }, }, - inserted: { - text: { - $value: '{base.color.blue.6}', - $type: 'color', - }, - bg: { - $value: '{base.color.blue.0}', - $type: 'color', - }, - }, }, }, }, diff --git a/src/tokens/functional/color/light/overrides/light.tritanopia.json5 b/src/tokens/functional/color/light/overrides/light.tritanopia.json5 index 4381a294d..f10ef794c 100644 --- a/src/tokens/functional/color/light/overrides/light.tritanopia.json5 +++ b/src/tokens/functional/color/light/overrides/light.tritanopia.json5 @@ -38,40 +38,4 @@ }, }, }, - color: { - prettylights: { - syntax: { - 'string-regexp': { - $value: '{base.color.blue.6}', - $type: 'color', - }, - variable: { - $value: '{base.color.red.6}', - $type: 'color', - }, - markup: { - inserted: { - text: { - $value: '{base.color.blue.6}', - $type: 'color', - }, - bg: { - $value: '{base.color.blue.0}', - $type: 'color', - }, - }, - changed: { - text: { - $value: '{base.color.red.6}', - $type: 'color', - }, - bg: { - $value: '{base.color.red.1}', - $type: 'color', - }, - }, - }, - }, - }, - }, } diff --git a/src/tokens/functional/color/syntax.json5 b/src/tokens/functional/color/syntax.json5 index 732ff0747..89c3576a7 100644 --- a/src/tokens/functional/color/syntax.json5 +++ b/src/tokens/functional/color/syntax.json5 @@ -11,10 +11,10 @@ }, 'org.primer.overrides': { dark: '{base.color.neutral.6}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -28,10 +28,10 @@ }, 'org.primer.overrides': { dark: '{base.color.neutral.8}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -45,10 +45,10 @@ }, 'org.primer.overrides': { dark: '{base.color.neutral.12}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -62,10 +62,10 @@ }, 'org.primer.overrides': { dark: '{base.color.neutral.13}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -79,10 +79,10 @@ }, 'org.primer.overrides': { dark: '{base.color.neutral.8}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -96,8 +96,8 @@ }, 'org.primer.overrides': { dark: '{base.color.red.3}', - 'dark-tritanopia': null, - 'light-tritanopia': null, + + 'dark-protanopia-deuteranopia': '{base.color.orange.3}', 'light-protanopia-deuteranopia': '{base.color.orange.5}', }, @@ -113,8 +113,8 @@ }, 'org.primer.overrides': { dark: '{base.color.red.2}', - 'dark-tritanopia': null, - 'light-tritanopia': null, + + 'dark-protanopia-deuteranopia': '{base.color.orange.2}', 'light-protanopia-deuteranopia': '{base.color.orange.6}', }, @@ -164,10 +164,10 @@ }, 'org.primer.overrides': { dark: '{base.color.yellow.3}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -181,10 +181,10 @@ }, 'org.primer.overrides': { dark: '{base.color.yellow.2}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -198,10 +198,10 @@ }, 'org.primer.overrides': { dark: '{base.color.blue.3}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -215,10 +215,10 @@ }, 'org.primer.overrides': { dark: '{base.color.blue.2}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -232,10 +232,10 @@ }, 'org.primer.overrides': { dark: '{base.color.purple.3}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -249,10 +249,10 @@ }, 'org.primer.overrides': { dark: '{base.color.purple.2}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -266,10 +266,10 @@ }, 'org.primer.overrides': { dark: '#39c5cf', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -283,10 +283,10 @@ }, 'org.primer.overrides': { dark: '#56d4dd', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -303,10 +303,10 @@ }, 'org.primer.overrides': { dark: '{base.color.neutral.9}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -320,10 +320,10 @@ }, 'org.primer.overrides': { dark: '{base.color.blue.2}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -337,10 +337,10 @@ }, 'org.primer.overrides': { dark: '{base.color.blue.1}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -354,10 +354,10 @@ }, 'org.primer.overrides': { dark: '{base.color.purple.2}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -373,10 +373,10 @@ }, 'org.primer.overrides': { dark: '{base.color.neutral.12}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -392,10 +392,9 @@ }, 'org.primer.overrides': { dark: '{base.color.green.1}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + 'dark-tritanopia': '{base.color.blue.1}', + 'dark-protanopia-deuteranopia': '{base.color.blue.1}', + }, }, }, @@ -409,10 +408,10 @@ }, 'org.primer.overrides': { dark: '{base.color.red.3}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -426,10 +425,10 @@ }, 'org.primer.overrides': { dark: '{base.color.blue.1}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -443,10 +442,10 @@ }, 'org.primer.overrides': { dark: '{base.color.orange.2}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + 'dark-tritanopia': '{base.color.red.2}', + 'light-tritanopia': '{base.color.red.6}', + + }, }, }, @@ -461,10 +460,10 @@ }, 'org.primer.overrides': { dark: '{base.color.red.4}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -478,10 +477,10 @@ }, 'org.primer.overrides': { dark: '{base.color.neutral.9}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -498,10 +497,10 @@ }, 'org.primer.overrides': { dark: '{base.color.neutral.12}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -515,10 +514,10 @@ }, 'org.primer.overrides': { dark: '{base.color.red.7}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -536,10 +535,10 @@ }, 'org.primer.overrides': { dark: '{base.color.neutral.12}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -553,10 +552,10 @@ }, 'org.primer.overrides': { dark: '{base.color.red.6}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -572,10 +571,10 @@ }, 'org.primer.overrides': { dark: '{base.color.green.1}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + 'dark-tritanopia': '{base.color.blue.1}', + 'light-tritanopia': '{base.color.blue.6}', + 'dark-protanopia-deuteranopia': '{base.color.blue.1}', + 'light-protanopia-deuteranopia': '{base.color.blue.6}', }, }, }, @@ -590,10 +589,10 @@ }, 'org.primer.overrides': { dark: '{base.color.yellow.1}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -607,10 +606,10 @@ }, 'org.primer.overrides': { dark: '{base.color.blue.5}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -624,10 +623,10 @@ }, 'org.primer.overrides': { dark: '{base.color.neutral.12}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -641,10 +640,10 @@ }, 'org.primer.overrides': { dark: '{base.color.neutral.12}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -659,10 +658,10 @@ }, 'org.primer.overrides': { dark: '{base.color.red.0}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -676,10 +675,10 @@ }, 'org.primer.overrides': { dark: '{base.color.red.8}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -695,10 +694,10 @@ }, 'org.primer.overrides': { dark: '{base.color.green.0}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + 'dark-tritanopia': '{base.color.blue.0}', + 'light-tritanopia': '{base.color.blue.6}', + 'dark-protanopia-deuteranopia': '{base.color.blue.0}', + 'light-protanopia-deuteranopia': '{base.color.blue.6}', }, }, }, @@ -712,10 +711,10 @@ }, 'org.primer.overrides': { dark: '{base.color.green.8}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + 'dark-tritanopia': '{base.color.blue.8}', + 'light-tritanopia': '{base.color.blue.0}', + 'dark-protanopia-deuteranopia': '{base.color.blue.8}', + 'light-protanopia-deuteranopia': '{base.color.blue.0}', }, }, }, @@ -731,10 +730,10 @@ }, 'org.primer.overrides': { dark: '{base.color.orange.0}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + 'dark-tritanopia': '{base.color.red.0}', + 'light-tritanopia': '{base.color.red.6}', + + }, }, }, @@ -748,10 +747,10 @@ }, 'org.primer.overrides': { dark: '{base.color.orange.8}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + 'dark-tritanopia': '{base.color.red.8}', + 'light-tritanopia': '{base.color.red.1}', + + }, }, }, @@ -767,10 +766,10 @@ }, 'org.primer.overrides': { dark: '{base.color.neutral.12}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -784,10 +783,10 @@ }, 'org.primer.overrides': { dark: '{base.color.blue.6}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -805,10 +804,10 @@ }, 'org.primer.overrides': { dark: '{base.color.purple.2}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, }, @@ -826,10 +825,10 @@ }, 'org.primer.overrides': { dark: '{base.color.neutral.7}', - 'dark-tritanopia': null, - 'light-tritanopia': null, - 'dark-protanopia-deuteranopia': null, - 'light-protanopia-deuteranopia': null, + + + + }, }, },