mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into bugfix/label_range_safety

Browse Source
This commit is contained in:
Kyle Matthew Hedden 2022-07-13 20:02:15 -04:00
commit b3667dc868
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2TinyButtonModel.swift
View File

@ -41,7 +41,7 @@ public class HeadersH2TinyButtonModel: HeaderModel, MoleculeModelProtocol {
} }
super.setDefaults() super.setDefaults()
button.style = .secondary button.style = .secondary
button.size = .tiny button.size = .small
} }
//-------------------------------------------------- //--------------------------------------------------

4
MVMCoreUI/Atomic/Molecules/HeadersAndFooters/Header.swift
View File

@ -51,9 +51,7 @@ open class HeaderView: Container {
open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) { open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
super.set(with: model, delegateObject, additionalData) super.set(with: model, delegateObject, additionalData)
guard let headerModel = headerModel else { return } guard let headerModel = headerModel else { return }
if let lineModel = headerModel.line { line.setOptional(with: headerModel.line, delegateObject, additionalData)
line.set(with: lineModel, delegateObject, additionalData)
}
} }
open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? { open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {

3
MVMCoreUI/Atomic/Molecules/HeadersAndFooters/HeaderModel.swift
View File

@ -30,9 +30,6 @@
if bottomPadding == nil { if bottomPadding == nil {
bottomPadding = PaddingDefaultVerticalSpacing bottomPadding = PaddingDefaultVerticalSpacing
} }
if line == nil {
line = LineModel(type: .heavy)
}
} }
public override init() { public override init() {