Commit 13a5c521 by Daniel Dahan

master: merge development

parents fe5afa24 022548ea
Pod::Spec.new do |s|
s.name = 'MK'
s.version = '1.4.0'
s.version = '1.5.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.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'
......
......@@ -86,7 +86,7 @@ card.buttons = [cancelButton, okButton]
view.addSubview(card)
```
### Side Navigation Controller
### Side Navigation
Add a sleek Side Navigation to give your users a wonderful experience.
......@@ -103,6 +103,20 @@ func application(application: UIApplication, didFinishLaunchingWithOptions launc
}
```
### Material Themes
Beautify your app with color. All Material Design color palettes are supported.
[Color Palettes](http://www.google.com/design/spec/style/color.html)
```swift
var button: RaisedButton = RaisedButton()
button.setTitle("Raised", forState: .Normal)
button.setTitleColor(MaterialTheme.blue.darken3, forState: .Normal)
button.backgroundColor = MaterialTheme.yellow.darken3
button.pulseColor = MaterialTheme.blueGrey.color
```
### License
......@@ -114,3 +128,4 @@ func application(application: UIApplication, didFinishLaunchingWithOptions launc
* [Daniel Dahan](https://github.com/danieldahan)
* [Adam Dahan](https://github.com/adamdahan)
* [Michael Reyder](https://github.com/mishaGK)
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.4.0</string>
<string>1.5.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
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