Commit e1add843 by Daniel Dahan

update

parent fd0fa450
Pod::Spec.new do |s|
s.name = 'MaterialKit'
s.version = '1.0.0'
s.license = { :type => "AGPLv3+", :file => "LICENSE" }
s.summary = 'A Material Design Framework In Swift'
s.homepage = 'http://materialkit.io'
s.social_media_url = 'https://www.facebook.com/graphkit'
s.authors = { 'GraphKit Inc.' => 'support@graphkit.io' }
s.source = { :git => 'https://github.com/GraphKit/MaterialKit.git', :tag => s.version }
s.ios.deployment_target = '8.0'
s.source_files = 'Source/*.swift'
s.requires_arc = true
end
...@@ -75,6 +75,7 @@ public class FabButton : UIButton { ...@@ -75,6 +75,7 @@ public class FabButton : UIButton {
backgroundColorView!.layer.cornerRadius = bounds.width / 2.0 backgroundColorView!.layer.cornerRadius = bounds.width / 2.0
backgroundColorView!.backgroundColor = color backgroundColorView!.backgroundColor = color
backgroundColorView!.layer.masksToBounds = true backgroundColorView!.layer.masksToBounds = true
backgroundColorView!.userInteractionEnabled = false
insertSubview(backgroundColorView!, atIndex: 0) insertSubview(backgroundColorView!, atIndex: 0)
} }
......
...@@ -13,24 +13,21 @@ public struct Roboto { ...@@ -13,24 +13,21 @@ public struct Roboto {
public static func lightWithSize(size: CGFloat) -> UIFont { public static func lightWithSize(size: CGFloat) -> UIFont {
if let light = UIFont(name: "Roboto-Light", size: size) { if let light = UIFont(name: "Roboto-Light", size: size) {
return light return light
} else {
return UIFont.systemFontOfSize(size)
} }
return UIFont.systemFontOfSize(size)
} }
public static func mediumWithSize(size: CGFloat) -> UIFont { public static func mediumWithSize(size: CGFloat) -> UIFont {
if let light = UIFont(name: "Roboto-Medium", size: size) { if let light = UIFont(name: "Roboto-Medium", size: size) {
return light return light
} else {
return UIFont.systemFontOfSize(size)
} }
return UIFont.systemFontOfSize(size)
} }
public static func regularWithSize(size: CGFloat) -> UIFont { public static func regularWithSize(size: CGFloat) -> UIFont {
if let light = UIFont(name: "Roboto-Regular", size: size) { if let light = UIFont(name: "Roboto-Regular", size: size) {
return light return light
} else {
return UIFont.systemFontOfSize(size)
} }
return UIFont.systemFontOfSize(size)
} }
} }
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