From 81e0367d3154326f29b4a08a5048bdbd8b47106f Mon Sep 17 00:00:00 2001 From: "gcp-cherry-pick-bot[bot]" <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com> Date: Thu, 13 Mar 2025 09:55:44 -0400 Subject: [PATCH] theme: Fix incorrect version control keys in One themes (cherry-pick #26606) (#26623) Cherry-picked theme: Fix incorrect version control keys in One themes (#26606) While the `.{variants}` of the theme keys _were_ incorrect, they are actually more consistent with our current theme keys (thanks AI!) So we will keep theme, and fix the incorrect usages in the one themes and elsewhere. Old description: > > This PR fixes an issue where we specified the incorrect theme keys (thanks AI!) > in the theme schema. The following keys have been changed to their correct > versions: > > | Before | After | > |-------------------------------|-------------------------| > | version_control.added | version_control_added | > | version_control.deleted | version_control_deleted | > | version_control.modified | version_control_modified| > | version_control.renamed | version_control_renamed | > | version_control.conflict | version_control_conflict| > | version_control.ignored | version_control_ignored | > > Please use the after versions in your themes, as they are correct! > > We won't be adding secondary keys to fix this automatically as git only > officially launched today. > > Due to this change, we've also updated the version control keys in the One > themes to keep the default diff hunks looks from changing. Closes #26572 Release Notes: - theme: Fixed an issue where version control colors weren't applying correctly. Co-authored-by: Nate Butler --- assets/themes/one/one.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/themes/one/one.json b/assets/themes/one/one.json index 3c7421c04ec39cb7a37f5de3dfafc5cb0f5a2dd9..275144d36d5d6fa215730ad366e51fba00905421 100644 --- a/assets/themes/one/one.json +++ b/assets/themes/one/one.json @@ -96,9 +96,9 @@ "terminal.ansi.bright_white": "#dce0e5ff", "terminal.ansi.dim_white": "#575d65ff", "link_text.hover": "#74ade8ff", - "version_control_added": "#a7c088ff", - "version_control_modified": "#dec184ff", - "version_control_deleted": "#d07277ff", + "version_control.added": "#27a657ff", + "version_control.modified": "#d3b020ff", + "version_control.deleted": "#e06c76ff", "conflict": "#dec184ff", "conflict.background": "#dec1841a", "conflict.border": "#5d4c2fff", @@ -475,9 +475,9 @@ "terminal.ansi.bright_white": "#242529ff", "terminal.ansi.dim_white": "#97979aff", "link_text.hover": "#5c78e2ff", - "version_control_added": "#669f59ff", - "version_control_modified": "#a48819ff", - "version_control_deleted": "#d36151ff", + "version_control.added": "#27a657ff", + "version_control.modified": "#d3b020ff", + "version_control.deleted": "#e06c76ff", "conflict": "#a48819ff", "conflict.background": "#faf2e6ff", "conflict.border": "#f4e7d1ff",