Commit d8adf5a0 by Daniel Dahan

issue-27: updated some logic

parent a5a35b4c
...@@ -24,7 +24,7 @@ public class FlatButton : MaterialButton { ...@@ -24,7 +24,7 @@ public class FlatButton : MaterialButton {
// //
internal override func prepareView() { internal override func prepareView() {
super.prepareView() super.prepareView()
setTitleColor(MaterialTheme.blueGrey.darken1, forState: .Normal) setTitleColor(MaterialTheme.blue.accent2, forState: .Normal)
backgroundColor = MaterialTheme.clear.color backgroundColor = MaterialTheme.clear.color
contentEdgeInsets = UIEdgeInsetsMake(4, 16, 4, 16) contentEdgeInsets = UIEdgeInsetsMake(4, 16, 4, 16)
} }
......
...@@ -44,7 +44,7 @@ public class MaterialButton : UIButton { ...@@ -44,7 +44,7 @@ public class MaterialButton : UIButton {
/** /**
:name: pulseColor :name: pulseColor
*/ */
public var pulseColor: UIColor? = MaterialTheme.blueGrey.lighten3 public var pulseColor: UIColor? = MaterialTheme.blue.lighten3
/** /**
:name: init :name: init
......
...@@ -49,7 +49,7 @@ public class MaterialCardView : UIView { ...@@ -49,7 +49,7 @@ public class MaterialCardView : UIView {
/** /**
:name: pulseColor :name: pulseColor
*/ */
public var pulseColor: UIColor = MaterialTheme.blueGrey.lighten3 public var pulseColor: UIColor = MaterialTheme.blue.lighten3
/** /**
:name: init :name: init
......
...@@ -25,7 +25,7 @@ public class RaisedButton : MaterialButton { ...@@ -25,7 +25,7 @@ public class RaisedButton : MaterialButton {
internal override func prepareView() { internal override func prepareView() {
super.prepareView() super.prepareView()
setTitleColor(MaterialTheme.white.color, forState: .Normal) setTitleColor(MaterialTheme.white.color, forState: .Normal)
backgroundColor = MaterialTheme.blueGrey.darken1 backgroundColor = MaterialTheme.blue.accent2
contentEdgeInsets = UIEdgeInsetsMake(4, 16, 4, 16) contentEdgeInsets = UIEdgeInsetsMake(4, 16, 4, 16)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment