issue-27: updated some logic

Daniel Dahan · Daniel Dahan · commit d8adf5a00d75 · 2015-09-03T11:11:18.000-04:00
diff --git a/Source/FlatButton.swift b/Source/FlatButton.swift
@@ -24,7 +24,7 @@ public class FlatButton : MaterialButton {
 	//
 	internal override func prepareView() {
 		super.prepareView()
-		setTitleColor(MaterialTheme.blueGrey.darken1, forState: .Normal)
+		setTitleColor(MaterialTheme.blue.accent2, forState: .Normal)
 		backgroundColor = MaterialTheme.clear.color
 		contentEdgeInsets = UIEdgeInsetsMake(4, 16, 4, 16)
 	}
diff --git a/Source/MaterialButton.swift b/Source/MaterialButton.swift
@@ -44,7 +44,7 @@ public class MaterialButton : UIButton {
 	/**
 		:name:	pulseColor
 	*/
-	public var pulseColor: UIColor? = MaterialTheme.blueGrey.lighten3
+	public var pulseColor: UIColor? = MaterialTheme.blue.lighten3
 	
 	/**
 		:name:	init
diff --git a/Source/MaterialCardView.swift b/Source/MaterialCardView.swift
@@ -49,7 +49,7 @@ public class MaterialCardView : UIView {
 	/**
 		:name:	pulseColor
 	*/
-	public var pulseColor: UIColor = MaterialTheme.blueGrey.lighten3
+	public var pulseColor: UIColor = MaterialTheme.blue.lighten3
 	
 	/**
 		:name:	init
diff --git a/Source/RaisedButton.swift b/Source/RaisedButton.swift
@@ -25,7 +25,7 @@ public class RaisedButton : MaterialButton {
 	internal override func prepareView()  {
 		super.prepareView()
 		setTitleColor(MaterialTheme.white.color, forState: .Normal)
-		backgroundColor = MaterialTheme.blueGrey.darken1
+		backgroundColor = MaterialTheme.blue.accent2
 		contentEdgeInsets = UIEdgeInsetsMake(4, 16, 4, 16)
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public class FlatButton : MaterialButton {`
`24`	`24`	`//`
`25`	`25`	`internal override func prepareView() {`
`26`	`26`	`super.prepareView()`
`27`		`- setTitleColor(MaterialTheme.blueGrey.darken1, forState: .Normal)`
	`27`	`+ setTitleColor(MaterialTheme.blue.accent2, forState: .Normal)`
`28`	`28`	`backgroundColor = MaterialTheme.clear.color`
`29`	`29`	`contentEdgeInsets = UIEdgeInsetsMake(4, 16, 4, 16)`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public class RaisedButton : MaterialButton {`
`25`	`25`	`internal override func prepareView() {`
`26`	`26`	`super.prepareView()`
`27`	`27`	`setTitleColor(MaterialTheme.white.color, forState: .Normal)`
`28`		`- backgroundColor = MaterialTheme.blueGrey.darken1`
	`28`	`+ backgroundColor = MaterialTheme.blue.accent2`
`29`	`29`	`contentEdgeInsets = UIEdgeInsetsMake(4, 16, 4, 16)`
`30`	`30`	`}`
`31`	`31`