updated Material Card alignment interface

baf5f068 · Daniel Dahan · 5e2c7c1f · baf5f068 · baf5f068
Commit baf5f068 authored Sep 07, 2015 by Daniel Dahan
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 10 deletions

Source/BasicCardView.swift
+1 -2

Source/ImageCardView.swift
+1 -8

No files found.
--- a/Source/BasicCardView.swift
+++ b/Source/BasicCardView.swift
@@ -357,8 +357,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
 			
 			// common text
 			Layout.height(titleLabelContainer!, child: titleLabel!, height: 1.5 * titleLabel!.font.pointSize)
-			Layout.expandToParentVerticallyWithPad(titleLabelContainer!, child: titleLabel!, top: titleLabelTopInset, bottom: titleLabelBottomInset)
-			Layout.expandToParentHorizontallyWithPad(titleLabelContainer!, child: titleLabel!, left: titleLabelLeftInset, right: titleLabelRightInset)
+			Layout.expandToParentWithPad(titleLabelContainer!, child: titleLabel!, top: titleLabelTopInset, left: titleLabelLeftInset, bottom: titleLabelBottomInset, right: titleLabelRightInset)
 		}
 		
 		// detail

--- a/Source/ImageCardView.swift
+++ b/Source/ImageCardView.swift
@@ -74,17 +74,11 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
 	*/
 	public var titleLabelVerticalInset: CGFloat = MaterialTheme.verticalInset {
 		didSet {
-			titleLabelTopInset = titleLabelVerticalInset
 			titleLabelBottomInset = titleLabelVerticalInset
 		}
 	}
 	
 	/**
-		:name:	titleLabelTopInset
-	*/
-	public var titleLabelTopInset: CGFloat = MaterialTheme.verticalInset
-	
-	/**
 		:name:	titleLabelBottomInset
 	*/
 	public var titleLabelBottomInset: CGFloat = MaterialTheme.verticalInset
@@ -469,8 +463,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
 			
 			// common text
 			Layout.height(titleLabelContainer!, child: titleLabel!, height: 1.5 * titleLabel!.font.pointSize)
-			Layout.expandToParentVerticallyWithPad(titleLabelContainer!, child: titleLabel!, top: titleLabelTopInset, bottom: titleLabelBottomInset)
-			Layout.expandToParentHorizontallyWithPad(titleLabelContainer!, child: titleLabel!, left: titleLabelLeftInset, right: titleLabelRightInset)
+			Layout.expandToParentWithPad(titleLabelContainer!, child: titleLabel!, left: titleLabelLeftInset, bottom: titleLabelBottomInset, right: titleLabelRightInset)
 		}
 		
 		// detail