Skip to content

Update Status Colors to latest Fluent 2 guidance #2231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update Status Colors to latest Fluent 2 guidance #2231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions Sources/FluentUI_common/Core/Theme/Extensions/iOS/FluentTheme+iOS.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,38 +225,38 @@ extension FluentTheme: PlatformThemeProviding {
color = .init(light: GlobalTokens.brandSwiftUIColor(.comm60),
dark: GlobalTokens.brandSwiftUIColor(.comm120))
case .dangerBackground1:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.red, .tint60),
dark: GlobalTokens.sharedSwiftUIColor(.red, .shade40))
color = .init(light: GlobalTokens.sharedSwiftUIColor(.cranberry, .tint60),
dark: GlobalTokens.sharedSwiftUIColor(.cranberry, .shade40))
case .dangerBackground2:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.red, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.red, .shade10))
color = .init(light: GlobalTokens.sharedSwiftUIColor(.cranberry, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.cranberry, .shade10))
case .dangerForeground1:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.red, .shade10),
dark: GlobalTokens.sharedSwiftUIColor(.red, .tint30))
color = .init(light: GlobalTokens.sharedSwiftUIColor(.cranberry, .shade20),
dark: GlobalTokens.sharedSwiftUIColor(.cranberry, .tint30))
case .dangerForeground2:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.red, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.red, .tint30))
color = .init(light: GlobalTokens.sharedSwiftUIColor(.cranberry, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.cranberry, .tint30))
case .dangerStroke1:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.red, .tint20),
dark: GlobalTokens.sharedSwiftUIColor(.red, .tint20))
color = .init(light: GlobalTokens.sharedSwiftUIColor(.cranberry, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.cranberry, .tint30))
case .dangerStroke2:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.red, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.red, .tint30))
color = .init(light: GlobalTokens.sharedSwiftUIColor(.cranberry, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.cranberry, .tint20))
case .successBackground1:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.green, .tint60),
dark: GlobalTokens.sharedSwiftUIColor(.green, .shade40))
case .successBackground2:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.green, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.green, .shade10))
case .successForeground1:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.green, .shade10),
color = .init(light: GlobalTokens.sharedSwiftUIColor(.green, .shade20),
dark: GlobalTokens.sharedSwiftUIColor(.green, .tint30))
case .successForeground2:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.green, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.green, .tint30))
case .successStroke1:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.green, .tint20),
dark: GlobalTokens.sharedSwiftUIColor(.green, .tint20))
color = .init(light: GlobalTokens.sharedSwiftUIColor(.green, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.lightGreen, .tint30))
case .severeBackground1:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.darkOrange, .tint60),
dark: GlobalTokens.sharedSwiftUIColor(.darkOrange, .shade40))
Expand All @@ -273,20 +273,20 @@ extension FluentTheme: PlatformThemeProviding {
color = .init(light: GlobalTokens.sharedSwiftUIColor(.darkOrange, .tint10),
dark: GlobalTokens.sharedSwiftUIColor(.darkOrange, .tint20))
case .warningBackground1:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.yellow, .tint60),
dark: GlobalTokens.sharedSwiftUIColor(.yellow, .shade40))
color = .init(light: GlobalTokens.sharedSwiftUIColor(.orange, .tint60),
dark: GlobalTokens.sharedSwiftUIColor(.orange, .shade40))
case .warningBackground2:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.yellow, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.yellow, .shade10))
color = .init(light: GlobalTokens.sharedSwiftUIColor(.orange, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.orange, .shade10))
case .warningForeground1:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.yellow, .shade30),
dark: GlobalTokens.sharedSwiftUIColor(.yellow, .tint30))
color = .init(light: GlobalTokens.sharedSwiftUIColor(.orange, .shade30),
dark: GlobalTokens.sharedSwiftUIColor(.orange, .tint30))
case .warningForeground2:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.yellow, .shade30),
dark: GlobalTokens.sharedSwiftUIColor(.yellow, .tint30))
color = .init(light: GlobalTokens.sharedSwiftUIColor(.orange, .shade20),
dark: GlobalTokens.sharedSwiftUIColor(.orange, .tint40))
case .warningStroke1:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.yellow, .shade30),
dark: GlobalTokens.sharedSwiftUIColor(.yellow, .shade20))
color = .init(light: GlobalTokens.sharedSwiftUIColor(.orange, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.orange, .tint30))
case .presenceAway:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.marigold, .primary))
case .presenceDnd:
Expand Down
50 changes: 25 additions & 25 deletions Sources/FluentUI_common/Core/Theme/Extensions/macOS/FluentTheme+macOS.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,38 +208,38 @@ extension FluentTheme: PlatformThemeProviding {
color = .init(light: GlobalTokens.brandSwiftUIColor(.comm60),
dark: GlobalTokens.brandSwiftUIColor(.comm120))
case .dangerBackground1:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.red, .tint60),
dark: GlobalTokens.sharedSwiftUIColor(.red, .shade40))
color = .init(light: GlobalTokens.sharedSwiftUIColor(.cranberry, .tint60),
dark: GlobalTokens.sharedSwiftUIColor(.cranberry, .shade40))
case .dangerBackground2:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.red, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.red, .shade10))
color = .init(light: GlobalTokens.sharedSwiftUIColor(.cranberry, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.cranberry, .shade10))
case .dangerForeground1:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.red, .shade10),
dark: GlobalTokens.sharedSwiftUIColor(.red, .tint30))
color = .init(light: GlobalTokens.sharedSwiftUIColor(.cranberry, .shade20),
dark: GlobalTokens.sharedSwiftUIColor(.cranberry, .tint30))
case .dangerForeground2:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.red, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.red, .tint30))
color = .init(light: GlobalTokens.sharedSwiftUIColor(.cranberry, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.cranberry, .tint30))
case .dangerStroke1:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.red, .tint20),
dark: GlobalTokens.sharedSwiftUIColor(.red, .tint20))
color = .init(light: GlobalTokens.sharedSwiftUIColor(.cranberry, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.cranberry, .tint30))
case .dangerStroke2:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.red, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.red, .tint30))
color = .init(light: GlobalTokens.sharedSwiftUIColor(.cranberry, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.cranberry, .tint20))
case .successBackground1:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.green, .tint60),
dark: GlobalTokens.sharedSwiftUIColor(.green, .shade40))
case .successBackground2:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.green, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.green, .shade10))
case .successForeground1:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.green, .shade10),
color = .init(light: GlobalTokens.sharedSwiftUIColor(.green, .shade20),
dark: GlobalTokens.sharedSwiftUIColor(.green, .tint30))
case .successForeground2:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.green, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.green, .tint30))
case .successStroke1:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.green, .tint20),
dark: GlobalTokens.sharedSwiftUIColor(.green, .tint20))
color = .init(light: GlobalTokens.sharedSwiftUIColor(.green, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.lightGreen, .tint30))
case .severeBackground1:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.darkOrange, .tint60),
dark: GlobalTokens.sharedSwiftUIColor(.darkOrange, .shade40))
Expand All @@ -256,20 +256,20 @@ extension FluentTheme: PlatformThemeProviding {
color = .init(light: GlobalTokens.sharedSwiftUIColor(.darkOrange, .tint10),
dark: GlobalTokens.sharedSwiftUIColor(.darkOrange, .tint20))
case .warningBackground1:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.yellow, .tint60),
dark: GlobalTokens.sharedSwiftUIColor(.yellow, .shade40))
color = .init(light: GlobalTokens.sharedSwiftUIColor(.orange, .tint60),
dark: GlobalTokens.sharedSwiftUIColor(.orange, .shade40))
case .warningBackground2:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.yellow, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.yellow, .shade10))
color = .init(light: GlobalTokens.sharedSwiftUIColor(.orange, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.orange, .shade10))
case .warningForeground1:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.yellow, .shade30),
dark: GlobalTokens.sharedSwiftUIColor(.yellow, .tint30))
color = .init(light: GlobalTokens.sharedSwiftUIColor(.orange, .shade30),
dark: GlobalTokens.sharedSwiftUIColor(.orange, .tint30))
case .warningForeground2:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.yellow, .shade30),
dark: GlobalTokens.sharedSwiftUIColor(.yellow, .tint30))
color = .init(light: GlobalTokens.sharedSwiftUIColor(.orange, .shade20),
dark: GlobalTokens.sharedSwiftUIColor(.orange, .tint40))
case .warningStroke1:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.yellow, .shade30),
dark: GlobalTokens.sharedSwiftUIColor(.yellow, .shade20))
color = .init(light: GlobalTokens.sharedSwiftUIColor(.orange, .primary),
dark: GlobalTokens.sharedSwiftUIColor(.orange, .tint30))
case .presenceAway:
color = .init(light: GlobalTokens.sharedSwiftUIColor(.marigold, .primary))
case .presenceDnd:
Expand Down
Loading