Merge pull request #57 from Automattic/merge/1.0.2-into-trunk

Merge 1.0.2 changes into trunk

Author: jkmassel

Gridicons.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Gridicons"
-  s.version      = "1.0.1"
+  s.version      = "1.0.2"
   s.summary      = "Gridicons is a tiny framework which generates Gridicon images at any resolution."
 
   s.homepage     = "http://apps.wordpress.com"

Gridicons/Gridicons/Gridicons.xcassets/Contents.json

@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

Gridicons/Gridicons/Gridicons.xcassets/story.imageset/Contents.json

@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "story.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

Gridicons/Gridicons/Gridicons.xcassets/story.imageset/story.pdf

@@ -178,6 +178,7 @@ public enum GridiconType: Int {
     case statsUp
     case stats
     case status
+    case story
     case strikethrough
     case sync
     case tablet
@@ -380,6 +381,7 @@ extension GridiconType {
     case .statsUp: return "stats-up"
     case .stats: return "stats"
     case .status: return "status"
+    case .story: return "story"
     case .strikethrough: return "strikethrough"
     case .sync: return "sync"
     case .tablet: return "tablet"