Digital ACT191 defect CXTDT-626309 - Updating fonts and spacing
Digital ACT191 defect CXTDT-628092 - Fixing accessibility trait header default.
This commit is contained in:
parent
3a06f7b43e
commit
7bed914dca
@ -52,6 +52,9 @@ public class HeadersH1ButtonModel: HeaderModel, MoleculeModelProtocol, ParentMol
|
|||||||
if titleLockup.subTitle?.fontStyle == nil {
|
if titleLockup.subTitle?.fontStyle == nil {
|
||||||
titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
|
titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
|
||||||
}
|
}
|
||||||
|
if titleLockup.title.accessibilityTraits == nil {
|
||||||
|
titleLockup.title.accessibilityTraits = [.header]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
|
|||||||
@ -31,6 +31,9 @@ public class HeadersH1NoButtonsBodyTextModel: HeaderModel, MoleculeModelProtocol
|
|||||||
if titleLockup.subTitle?.fontStyle == nil {
|
if titleLockup.subTitle?.fontStyle == nil {
|
||||||
titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
|
titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
|
||||||
}
|
}
|
||||||
|
if titleLockup.title.accessibilityTraits == nil {
|
||||||
|
titleLockup.title.accessibilityTraits = [.header]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
|
|||||||
@ -53,6 +53,9 @@ public class HeadersH2ButtonsModel: HeaderModel, MoleculeModelProtocol, ParentMo
|
|||||||
if titleLockup.subTitle?.fontStyle == nil {
|
if titleLockup.subTitle?.fontStyle == nil {
|
||||||
titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
|
titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
|
||||||
}
|
}
|
||||||
|
if titleLockup.title.accessibilityTraits == nil {
|
||||||
|
titleLockup.title.accessibilityTraits = [.header]
|
||||||
|
}
|
||||||
super.setDefaults()
|
super.setDefaults()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -48,6 +48,9 @@ public class HeadersH2CaretLinkModel: HeaderModel, MoleculeModelProtocol, Parent
|
|||||||
if titleLockup.subTitle?.fontStyle == nil {
|
if titleLockup.subTitle?.fontStyle == nil {
|
||||||
titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
|
titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
|
||||||
}
|
}
|
||||||
|
if titleLockup.title.accessibilityTraits == nil {
|
||||||
|
titleLockup.title.accessibilityTraits = [.header]
|
||||||
|
}
|
||||||
super.setDefaults()
|
super.setDefaults()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -52,6 +52,9 @@ public class HeadersH2LinkModel: HeaderModel, ParentMoleculeModelProtocol {
|
|||||||
if titleLockup.subTitle?.fontStyle == nil {
|
if titleLockup.subTitle?.fontStyle == nil {
|
||||||
titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
|
titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
|
||||||
}
|
}
|
||||||
|
if titleLockup.title.accessibilityTraits == nil {
|
||||||
|
titleLockup.title.accessibilityTraits = [.header]
|
||||||
|
}
|
||||||
super.setDefaults()
|
super.setDefaults()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -42,6 +42,9 @@ public class HeadersH2NoButtonsBodyTextModel: HeaderModel, MoleculeModelProtocol
|
|||||||
if titleLockup.subTitle?.fontStyle == nil {
|
if titleLockup.subTitle?.fontStyle == nil {
|
||||||
titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
|
titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
|
||||||
}
|
}
|
||||||
|
if titleLockup.title.accessibilityTraits == nil {
|
||||||
|
titleLockup.title.accessibilityTraits = [.header]
|
||||||
|
}
|
||||||
super.setDefaults()
|
super.setDefaults()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -53,6 +53,9 @@ public class HeadersH2TinyButtonModel: HeaderModel, MoleculeModelProtocol, Paren
|
|||||||
if titleLockup.subTitle?.fontStyle == nil {
|
if titleLockup.subTitle?.fontStyle == nil {
|
||||||
titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
|
titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
|
||||||
}
|
}
|
||||||
|
if titleLockup.title.accessibilityTraits == nil {
|
||||||
|
titleLockup.title.accessibilityTraits = [.header]
|
||||||
|
}
|
||||||
super.setDefaults()
|
super.setDefaults()
|
||||||
button.style = .secondary
|
button.style = .secondary
|
||||||
button.size = .small
|
button.size = .small
|
||||||
|
|||||||
@ -15,7 +15,7 @@ import Foundation
|
|||||||
//-----------------------------------------------------
|
//-----------------------------------------------------
|
||||||
|
|
||||||
public var stack: Stack<StackModel>
|
public var stack: Stack<StackModel>
|
||||||
public let headline = Label(fontStyle: .BoldTitleMedium)
|
public let headline = Label(fontStyle: .BoldTitleLarge)
|
||||||
public let body = Label(fontStyle: .RegularBodySmall)
|
public let body = Label(fontStyle: .RegularBodySmall)
|
||||||
|
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
@ -24,7 +24,7 @@ import Foundation
|
|||||||
|
|
||||||
public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
|
public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
|
||||||
stack = Stack<StackModel>.createStack(with: [(view: headline, model: StackItemModel(horizontalAlignment: .leading)),
|
stack = Stack<StackModel>.createStack(with: [(view: headline, model: StackItemModel(horizontalAlignment: .leading)),
|
||||||
(view: body, model: StackItemModel(spacing: 0, horizontalAlignment: .leading))],
|
(view: body, model: StackItemModel(spacing: 8, horizontalAlignment: .leading))],
|
||||||
axis: .vertical)
|
axis: .vertical)
|
||||||
super.init(style: style, reuseIdentifier: reuseIdentifier)
|
super.init(style: style, reuseIdentifier: reuseIdentifier)
|
||||||
}
|
}
|
||||||
@ -63,7 +63,7 @@ import Foundation
|
|||||||
|
|
||||||
open override func reset() {
|
open override func reset() {
|
||||||
super.reset()
|
super.reset()
|
||||||
headline.setFontStyle(.BoldTitleMedium)
|
headline.setFontStyle(.BoldTitleLarge)
|
||||||
body.setFontStyle(.RegularBodySmall)
|
body.setFontStyle(.RegularBodySmall)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -47,6 +47,9 @@ public class ListOneColumnTextWithWhitespaceDividerShortModel: ListItemModel, Mo
|
|||||||
|
|
||||||
override public func setDefaults() {
|
override public func setDefaults() {
|
||||||
style = .shortDivider
|
style = .shortDivider
|
||||||
|
if headline.accessibilityTraits == nil {
|
||||||
|
headline.accessibilityTraits = [.header]
|
||||||
|
}
|
||||||
super.setDefaults()
|
super.setDefaults()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -15,7 +15,7 @@ import Foundation
|
|||||||
//-----------------------------------------------------
|
//-----------------------------------------------------
|
||||||
|
|
||||||
public var stack: Stack<StackModel>
|
public var stack: Stack<StackModel>
|
||||||
public let headline = Label(fontStyle: .BoldTitleMedium)
|
public let headline = Label(fontStyle: .BoldTitleLarge)
|
||||||
public let body = Label(fontStyle: .RegularBodySmall)
|
public let body = Label(fontStyle: .RegularBodySmall)
|
||||||
|
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
@ -24,7 +24,7 @@ import Foundation
|
|||||||
|
|
||||||
public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
|
public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
|
||||||
stack = Stack<StackModel>.createStack(with: [(view: headline, model: StackItemModel(horizontalAlignment: .leading)),
|
stack = Stack<StackModel>.createStack(with: [(view: headline, model: StackItemModel(horizontalAlignment: .leading)),
|
||||||
(view: body, model: StackItemModel(spacing: 0, horizontalAlignment: .leading))],
|
(view: body, model: StackItemModel(spacing: 8, horizontalAlignment: .leading))],
|
||||||
axis: .vertical)
|
axis: .vertical)
|
||||||
super.init(style: style, reuseIdentifier: reuseIdentifier)
|
super.init(style: style, reuseIdentifier: reuseIdentifier)
|
||||||
}
|
}
|
||||||
@ -62,7 +62,7 @@ import Foundation
|
|||||||
|
|
||||||
open override func reset() {
|
open override func reset() {
|
||||||
super.reset()
|
super.reset()
|
||||||
headline.setFontStyle(.BoldTitleMedium)
|
headline.setFontStyle(.BoldTitleLarge)
|
||||||
body.setFontStyle(.RegularBodySmall)
|
body.setFontStyle(.RegularBodySmall)
|
||||||
accessibilityLabel = nil
|
accessibilityLabel = nil
|
||||||
}
|
}
|
||||||
|
|||||||
@ -47,6 +47,9 @@ public class ListOneColumnTextWithWhitespaceDividerTallModel: ListItemModel, Mol
|
|||||||
|
|
||||||
override public func setDefaults() {
|
override public func setDefaults() {
|
||||||
style = .tallDivider
|
style = .tallDivider
|
||||||
|
if headline.accessibilityTraits == nil {
|
||||||
|
headline.accessibilityTraits = [.header]
|
||||||
|
}
|
||||||
super.setDefaults()
|
super.setDefaults()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -72,9 +72,9 @@ import MVMCore
|
|||||||
case .standard:
|
case .standard:
|
||||||
set(topPadding: Padding.Component.VerticalMarginSpacing, bottomPadding: Padding.Component.VerticalMarginSpacing)
|
set(topPadding: Padding.Component.VerticalMarginSpacing, bottomPadding: Padding.Component.VerticalMarginSpacing)
|
||||||
case .shortDivider:
|
case .shortDivider:
|
||||||
set(topPadding: Padding.Component.LargeVerticalMarginSpacing, bottomPadding: Padding.Four)
|
set(topPadding: Padding.Component.LargeVerticalMarginSpacing, bottomPadding: Padding.Five)
|
||||||
case .tallDivider:
|
case .tallDivider:
|
||||||
set(topPadding: Padding.Twelve, bottomPadding: Padding.Four)
|
set(topPadding: Padding.Twelve, bottomPadding: Padding.Five)
|
||||||
case .sectionFooter:
|
case .sectionFooter:
|
||||||
set(topPadding: Padding.Component.VerticalMarginSpacing, bottomPadding: 0)
|
set(topPadding: Padding.Component.VerticalMarginSpacing, bottomPadding: 0)
|
||||||
case ListItemStyle.none:
|
case ListItemStyle.none:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user