issue-17: minor updates

Source/FlatButton.swift

@@ -18,47 +18,14 @@
 
 
 import UIKit
 import UIKit
 
 
-public class FlatButton : MaterialButton {
-	/**
-		:name:	pulseTitleColor
-	*/
-	public var pulseTitleColor: UIColor?
-	
-	/**
-	:name:	titleColor
-	*/
-	public var titleColor: UIColor? {
-		didSet {
-			setTitleColor(titleColor, forState: .Normal)
-		}
-	}
-	
+public class FlatButton : RaisedButton {
 	//
 	//
 	//	:name:	prepareButton
 	//	:name:	prepareButton
 	//
 	//
 	internal override func prepareButton() {
 	internal override func prepareButton() {
 		super.prepareButton()
 		super.prepareButton()
+		backgroundColor = .clearColor()
 		pulseColor = .whiteColor()
 		pulseColor = .whiteColor()
 		backgroundColorView.layer.cornerRadius = 3
 		backgroundColorView.layer.cornerRadius = 3
 	}
 	}
-	
-	//
-	//	:name:	pulseTouches
-	//
-	internal override func pulseTouches(touches: Set<NSObject>) {
-		super.pulseTouches(touches)
-		UIView.animateWithDuration(0.3, animations: {
-			self.pulseView!.transform = CGAffineTransformMakeScale(10, 10)
-			self.transform = CGAffineTransformMakeScale(1.05, 1.1)
-			if let c = self.pulseTitleColor {
-				self.setTitleColor(c, forState: .Normal)
-			}
-		}) { _ in
-			if let c = self.titleColor {
-				UIView.animateWithDuration(0.3, animations: {
-					self.setTitleColor(c, forState: .Normal)
-				})
-			}
-		}
-	}
 }
 }

Source/MaterialButton.swift

@@ -30,6 +30,15 @@ public class MaterialButton : UIButton {
 	internal var pulseView: UIView?
 	internal var pulseView: UIView?
 	
 	
 	/**
 	/**
+		:name:	backgroundColor
+	*/
+	public override var backgroundColor: UIColor? {
+		didSet {
+			backgroundColorView.backgroundColor = backgroundColor
+		}
+	}
+	
+	/**
 		:name:	pulseColor
 		:name:	pulseColor
 	*/
 	*/
 	public var pulseColor: UIColor?
 	public var pulseColor: UIColor?
@@ -120,8 +129,8 @@ public class MaterialButton : UIButton {
 	// We need this view so we can use the masksToBounds
 	// We need this view so we can use the masksToBounds
 	// so the pulse doesn't animate off the button
 	// so the pulse doesn't animate off the button
 	private func prepareBackgroundColorView() {
 	private func prepareBackgroundColorView() {
-		backgroundColorView.backgroundColor = backgroundColor
 		backgroundColorView.layer.masksToBounds = true
 		backgroundColorView.layer.masksToBounds = true
+		backgroundColorView.clipsToBounds = true
 		backgroundColorView.userInteractionEnabled = false
 		backgroundColorView.userInteractionEnabled = false
 		insertSubview(backgroundColorView, atIndex: 0)
 		insertSubview(backgroundColorView, atIndex: 0)
 	}
 	}

Source/RaisedButton.swift

@@ -18,15 +18,48 @@
 
 
 import UIKit
 import UIKit
 
 
-public class RaisedButton : FlatButton {
+public class RaisedButton : MaterialButton {
+	/**
+		:name:	pulseTitleColor
+	*/
+	public var pulseTitleColor: UIColor?
+	
+	/**
+		:name:	titleColor
+	*/
+	public var titleColor: UIColor? {
+		didSet {
+			setTitleColor(titleColor, forState: .Normal)
+		}
+	}
+	
 	//
 	//
 	//	:name:	prepareButton
 	//	:name:	prepareButton
 	//
 	//
 	internal override func prepareButton() {
 	internal override func prepareButton() {
 		super.prepareButton()
 		super.prepareButton()
-		backgroundColor = .redColor()
 		pulseColor = .whiteColor()
 		pulseColor = .whiteColor()
 		backgroundColorView.layer.cornerRadius = 3
 		backgroundColorView.layer.cornerRadius = 3
 	}
 	}
+	
+	//
+	//	:name:	pulseTouches
+	//
+	internal override func pulseTouches(touches: Set<NSObject>) {
+		super.pulseTouches(touches)
+		UIView.animateWithDuration(0.3, animations: {
+			self.pulseView!.transform = CGAffineTransformMakeScale(10, 10)
+			self.transform = CGAffineTransformMakeScale(1.05, 1.1)
+			if let c = self.pulseTitleColor {
+				self.setTitleColor(c, forState: .Normal)
+			}
+		}) { _ in
+			if let c = self.titleColor {
+				UIView.animateWithDuration(0.3, animations: {
+					self.setTitleColor(c, forState: .Normal)
+				})
+			}
+		}
+	}
 }
 }