Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ public enum ButtonColor: String {
case monochromeLight
case monochromeDark
case absoulteWhite
case orange
}

public enum ButtonType: Equatable {
Expand Down Expand Up @@ -166,6 +167,8 @@ public enum ButtonType: Equatable {
return .bgtxtYellowNormal
case .cobalt:
return .bgtxtCobaltNormal
case .orange:
return .bgtxtOrangeNormal
case .monochrome:
switch size {
case .xsmall, .small:
Expand All @@ -182,7 +185,7 @@ public enum ButtonType: Equatable {
}
case .floating(let color):
switch color {
case .blue, .red, .green, .yellow, .cobalt, .absoulteWhite:
case .blue, .red, .green, .yellow, .cobalt, .absoulteWhite, .orange:
return .bgtxtAbsoluteWhiteDark
case .monochrome, .monochromeLight, .monochromeDark:
return .txtBlackDarkest
Expand All @@ -209,6 +212,8 @@ public enum ButtonType: Equatable {
return .bgtxtYellowNormal
case .cobalt:
return .bgtxtCobaltNormal
case .orange:
return .bgtxtOrangeNormal
case .monochrome:
switch size {
case .xsmall, .small:
Expand All @@ -225,7 +230,7 @@ public enum ButtonType: Equatable {
}
case .floating(let color):
switch color {
case .blue, .red, .green, .yellow, .cobalt, .absoulteWhite:
case .blue, .red, .green, .yellow, .cobalt, .absoulteWhite, .orange:
return .bgtxtAbsoluteWhiteDark
case .monochrome, .monochromeLight, .monochromeDark:
return .txtBlackDarker
Expand Down Expand Up @@ -272,6 +277,13 @@ public enum ButtonType: Equatable {
case .pressed:
return .bgtxtCobaltDark
}
case .orange:
switch state {
case .default, .disabled:
return .bgtxtOrangeNormal
case .pressed:
return .bgtxtOrangeDark
}
case .monochrome:
switch state {
case .default, .disabled:
Expand Down Expand Up @@ -323,6 +335,13 @@ public enum ButtonType: Equatable {
case .pressed:
return .bgtxtCobaltLighter
}
case .orange:
switch state {
case .default, .disabled:
return .bgtxtOrangeLightest
case .pressed:
return .bgtxtOrangeLighter
}
case .monochrome, .monochromeLight, .monochromeDark:
switch state {
case .default, .disabled:
Expand Down Expand Up @@ -370,6 +389,13 @@ public enum ButtonType: Equatable {
case .pressed:
return .bgtxtCobaltLightest
}
case .orange:
switch state {
case .default, .disabled:
return .bgTransparent
case .pressed:
return .bgtxtOrangeLightest
}
case .monochrome, .monochromeLight, .monochromeDark:
switch state {
case .default, .disabled:
Expand Down Expand Up @@ -417,6 +443,13 @@ public enum ButtonType: Equatable {
case .pressed:
return .bgtxtCobaltDark
}
case .orange:
switch state {
case .default, .disabled:
return .bgtxtOrangeNormal
case .pressed:
return .bgtxtOrangeDark
}
case .monochrome, .monochromeLight, .monochromeDark:
switch state {
case .default, .disabled:
Expand Down