Commit f714cc4c by Daniel Dahan

development: updated default Button cornerRadius values to match Material Design spec

parent 1dfde4b0
...@@ -45,7 +45,7 @@ class ViewController: UIViewController { ...@@ -45,7 +45,7 @@ class ViewController: UIViewController {
private func prepareFlatButton() { private func prepareFlatButton() {
let button = FlatButton(title: "Flat Button", titleColor: Color.blue.base) let button = FlatButton(title: "Flat Button", titleColor: Color.blue.base)
view.layout(button).width(120).height(40).center(offsetY: -150) view.layout(button).width(120).height(36).center(offsetY: -150)
} }
private func prepareRaisedButton() { private func prepareRaisedButton() {
...@@ -53,7 +53,7 @@ class ViewController: UIViewController { ...@@ -53,7 +53,7 @@ class ViewController: UIViewController {
button.pulseColor = Color.white button.pulseColor = Color.white
button.backgroundColor = Color.blue.base button.backgroundColor = Color.blue.base
view.layout(button).width(150).height(40).center(offsetY: -75) view.layout(button).width(150).height(36).center(offsetY: -75)
} }
private func prepareFabButton() { private func prepareFabButton() {
...@@ -65,7 +65,7 @@ class ViewController: UIViewController { ...@@ -65,7 +65,7 @@ class ViewController: UIViewController {
private func prepareIconButton() { private func prepareIconButton() {
let button = IconButton(image: Icon.cm.search, tintColor: Color.blue.base) let button = IconButton(image: Icon.cm.search, tintColor: Color.blue.base)
view.layout(button).width(120).height(40).center(offsetY: 75) view.layout(button).width(120).height(48).center(offsetY: 75)
} }
} }
...@@ -40,6 +40,6 @@ open class FlatButton: Button { ...@@ -40,6 +40,6 @@ open class FlatButton: Button {
*/ */
open override func prepare() { open override func prepare() {
super.prepare() super.prepare()
cornerRadiusPreset = .cornerRadius2 cornerRadiusPreset = .cornerRadius1
} }
} }
...@@ -41,7 +41,7 @@ open class RaisedButton: Button { ...@@ -41,7 +41,7 @@ open class RaisedButton: Button {
open override func prepare() { open override func prepare() {
super.prepare() super.prepare()
depthPreset = .depth1 depthPreset = .depth1
cornerRadiusPreset = .cornerRadius2 cornerRadiusPreset = .cornerRadius1
backgroundColor = Color.white backgroundColor = Color.white
} }
} }
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