Merge branch 'master' of github.com:okfocus/portfolio

1 files changed, 24 insertions, 11 deletions

diff --git a/db.json b/db.json
index db6175a..ed11565 100644
--- a/db.json
+++ b/db.json
@@ -11,7 +11,7 @@
       "media": [
         {
           "uri": "http://internetarchaeology.org/digging.gif",
-          "caption": "background-size:contain",
+          "caption": "background-size:cover; background-color:white;",
           "type": "image"
         }
       ],
@@ -86,7 +86,7 @@
           "uri": "",
           "width": "1920",
           "height": "1080",
-          "title": "stone-island-app.mp4",
+          "title": "background-color:white",
           "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png"
         },
         {
@@ -378,7 +378,7 @@
           "uri": "",
           "width": "1920",
           "height": "1080",
-          "title": "overlayer-app.mp4",
+          "title": "background-color:white",
           "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png"
         },
         {
@@ -403,23 +403,27 @@
       "client": "Diesel",
       "link": "",
       "NatureOfWork": "Design\r\n3D Animation\r\nCreative Direction",
-      "brief": "Working with Nicola Formichetti\r\nand Nick Knight, we facilitated video\r\nconcepts and post production on\r\nthe Fall / Winter 2014 ad campaign\r\nfor Diesel. The imagery was surreal\r\nand fractured – creating sculpture\r\nout of human form and exaggerating\r\nmodel’s features",
+      "brief": "Working with Nicola Formichetti\r\nand Nick Knight, we facilitated video\r\nconcepts and post production on\r\nthe Fall / Winter 2014 ad campaign\r\nfor Diesel. The imagery was surreal\r\nand fractured – creating sculpture\r\nout of human form and exaggerating\r\nmodels' features.",
       "containImage": "true",
       "__index": 10,
       "dateCreated": "Sun, 03 Apr 2016 19:50:33 GMT",
       "media": [
         {
+          "type": "video",
+          "token": "http://okfocus.s3.amazonaws.com/images/diesel/loop6.mp4",
+          "uri": "",
+          "width": "1280",
+          "height": "902",
+          "title": "",
+          "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png"
+        },
+        {
           "uri": "https://ltho.s3.amazonaws.com/3ce5af16-c554-4aa8-b8d6-5bf43cd9ae67.png",
           "caption": "background-size:contain",
           "type": "image"
         }
       ],
-      "press": [
-        {
-          "text": "",
-          "uri": ""
-        }
-      ],
+      "press": [],
       "mobileTitle": "",
       "linkText": "",
       "mobileMedia": []
@@ -984,6 +988,15 @@
       "brief": "We were challenged by Google to\r\nhelp them make Hangouts better. In\r\njust two weeks we created a game\r\nallowing players to “draw with their\r\nface” using while opponents try to\r\nguess the drawing’s subject. This\r\nproject was not just fun, it helped\r\nGoogle make a better API for\r\nHangouts. Its a good example of our\r\nabilities to innovate quickly.",
       "media": [
         {
+          "type": "video",
+          "token": "http://okfocus.s3.amazonaws.com/nike/video/src/dwyf.mp4",
+          "uri": "",
+          "width": "1280",
+          "height": "845",
+          "title": "",
+          "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png"
+        },
+        {
           "uri": "https://ltho.s3.amazonaws.com/b64d53ba-af07-4ef0-a16b-786eacafd979.png",
           "caption": "background-size:70%",
           "type": "image"
@@ -1076,7 +1089,7 @@
       "media": [
         {
           "uri": "http://www.wheresthepixel.com/",
-          "caption": "",
+          "caption": "background-color:white",
           "type": "link"
         },
         {