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

Merge branch 'develop' into feature/Headers_H1_LandingPageHeader

Browse Source
This commit is contained in:
Lekshmi S 2020-06-10 20:00:55 +05:30
commit 25e9854e4d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/Atomic/Templates/MoleculeStackTemplate.swift
View File

@ -57,7 +57,7 @@ open class MoleculeStackTemplate: ThreeLayerViewController, TemplateProtocol {
moleculeStackModel.useStackSpacingBeforeFirstItem = true moleculeStackModel.useStackSpacingBeforeFirstItem = true
for stackItem in moleculeStackModel.molecules { for stackItem in moleculeStackModel.molecules {
guard let stackItem = stackItem as? MoleculeStackItemModel, guard let stackItem = stackItem as? MoleculeStackItemModel,
stackItem.horizontalAlignment == nil else { continue } stackItem.useHorizontalMargins == nil else { continue }
stackItem.useHorizontalMargins = true stackItem.useHorizontalMargins = true
} }
stack.set(with: moleculeStackModel, delegateObject() as? MVMCoreUIDelegateObject, nil) stack.set(with: moleculeStackModel, delegateObject() as? MVMCoreUIDelegateObject, nil)

2
MVMCoreUI/Containers/Views/ContainerModel.swift
View File

@ -44,7 +44,7 @@ open class ContainerModel: ContainerModelProtocol, Codable {
//-------------------------------------------------- //--------------------------------------------------
/// Sets the default values. Should be called on init. /// Sets the default values. Should be called on init.
public func setDefaults() {} open func setDefaults() {}
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Initializers // MARK: - Initializers

8
MVMCoreUI/Styles/Styler.swift
View File

@ -95,9 +95,7 @@ open class Styler {
public func isBold() -> Bool { public func isBold() -> Bool {
switch self { switch self {
case .Title2XLarge, case .RegularTitleLarge,
.TitleXLarge,
.RegularTitleLarge,
.RegularTitleMedium, .RegularTitleMedium,
.RegularBodyLarge, .RegularBodyLarge,
.RegularBodySmall, .RegularBodySmall,
@ -107,7 +105,9 @@ open class Styler {
.B20: .B20:
return false return false
case .BoldTitleLarge, case .Title2XLarge,
.TitleXLarge,
.BoldTitleLarge,
.BoldTitleMedium, .BoldTitleMedium,
.BoldBodyLarge, .BoldBodyLarge,
.BoldBodySmall, .BoldBodySmall,