From 90ea3e6f79c837fdaa22e000c8185e9f5638a99b Mon Sep 17 00:00:00 2001 From: RachelRadford21 Date: Mon, 24 Jun 2024 15:14:19 -0400 Subject: [PATCH 1/2] fix colors for pill kit --- .../Color.xcassets/Status/Neutral.colorset/Contents.json | 6 +++--- .../Color.xcassets/Status/Warning.colorset/Contents.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Sources/Playbook/Design Elements/Colors/Color.xcassets/Status/Neutral.colorset/Contents.json b/Sources/Playbook/Design Elements/Colors/Color.xcassets/Status/Neutral.colorset/Contents.json index 7fee7e0f2..bb6df9bb5 100644 --- a/Sources/Playbook/Design Elements/Colors/Color.xcassets/Status/Neutral.colorset/Contents.json +++ b/Sources/Playbook/Design Elements/Colors/Color.xcassets/Status/Neutral.colorset/Contents.json @@ -5,9 +5,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "214", - "green" : "205", - "red" : "193" + "blue" : "135", + "green" : "120", + "red" : "104" } }, "idiom" : "universal" diff --git a/Sources/Playbook/Design Elements/Colors/Color.xcassets/Status/Warning.colorset/Contents.json b/Sources/Playbook/Design Elements/Colors/Color.xcassets/Status/Warning.colorset/Contents.json index d2de33ecc..d3537b960 100644 --- a/Sources/Playbook/Design Elements/Colors/Color.xcassets/Status/Warning.colorset/Contents.json +++ b/Sources/Playbook/Design Elements/Colors/Color.xcassets/Status/Warning.colorset/Contents.json @@ -6,8 +6,8 @@ "components" : { "alpha" : "1.000", "blue" : "0x00", - "green" : "0xBB", - "red" : "0xF9" + "green" : "0x95", + "red" : "0xC6" } }, "idiom" : "universal" From 445c48e279332af10c9a3ea28734ce07a970909a Mon Sep 17 00:00:00 2001 From: RachelRadford21 Date: Mon, 15 Jul 2024 14:23:53 -0400 Subject: [PATCH 2/2] fix neutral color --- Sources/Playbook/Components/Pill/PBPill.swift | 2 +- .../Color.xcassets/Status/Neutral.colorset/Contents.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/Playbook/Components/Pill/PBPill.swift b/Sources/Playbook/Components/Pill/PBPill.swift index c95e6725a..4eebe94ea 100644 --- a/Sources/Playbook/Components/Pill/PBPill.swift +++ b/Sources/Playbook/Components/Pill/PBPill.swift @@ -44,7 +44,7 @@ public extension PBPill { case .primary: return .pbPrimary case .success: return .status(.success) case .warning: return .status(.warning) - default: return .status(.neutral) + default: return .text(.light) } } diff --git a/Sources/Playbook/Design Elements/Colors/Color.xcassets/Status/Neutral.colorset/Contents.json b/Sources/Playbook/Design Elements/Colors/Color.xcassets/Status/Neutral.colorset/Contents.json index bb6df9bb5..7fee7e0f2 100644 --- a/Sources/Playbook/Design Elements/Colors/Color.xcassets/Status/Neutral.colorset/Contents.json +++ b/Sources/Playbook/Design Elements/Colors/Color.xcassets/Status/Neutral.colorset/Contents.json @@ -5,9 +5,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "135", - "green" : "120", - "red" : "104" + "blue" : "214", + "green" : "205", + "red" : "193" } }, "idiom" : "universal"