Merge branch 'develop' into feature/Headers_H1_LandingPageHeader

MVMCoreUI/Atomic/Templates/MoleculeStackTemplate.swift

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

MVMCoreUI/Containers/Views/ContainerModel.swift

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

MVMCoreUI/Styles/Styler.swift

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