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