From ebf9ee85a6126cbfc63d699b5e98ce968d17430b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quentin=20Guid=C3=A9e?= Date: Mon, 30 Oct 2023 21:25:25 -0400 Subject: [PATCH] fix: unapplied theme on 2023.3 EAP (#109) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Quentin Guidée --- CHANGELOG.md | 1 + generateFlavours/ui.theme.json | 70 +++++++++++++++++----------------- 2 files changed, 36 insertions(+), 35 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b12ee54..2139930 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ ### Removed ### Fixed +- Fix build on 2023.3 EAP ### Security diff --git a/generateFlavours/ui.theme.json b/generateFlavours/ui.theme.json index eff0742..e49e412 100644 --- a/generateFlavours/ui.theme.json +++ b/generateFlavours/ui.theme.json @@ -42,41 +42,6 @@ "borderColor": "{{borderColor}}", "separatorColor": "{{separatorColor}}" }, - "icons": { - "ColorPalette": { - "Actions.Blue": "{{blue}}", - "Actions.Green": "{{green}}", - "Actions.Grey": "{{overlay0}}", - "Actions.GreyInline": "{{blue}}", - "Actions.GreyInline.Dark": "{{blue}}", - "Actions.Red": "{{red}}", - "Actions.Yellow": "{{yellow}}", - "Objects.BlackText": "{{surface0}}", - "Objects.Blue": "{{blue}}", - "Objects.Green": "{{green}}", - "Objects.Grey": "{{overlay0}}", - "Objects.Pink": "{{pink}}", - "Objects.Purple": "{{mauve}}", - "Objects.Red": "{{red}}", - "Objects.RedStatus": "{{red}}", - "Objects.Yellow": "{{yellow}}", - "Objects.YellowDark": "{{flamingo}}", - "Checkbox.Background.Default": "{{surface0}}", - "Checkbox.Background.Default.Dark": "{{surface0}}", - "Checkbox.Background.Disabled": "{{surface0}}", - "Checkbox.Background.Disabled.Dark": "{{surface0}}", - "Checkbox.Background.Selected": "{{overlay0}}", - "Checkbox.Background.Selected.Dark": "{{surface1}}", - "Checkbox.Border.Default": "{{surface0}}", - "Checkbox.Border.Disabled": "{{surface0}}", - "Checkbox.Border.Selected": "{{surface0}}", - "Checkbox.Foreground.Disabled": "{{overlay0}}", - "Checkbox.Foreground.Disabled.Dark": "{{overlay0}}", - "Checkbox.Foreground.Selected": "{{accentColor}}", - "Checkbox.Foreground.Selected.Dark": "{{accentColor}}", - "Tree.iconColor": "{{text}}" - } - }, "ui": { "*": { "arc": "7", @@ -505,5 +470,40 @@ }, "separatorColor": "separatorColor" } + }, + "icons": { + "ColorPalette": { + "Actions.Blue": "{{blue}}", + "Actions.Green": "{{green}}", + "Actions.Grey": "{{overlay0}}", + "Actions.GreyInline": "{{blue}}", + "Actions.GreyInline.Dark": "{{blue}}", + "Actions.Red": "{{red}}", + "Actions.Yellow": "{{yellow}}", + "Objects.BlackText": "{{surface0}}", + "Objects.Blue": "{{blue}}", + "Objects.Green": "{{green}}", + "Objects.Grey": "{{overlay0}}", + "Objects.Pink": "{{pink}}", + "Objects.Purple": "{{mauve}}", + "Objects.Red": "{{red}}", + "Objects.RedStatus": "{{red}}", + "Objects.Yellow": "{{yellow}}", + "Objects.YellowDark": "{{flamingo}}", + "Checkbox.Background.Default": "{{surface0}}", + "Checkbox.Background.Default.Dark": "{{surface0}}", + "Checkbox.Background.Disabled": "{{surface0}}", + "Checkbox.Background.Disabled.Dark": "{{surface0}}", + "Checkbox.Background.Selected": "{{overlay0}}", + "Checkbox.Background.Selected.Dark": "{{surface1}}", + "Checkbox.Border.Default": "{{surface0}}", + "Checkbox.Border.Disabled": "{{surface0}}", + "Checkbox.Border.Selected": "{{surface0}}", + "Checkbox.Foreground.Disabled": "{{overlay0}}", + "Checkbox.Foreground.Disabled.Dark": "{{overlay0}}", + "Checkbox.Foreground.Selected": "{{accentColor}}", + "Checkbox.Foreground.Selected.Dark": "{{accentColor}}", + "Tree.iconColor": "{{text}}" + } } }