Commit 5ca791c4 by Daniel Dahan

updated default alignment for Buttons

parent b061cb71
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'MK' s.name = 'MK'
s.version = '1.9.0' s.version = '1.10.0'
s.license = { :type => "AGPLv3+", :file => "LICENSE" } s.license = { :type => "AGPLv3+", :file => "LICENSE" }
s.summary = 'A Material Design Framework In Swift' s.summary = 'A Material Design Framework In Swift'
s.homepage = 'http://materialkit.io' s.homepage = 'http://materialkit.io'
......
...@@ -26,7 +26,6 @@ public class FabButton : MaterialButton { ...@@ -26,7 +26,6 @@ public class FabButton : MaterialButton {
super.prepareView() super.prepareView()
setTitleColor(MaterialTheme.white.color, forState: .Normal) setTitleColor(MaterialTheme.white.color, forState: .Normal)
backgroundColor = MaterialTheme.red.darken1 backgroundColor = MaterialTheme.red.darken1
pulseColor = MaterialTheme.white.color
contentEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 0) contentEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 0)
} }
......
...@@ -24,9 +24,11 @@ public class FlatButton : MaterialButton { ...@@ -24,9 +24,11 @@ public class FlatButton : MaterialButton {
// //
internal override func prepareView() { internal override func prepareView() {
super.prepareView() super.prepareView()
setTitleColor(MaterialTheme.blue.accent2, forState: .Normal) titleLabel!.font = Roboto.medium
setTitleColor(MaterialTheme.blueGrey.darken4, forState: .Normal)
pulseColor = MaterialTheme.blueGrey.lighten3
backgroundColor = MaterialTheme.clear.color backgroundColor = MaterialTheme.clear.color
contentEdgeInsets = UIEdgeInsetsMake(4, 16, 4, 16) contentEdgeInsets = UIEdgeInsetsMake(6, 16, 6, 16)
} }
// //
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.9.0</string> <string>1.10.0</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
...@@ -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.white.color
/** /**
:name: init :name: init
......
...@@ -24,9 +24,10 @@ public class RaisedButton : MaterialButton { ...@@ -24,9 +24,10 @@ public class RaisedButton : MaterialButton {
// //
internal override func prepareView() { internal override func prepareView() {
super.prepareView() super.prepareView()
titleLabel!.font = Roboto.medium
setTitleColor(MaterialTheme.white.color, forState: .Normal) setTitleColor(MaterialTheme.white.color, forState: .Normal)
backgroundColor = MaterialTheme.blue.accent2 backgroundColor = MaterialTheme.blue.accent2
contentEdgeInsets = UIEdgeInsetsMake(4, 16, 4, 16) contentEdgeInsets = UIEdgeInsetsMake(6, 16, 6, 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