Merge branch 'feature/facebookDevices'

koenbok · Feb 17, 2016 · 195bc4d282366fdb3d09e201168e5390315c0582
2 parents 5c72995 + e785bd2
commit 195bc4d282366fdb3d09e201168e5390315c0582
diff --git a/extras/DevServer.framer/Icon b/extras/DevServer.framer/Icon
diff --git a/extras/DeviceResources/apple-ipad-air-2-gold.jp2 b/extras/DeviceResources/apple-ipad-air-2-gold.jp2
diff --git a/extras/DeviceResources/apple-ipad-air-2-gold.png b/extras/DeviceResources/apple-ipad-air-2-gold.png
diff --git a/extras/DeviceResources/apple-ipad-air-2-silver.jp2 b/extras/DeviceResources/apple-ipad-air-2-silver.jp2
diff --git a/extras/DeviceResources/apple-ipad-air-2-silver.png b/extras/DeviceResources/apple-ipad-air-2-silver.png
diff --git a/extras/DeviceResources/apple-ipad-air-2-space-gray.jp2 b/extras/DeviceResources/apple-ipad-air-2-space-gray.jp2
diff --git a/extras/DeviceResources/apple-ipad-air-2-space-gray.png b/extras/DeviceResources/apple-ipad-air-2-space-gray.png
diff --git a/extras/DeviceResources/apple-ipad-mini-4-gold.jp2 b/extras/DeviceResources/apple-ipad-mini-4-gold.jp2
diff --git a/extras/DeviceResources/apple-ipad-mini-4-gold.png b/extras/DeviceResources/apple-ipad-mini-4-gold.png
diff --git a/extras/DeviceResources/apple-ipad-mini-4-silver.jp2 b/extras/DeviceResources/apple-ipad-mini-4-silver.jp2
diff --git a/extras/DeviceResources/apple-ipad-mini-4-silver.png b/extras/DeviceResources/apple-ipad-mini-4-silver.png
diff --git a/extras/DeviceResources/apple-ipad-mini-4-space-gray.jp2 b/extras/DeviceResources/apple-ipad-mini-4-space-gray.jp2
diff --git a/extras/DeviceResources/apple-ipad-mini-4-space-gray.png b/extras/DeviceResources/apple-ipad-mini-4-space-gray.png
diff --git a/extras/DeviceResources/apple-ipad-pro-gold.jp2 b/extras/DeviceResources/apple-ipad-pro-gold.jp2
diff --git a/extras/DeviceResources/apple-ipad-pro-gold.png b/extras/DeviceResources/apple-ipad-pro-gold.png
diff --git a/extras/DeviceResources/apple-ipad-pro-silver.jp2 b/extras/DeviceResources/apple-ipad-pro-silver.jp2
diff --git a/extras/DeviceResources/apple-ipad-pro-silver.png b/extras/DeviceResources/apple-ipad-pro-silver.png
diff --git a/extras/DeviceResources/apple-ipad-pro-space-gray.jp2 b/extras/DeviceResources/apple-ipad-pro-space-gray.jp2
diff --git a/extras/DeviceResources/apple-ipad-pro-space-gray.png b/extras/DeviceResources/apple-ipad-pro-space-gray.png
diff --git a/extras/DeviceResources/apple-iphone-5c-blue.jp2 b/extras/DeviceResources/apple-iphone-5c-blue.jp2
diff --git a/extras/DeviceResources/apple-iphone-5c-blue.png b/extras/DeviceResources/apple-iphone-5c-blue.png
diff --git a/extras/DeviceResources/apple-iphone-5c-green.jp2 b/extras/DeviceResources/apple-iphone-5c-green.jp2
diff --git a/extras/DeviceResources/apple-iphone-5c-green.png b/extras/DeviceResources/apple-iphone-5c-green.png
diff --git a/extras/DeviceResources/apple-iphone-5c-red.jp2 b/extras/DeviceResources/apple-iphone-5c-red.jp2
diff --git a/extras/DeviceResources/apple-iphone-5c-red.png b/extras/DeviceResources/apple-iphone-5c-red.png
diff --git a/extras/DeviceResources/apple-iphone-5c-white.jp2 b/extras/DeviceResources/apple-iphone-5c-white.jp2
diff --git a/extras/DeviceResources/apple-iphone-5c-white.png b/extras/DeviceResources/apple-iphone-5c-white.png
diff --git a/extras/DeviceResources/apple-iphone-5c-yellow.jp2 b/extras/DeviceResources/apple-iphone-5c-yellow.jp2
diff --git a/extras/DeviceResources/apple-iphone-5c-yellow.png b/extras/DeviceResources/apple-iphone-5c-yellow.png
diff --git a/extras/DeviceResources/apple-iphone-5s-gold.jp2 b/extras/DeviceResources/apple-iphone-5s-gold.jp2
diff --git a/extras/DeviceResources/apple-iphone-5s-gold.png b/extras/DeviceResources/apple-iphone-5s-gold.png
diff --git a/extras/DeviceResources/apple-iphone-5s-silver.jp2 b/extras/DeviceResources/apple-iphone-5s-silver.jp2
diff --git a/extras/DeviceResources/apple-iphone-5s-silver.png b/extras/DeviceResources/apple-iphone-5s-silver.png
diff --git a/extras/DeviceResources/apple-iphone-5s-space-gray.jp2 b/extras/DeviceResources/apple-iphone-5s-space-gray.jp2
diff --git a/extras/DeviceResources/apple-iphone-5s-space-gray.png b/extras/DeviceResources/apple-iphone-5s-space-gray.png
diff --git a/extras/DeviceResources/apple-iphone-6s-gold.jp2 b/extras/DeviceResources/apple-iphone-6s-gold.jp2
diff --git a/extras/DeviceResources/apple-iphone-6s-gold.png b/extras/DeviceResources/apple-iphone-6s-gold.png
diff --git a/extras/DeviceResources/apple-iphone-6s-plus-gold.jp2 b/extras/DeviceResources/apple-iphone-6s-plus-gold.jp2
diff --git a/extras/DeviceResources/apple-iphone-6s-plus-gold.png b/extras/DeviceResources/apple-iphone-6s-plus-gold.png
diff --git a/extras/DeviceResources/apple-iphone-6s-plus-rose-gold.jp2 b/extras/DeviceResources/apple-iphone-6s-plus-rose-gold.jp2
diff --git a/extras/DeviceResources/apple-iphone-6s-plus-rose-gold.png b/extras/DeviceResources/apple-iphone-6s-plus-rose-gold.png
diff --git a/extras/DeviceResources/apple-iphone-6s-plus-silver.jp2 b/extras/DeviceResources/apple-iphone-6s-plus-silver.jp2
diff --git a/extras/DeviceResources/apple-iphone-6s-plus-silver.png b/extras/DeviceResources/apple-iphone-6s-plus-silver.png
diff --git a/extras/DeviceResources/apple-iphone-6s-plus-space-gray.jp2 b/extras/DeviceResources/apple-iphone-6s-plus-space-gray.jp2
diff --git a/extras/DeviceResources/apple-iphone-6s-plus-space-gray.png b/extras/DeviceResources/apple-iphone-6s-plus-space-gray.png
diff --git a/extras/DeviceResources/apple-iphone-6s-rose-gold.jp2 b/extras/DeviceResources/apple-iphone-6s-rose-gold.jp2
diff --git a/extras/DeviceResources/apple-iphone-6s-rose-gold.png b/extras/DeviceResources/apple-iphone-6s-rose-gold.png
diff --git a/extras/DeviceResources/apple-iphone-6s-silver.jp2 b/extras/DeviceResources/apple-iphone-6s-silver.jp2
diff --git a/extras/DeviceResources/apple-iphone-6s-silver.png b/extras/DeviceResources/apple-iphone-6s-silver.png
diff --git a/extras/DeviceResources/apple-iphone-6s-space-gray.jp2 b/extras/DeviceResources/apple-iphone-6s-space-gray.jp2
diff --git a/extras/DeviceResources/apple-iphone-6s-space-gray.png b/extras/DeviceResources/apple-iphone-6s-space-gray.png
diff --git a/extras/DeviceResources/apple-watch-38mm-black-steel-black-closed.jp2 b/extras/DeviceResources/apple-watch-38mm-black-steel-black-closed.jp2
diff --git a/extras/DeviceResources/apple-watch-38mm-black-steel-black-closed.png b/extras/DeviceResources/apple-watch-38mm-black-steel-black-closed.png
diff --git a/extras/DeviceResources/apple-watch-38mm-gold-black-leather-closed.jp2 b/extras/DeviceResources/apple-watch-38mm-gold-black-leather-closed.jp2
diff --git a/extras/DeviceResources/apple-watch-38mm-gold-black-leather-closed.png b/extras/DeviceResources/apple-watch-38mm-gold-black-leather-closed.png
diff --git a/extras/DeviceResources/apple-watch-38mm-gold-midnight-blue-closed.jp2 b/extras/DeviceResources/apple-watch-38mm-gold-midnight-blue-closed.jp2
diff --git a/extras/DeviceResources/apple-watch-38mm-gold-midnight-blue-closed.png b/extras/DeviceResources/apple-watch-38mm-gold-midnight-blue-closed.png
diff --git a/extras/DeviceResources/apple-watch-38mm-rose-gold-black-leather-closed.jp2 b/extras/DeviceResources/apple-watch-38mm-rose-gold-black-leather-closed.jp2
diff --git a/extras/DeviceResources/apple-watch-38mm-rose-gold-black-leather-closed.png b/extras/DeviceResources/apple-watch-38mm-rose-gold-black-leather-closed.png
diff --git a/extras/DeviceResources/apple-watch-38mm-rose-gold-lavender-closed.jp2 b/extras/DeviceResources/apple-watch-38mm-rose-gold-lavender-closed.jp2
diff --git a/extras/DeviceResources/apple-watch-38mm-rose-gold-lavender-closed.png b/extras/DeviceResources/apple-watch-38mm-rose-gold-lavender-closed.png
diff --git a/extras/DeviceResources/apple-watch-38mm-sport-aluminum-blue-closed.jp2 b/extras/DeviceResources/apple-watch-38mm-sport-aluminum-blue-closed.jp2
diff --git a/extras/DeviceResources/apple-watch-38mm-sport-aluminum-blue-closed.png b/extras/DeviceResources/apple-watch-38mm-sport-aluminum-blue-closed.png
diff --git a/extras/DeviceResources/apple-watch-38mm-sport-aluminum-fog-closed.jp2 b/extras/DeviceResources/apple-watch-38mm-sport-aluminum-fog-closed.jp2
diff --git a/extras/DeviceResources/apple-watch-38mm-sport-aluminum-fog-closed.png b/extras/DeviceResources/apple-watch-38mm-sport-aluminum-fog-closed.png
diff --git a/extras/DeviceResources/apple-watch-38mm-sport-aluminum-gold-antique-white-closed.jp2 b/extras/DeviceResources/apple-watch-38mm-sport-aluminum-gold-antique-white-closed.jp2
diff --git a/...s/DeviceResources/apple-watch-38mm-sport-aluminum-gold-antique-white-closed.png b/...s/DeviceResources/apple-watch-38mm-sport-aluminum-gold-antique-white-closed.png
diff --git a/extras/DeviceResources/apple-watch-38mm-sport-aluminum-green-closed.jp2 b/extras/DeviceResources/apple-watch-38mm-sport-aluminum-green-closed.jp2
diff --git a/extras/DeviceResources/apple-watch-38mm-sport-aluminum-green-closed.png b/extras/DeviceResources/apple-watch-38mm-sport-aluminum-green-closed.png
diff --git a/extras/DeviceResources/apple-watch-38mm-sport-aluminum-red-closed.jp2 b/extras/DeviceResources/apple-watch-38mm-sport-aluminum-red-closed.jp2
diff --git a/extras/DeviceResources/apple-watch-38mm-sport-aluminum-red-closed.png b/extras/DeviceResources/apple-watch-38mm-sport-aluminum-red-closed.png
diff --git a/extras/DeviceResources/apple-watch-38mm-sport-aluminum-rose-gold-stone-closed.jp2 b/extras/DeviceResources/apple-watch-38mm-sport-aluminum-rose-gold-stone-closed.jp2
diff --git a/extras/DeviceResources/apple-watch-38mm-sport-aluminum-rose-gold-stone-closed.png b/extras/DeviceResources/apple-watch-38mm-sport-aluminum-rose-gold-stone-closed.png
diff --git a/extras/DeviceResources/apple-watch-38mm-sport-aluminum-walnut-closed.jp2 b/extras/DeviceResources/apple-watch-38mm-sport-aluminum-walnut-closed.jp2
diff --git a/extras/DeviceResources/apple-watch-38mm-sport-aluminum-walnut-closed.png b/extras/DeviceResources/apple-watch-38mm-sport-aluminum-walnut-closed.png
diff --git a/extras/DeviceResources/apple-watch-38mm-sport-aluminum-white-closed.jp2 b/extras/DeviceResources/apple-watch-38mm-sport-aluminum-white-closed.jp2
diff --git a/extras/DeviceResources/apple-watch-38mm-sport-aluminum-white-closed.png b/extras/DeviceResources/apple-watch-38mm-sport-aluminum-white-closed.png
diff --git a/extras/DeviceResources/apple-watch-38mm-sport-space-gray-black-closed.jp2 b/extras/DeviceResources/apple-watch-38mm-sport-space-gray-black-closed.jp2
diff --git a/extras/DeviceResources/apple-watch-38mm-sport-space-gray-black-closed.png b/extras/DeviceResources/apple-watch-38mm-sport-space-gray-black-closed.png
diff --git a/extras/DeviceResources/apple-watch-38mm-stainless-steel-black-leather-closed.jp2 b/extras/DeviceResources/apple-watch-38mm-stainless-steel-black-leather-closed.jp2
diff --git a/extras/DeviceResources/apple-watch-38mm-stainless-steel-black-leather-closed.png b/extras/DeviceResources/apple-watch-38mm-stainless-steel-black-leather-closed.png
diff --git a/extras/DeviceResources/apple-watch-42mm-black-steel-black-closed.jp2 b/extras/DeviceResources/apple-watch-42mm-black-steel-black-closed.jp2
diff --git a/extras/DeviceResources/apple-watch-42mm-black-steel-black-closed.png b/extras/DeviceResources/apple-watch-42mm-black-steel-black-closed.png
diff --git a/extras/DeviceResources/apple-watch-42mm-gold-black-leather-closed.jp2 b/extras/DeviceResources/apple-watch-42mm-gold-black-leather-closed.jp2
diff --git a/extras/DeviceResources/apple-watch-42mm-gold-black-leather-closed.png b/extras/DeviceResources/apple-watch-42mm-gold-black-leather-closed.png
diff --git a/extras/DeviceResources/apple-watch-42mm-gold-midnight-blue-closed.jp2 b/extras/DeviceResources/apple-watch-42mm-gold-midnight-blue-closed.jp2
diff --git a/extras/DeviceResources/apple-watch-42mm-gold-midnight-blue-closed.png b/extras/DeviceResources/apple-watch-42mm-gold-midnight-blue-closed.png
diff --git a/extras/DeviceResources/apple-watch-42mm-rose-gold-black-leather-closed.jp2 b/extras/DeviceResources/apple-watch-42mm-rose-gold-black-leather-closed.jp2
diff --git a/extras/DeviceResources/apple-watch-42mm-rose-gold-black-leather-closed.png b/extras/DeviceResources/apple-watch-42mm-rose-gold-black-leather-closed.png
diff --git a/extras/DeviceResources/apple-watch-42mm-rose-gold-lavender-closed.jp2 b/extras/DeviceResources/apple-watch-42mm-rose-gold-lavender-closed.jp2
diff --git a/extras/DeviceResources/apple-watch-42mm-rose-gold-lavender-closed.png b/extras/DeviceResources/apple-watch-42mm-rose-gold-lavender-closed.png
diff --git a/extras/DeviceResources/apple-watch-42mm-sport-aluminum-blue-closed.jp2 b/extras/DeviceResources/apple-watch-42mm-sport-aluminum-blue-closed.jp2
diff --git a/extras/DeviceResources/apple-watch-42mm-sport-aluminum-blue-closed.png b/extras/DeviceResources/apple-watch-42mm-sport-aluminum-blue-closed.png
diff --git a/extras/DeviceResources/apple-watch-42mm-sport-aluminum-fog-closed.jp2 b/extras/DeviceResources/apple-watch-42mm-sport-aluminum-fog-closed.jp2
diff --git a/extras/DeviceResources/apple-watch-42mm-sport-aluminum-fog-closed.png b/extras/DeviceResources/apple-watch-42mm-sport-aluminum-fog-closed.png