Commit 3f2cd46b by Daniel Dahan

updated default font size for TextField to match Material Design spec.

parent ab6cc8dc
...@@ -53,14 +53,14 @@ class ViewController: UIViewController, TextFieldDelegate { ...@@ -53,14 +53,14 @@ class ViewController: UIViewController, TextFieldDelegate {
/// Prepares the name TextField. /// Prepares the name TextField.
private func prepareNameField() { private func prepareNameField() {
let textField: TextField = TextField(frame: CGRectMake(57, 100, 300, 32)) let textField: TextField = TextField(frame: CGRectMake(57, 100, 300, 24))
textField.placeholder = "First Name" textField.placeholder = "First Name"
view.addSubview(textField) view.addSubview(textField)
} }
/// Prepares the email TextField. /// Prepares the email TextField.
private func prepareEmailField() { private func prepareEmailField() {
let textField: TextField = TextField(frame: CGRectMake(57, 200, 300, 32)) let textField: TextField = TextField(frame: CGRectMake(57, 200, 300, 24))
textField.delegate = self textField.delegate = self
textField.placeholder = "Email" textField.placeholder = "Email"
......
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'Material' s.name = 'Material'
s.version = '1.39.0' s.version = '1.39.1'
s.license = 'BSD' s.license = 'BSD'
s.summary = 'Express your creativity with Material, an animation and graphics framework for Google\'s Material Design and Apple\'s Flat UI in Swift.' s.summary = 'Express your creativity with Material, an animation and graphics framework for Google\'s Material Design and Apple\'s Flat UI in Swift.'
s.homepage = 'http://cosmicmind.io' s.homepage = 'http://cosmicmind.io'
......
...@@ -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.39.0</string> <string>1.39.1</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
...@@ -485,7 +485,7 @@ public class TextField : UITextField { ...@@ -485,7 +485,7 @@ public class TextField : UITextField {
backgroundColor = MaterialColor.white backgroundColor = MaterialColor.white
masksToBounds = false masksToBounds = false
placeholderTextColor = MaterialColor.grey.base placeholderTextColor = MaterialColor.grey.base
font = RobotoFont.regularWithSize(20) font = RobotoFont.regularWithSize(16)
textColor = MaterialColor.grey.darken4 textColor = MaterialColor.grey.darken4
borderStyle = .None borderStyle = .None
prepareClearButton() prepareClearButton()
......
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