Merge branch 'develop' into feature/entryFields
This commit is contained in:
commit
8d20f6617f
@ -223,8 +223,7 @@ extension TypographicalStyle {
|
||||
.BoldTitleMedium,
|
||||
.BoldTitleSmall,
|
||||
.BoldBodyLarge,
|
||||
.BoldBodyMedium,
|
||||
.BoldBodySmall:
|
||||
.BoldBodyMedium:
|
||||
return .dsBold
|
||||
|
||||
case .FeatureXLarge,
|
||||
@ -240,14 +239,15 @@ extension TypographicalStyle {
|
||||
case .TitleMedium,
|
||||
.TitleSmall,
|
||||
.BodyLarge,
|
||||
.BodyMedium,
|
||||
.BodySmall:
|
||||
.BodyMedium:
|
||||
return .dsRegular
|
||||
|
||||
case .BoldMicro:
|
||||
case .BoldBodySmall,
|
||||
.BoldMicro:
|
||||
return .txBold
|
||||
|
||||
case .Micro:
|
||||
case .BodySmall,
|
||||
.Micro:
|
||||
return .txRegular
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user