Permalink
Browse files

Merge branch 'feature/facebookDevices'

  • Loading branch information...
J.P.P Treub
J.P.P Treub committed Feb 17, 2016
2 parents 5c72995 + e785bd2 commit 195bc4d282366fdb3d09e201168e5390315c0582
Showing with 2,618 additions and 248 deletions.
  1. 0 extras/DevServer.framer/Icon
  2. BIN extras/DeviceResources/apple-ipad-air-2-gold.jp2
  3. BIN extras/DeviceResources/apple-ipad-air-2-gold.png
  4. BIN extras/DeviceResources/apple-ipad-air-2-silver.jp2
  5. BIN extras/DeviceResources/apple-ipad-air-2-silver.png
  6. BIN extras/DeviceResources/apple-ipad-air-2-space-gray.jp2
  7. BIN extras/DeviceResources/apple-ipad-air-2-space-gray.png
  8. BIN extras/DeviceResources/apple-ipad-mini-4-gold.jp2
  9. BIN extras/DeviceResources/apple-ipad-mini-4-gold.png
  10. BIN extras/DeviceResources/apple-ipad-mini-4-silver.jp2
  11. BIN extras/DeviceResources/apple-ipad-mini-4-silver.png
  12. BIN extras/DeviceResources/apple-ipad-mini-4-space-gray.jp2
  13. BIN extras/DeviceResources/apple-ipad-mini-4-space-gray.png
  14. BIN extras/DeviceResources/apple-ipad-pro-gold.jp2
  15. BIN extras/DeviceResources/apple-ipad-pro-gold.png
  16. BIN extras/DeviceResources/apple-ipad-pro-silver.jp2
  17. BIN extras/DeviceResources/apple-ipad-pro-silver.png
  18. BIN extras/DeviceResources/apple-ipad-pro-space-gray.jp2
  19. BIN extras/DeviceResources/apple-ipad-pro-space-gray.png
  20. BIN extras/DeviceResources/apple-iphone-5c-blue.jp2
  21. BIN extras/DeviceResources/apple-iphone-5c-blue.png
  22. BIN extras/DeviceResources/apple-iphone-5c-green.jp2
  23. BIN extras/DeviceResources/apple-iphone-5c-green.png
  24. BIN extras/DeviceResources/apple-iphone-5c-red.jp2
  25. BIN extras/DeviceResources/apple-iphone-5c-red.png
  26. BIN extras/DeviceResources/apple-iphone-5c-white.jp2
  27. BIN extras/DeviceResources/apple-iphone-5c-white.png
  28. BIN extras/DeviceResources/apple-iphone-5c-yellow.jp2
  29. BIN extras/DeviceResources/apple-iphone-5c-yellow.png
  30. BIN extras/DeviceResources/apple-iphone-5s-gold.jp2
  31. BIN extras/DeviceResources/apple-iphone-5s-gold.png
  32. BIN extras/DeviceResources/apple-iphone-5s-silver.jp2
  33. BIN extras/DeviceResources/apple-iphone-5s-silver.png
  34. BIN extras/DeviceResources/apple-iphone-5s-space-gray.jp2
  35. BIN extras/DeviceResources/apple-iphone-5s-space-gray.png
  36. BIN extras/DeviceResources/apple-iphone-6s-gold.jp2
  37. BIN extras/DeviceResources/apple-iphone-6s-gold.png
  38. BIN extras/DeviceResources/apple-iphone-6s-plus-gold.jp2
  39. BIN extras/DeviceResources/apple-iphone-6s-plus-gold.png
  40. BIN extras/DeviceResources/apple-iphone-6s-plus-rose-gold.jp2
  41. BIN extras/DeviceResources/apple-iphone-6s-plus-rose-gold.png
  42. BIN extras/DeviceResources/apple-iphone-6s-plus-silver.jp2
  43. BIN extras/DeviceResources/apple-iphone-6s-plus-silver.png
  44. BIN extras/DeviceResources/apple-iphone-6s-plus-space-gray.jp2
  45. BIN extras/DeviceResources/apple-iphone-6s-plus-space-gray.png
  46. BIN extras/DeviceResources/apple-iphone-6s-rose-gold.jp2
  47. BIN extras/DeviceResources/apple-iphone-6s-rose-gold.png
  48. BIN extras/DeviceResources/apple-iphone-6s-silver.jp2
  49. BIN extras/DeviceResources/apple-iphone-6s-silver.png
  50. BIN extras/DeviceResources/apple-iphone-6s-space-gray.jp2
  51. BIN extras/DeviceResources/apple-iphone-6s-space-gray.png
  52. BIN extras/DeviceResources/apple-watch-38mm-black-steel-black-closed.jp2
  53. BIN extras/DeviceResources/apple-watch-38mm-black-steel-black-closed.png
  54. BIN extras/DeviceResources/apple-watch-38mm-gold-black-leather-closed.jp2
  55. BIN extras/DeviceResources/apple-watch-38mm-gold-black-leather-closed.png
  56. BIN extras/DeviceResources/apple-watch-38mm-gold-midnight-blue-closed.jp2
  57. BIN extras/DeviceResources/apple-watch-38mm-gold-midnight-blue-closed.png
  58. BIN extras/DeviceResources/apple-watch-38mm-rose-gold-black-leather-closed.jp2
  59. BIN extras/DeviceResources/apple-watch-38mm-rose-gold-black-leather-closed.png
  60. BIN extras/DeviceResources/apple-watch-38mm-rose-gold-lavender-closed.jp2
  61. BIN extras/DeviceResources/apple-watch-38mm-rose-gold-lavender-closed.png
  62. BIN extras/DeviceResources/apple-watch-38mm-sport-aluminum-blue-closed.jp2
  63. BIN extras/DeviceResources/apple-watch-38mm-sport-aluminum-blue-closed.png
  64. BIN extras/DeviceResources/apple-watch-38mm-sport-aluminum-fog-closed.jp2
  65. BIN extras/DeviceResources/apple-watch-38mm-sport-aluminum-fog-closed.png
  66. BIN extras/DeviceResources/apple-watch-38mm-sport-aluminum-gold-antique-white-closed.jp2
  67. BIN extras/DeviceResources/apple-watch-38mm-sport-aluminum-gold-antique-white-closed.png
  68. BIN extras/DeviceResources/apple-watch-38mm-sport-aluminum-green-closed.jp2
  69. BIN extras/DeviceResources/apple-watch-38mm-sport-aluminum-green-closed.png
  70. BIN extras/DeviceResources/apple-watch-38mm-sport-aluminum-red-closed.jp2
  71. BIN extras/DeviceResources/apple-watch-38mm-sport-aluminum-red-closed.png
  72. BIN extras/DeviceResources/apple-watch-38mm-sport-aluminum-rose-gold-stone-closed.jp2
  73. BIN extras/DeviceResources/apple-watch-38mm-sport-aluminum-rose-gold-stone-closed.png
  74. BIN extras/DeviceResources/apple-watch-38mm-sport-aluminum-walnut-closed.jp2
  75. BIN extras/DeviceResources/apple-watch-38mm-sport-aluminum-walnut-closed.png
  76. BIN extras/DeviceResources/apple-watch-38mm-sport-aluminum-white-closed.jp2
  77. BIN extras/DeviceResources/apple-watch-38mm-sport-aluminum-white-closed.png
  78. BIN extras/DeviceResources/apple-watch-38mm-sport-space-gray-black-closed.jp2
  79. BIN extras/DeviceResources/apple-watch-38mm-sport-space-gray-black-closed.png
  80. BIN extras/DeviceResources/apple-watch-38mm-stainless-steel-black-leather-closed.jp2
  81. BIN extras/DeviceResources/apple-watch-38mm-stainless-steel-black-leather-closed.png
  82. BIN extras/DeviceResources/apple-watch-42mm-black-steel-black-closed.jp2
  83. BIN extras/DeviceResources/apple-watch-42mm-black-steel-black-closed.png
  84. BIN extras/DeviceResources/apple-watch-42mm-gold-black-leather-closed.jp2
  85. BIN extras/DeviceResources/apple-watch-42mm-gold-black-leather-closed.png
  86. BIN extras/DeviceResources/apple-watch-42mm-gold-midnight-blue-closed.jp2
  87. BIN extras/DeviceResources/apple-watch-42mm-gold-midnight-blue-closed.png
  88. BIN extras/DeviceResources/apple-watch-42mm-rose-gold-black-leather-closed.jp2
  89. BIN extras/DeviceResources/apple-watch-42mm-rose-gold-black-leather-closed.png
  90. BIN extras/DeviceResources/apple-watch-42mm-rose-gold-lavender-closed.jp2
  91. BIN extras/DeviceResources/apple-watch-42mm-rose-gold-lavender-closed.png
  92. BIN extras/DeviceResources/apple-watch-42mm-sport-aluminum-blue-closed.jp2
  93. BIN extras/DeviceResources/apple-watch-42mm-sport-aluminum-blue-closed.png
  94. BIN extras/DeviceResources/apple-watch-42mm-sport-aluminum-fog-closed.jp2
  95. BIN extras/DeviceResources/apple-watch-42mm-sport-aluminum-fog-closed.png
  96. BIN extras/DeviceResources/apple-watch-42mm-sport-aluminum-gold-antique-white-closed.jp2
  97. BIN extras/DeviceResources/apple-watch-42mm-sport-aluminum-gold-antique-white-closed.png
  98. BIN extras/DeviceResources/apple-watch-42mm-sport-aluminum-green-closed.jp2
  99. BIN extras/DeviceResources/apple-watch-42mm-sport-aluminum-green-closed.png
  100. BIN extras/DeviceResources/apple-watch-42mm-sport-aluminum-red-closed.jp2
  101. BIN extras/DeviceResources/apple-watch-42mm-sport-aluminum-red-closed.png
  102. BIN extras/DeviceResources/apple-watch-42mm-sport-aluminum-rose-gold-stone-closed.jp2
  103. BIN extras/DeviceResources/apple-watch-42mm-sport-aluminum-rose-gold-stone-closed.png
  104. BIN extras/DeviceResources/apple-watch-42mm-sport-aluminum-walnut-closed.jp2
  105. BIN extras/DeviceResources/apple-watch-42mm-sport-aluminum-walnut-closed.png
  106. BIN extras/DeviceResources/apple-watch-42mm-sport-aluminum-white-closed.jp2
  107. BIN extras/DeviceResources/apple-watch-42mm-sport-aluminum-white-closed.png
  108. BIN extras/DeviceResources/apple-watch-42mm-sport-space-gray-black-closed.jp2
  109. BIN extras/DeviceResources/apple-watch-42mm-sport-space-gray-black-closed.png
  110. BIN extras/DeviceResources/apple-watch-42mm-stainless-steel-black-leather-closed.jp2
  111. BIN extras/DeviceResources/apple-watch-42mm-stainless-steel-black-leather-closed.png
  112. BIN extras/DeviceResources/apple-watch-edition.jp2
  113. BIN extras/DeviceResources/apple-watch-sport.jp2
  114. BIN extras/DeviceResources/apple-watch.jp2
  115. BIN extras/DeviceResources/applewatch-38-black-bracelet.jp2
  116. BIN extras/DeviceResources/applewatch-38-steel-bracelet.jp2
  117. BIN extras/DeviceResources/applewatch-42-black-bracelet.jp2
  118. BIN extras/DeviceResources/applewatch-42-steel-bracelet.jp2
  119. BIN extras/DeviceResources/applewatchedition-38-gold-buckle-blue.jp2
  120. BIN extras/DeviceResources/applewatchedition-38-gold-buckle-gray.jp2
  121. BIN extras/DeviceResources/applewatchedition-38-gold-buckle-red.jp2
  122. BIN extras/DeviceResources/applewatchedition-38-gold-sportband-black.jp2
  123. BIN extras/DeviceResources/applewatchedition-38-gold-sportband-white.jp2
  124. BIN extras/DeviceResources/applewatchedition-42-gold-buckle-blue.jp2
  125. BIN extras/DeviceResources/applewatchedition-42-gold-buckle-gray.jp2
  126. BIN extras/DeviceResources/applewatchedition-42-gold-buckle-red.jp2
  127. BIN extras/DeviceResources/applewatchedition-42-gold-sportband-black.jp2
  128. BIN extras/DeviceResources/applewatchedition-42-gold-sportband-white.jp2
  129. BIN extras/DeviceResources/applewatchsport-38-aluminum-sportband-black.jp2
  130. BIN extras/DeviceResources/applewatchsport-38-aluminum-sportband-blue.jp2
  131. BIN extras/DeviceResources/applewatchsport-38-aluminum-sportband-green.jp2
  132. BIN extras/DeviceResources/applewatchsport-38-aluminum-sportband-pink.jp2
  133. BIN extras/DeviceResources/applewatchsport-38-aluminum-sportband-white.jp2
  134. BIN extras/DeviceResources/applewatchsport-42-aluminum-sportband-black.jp2
  135. BIN extras/DeviceResources/applewatchsport-42-aluminum-sportband-blue.jp2
  136. BIN extras/DeviceResources/applewatchsport-42-aluminum-sportband-green.jp2
  137. BIN extras/DeviceResources/applewatchsport-42-aluminum-sportband-pink.jp2
  138. BIN extras/DeviceResources/applewatchsport-42-aluminum-sportband-white.jp2
  139. BIN extras/DeviceResources/google-nexus-4.jp2
  140. BIN extras/DeviceResources/google-nexus-4.png
  141. BIN extras/DeviceResources/google-nexus-5x.jp2
  142. BIN extras/DeviceResources/google-nexus-5x.png
  143. BIN extras/DeviceResources/google-nexus-6p.jp2
  144. BIN extras/DeviceResources/google-nexus-6p.png
  145. BIN extras/DeviceResources/google-nexus-9.jp2
  146. BIN extras/DeviceResources/google-nexus-9.png
  147. BIN extras/DeviceResources/htc-one-a9-black.jp2
  148. BIN extras/DeviceResources/htc-one-a9-black.png
  149. BIN extras/DeviceResources/htc-one-a9-white.jp2
  150. BIN extras/DeviceResources/htc-one-a9-white.png
  151. BIN extras/DeviceResources/htc-one-m8-black.jp2
  152. BIN extras/DeviceResources/htc-one-m8-black.png
  153. BIN extras/DeviceResources/htc-one-m8-gold.jp2
  154. BIN extras/DeviceResources/htc-one-m8-gold.png
  155. BIN extras/DeviceResources/htc-one-m8-silver.jp2
  156. BIN extras/DeviceResources/htc-one-m8-silver.png
  157. BIN extras/DeviceResources/ipad-air-silver-hand.jp2
  158. BIN extras/DeviceResources/ipad-air-silver.jp2
  159. BIN extras/DeviceResources/ipad-air-spacegray-hand.jp2
  160. BIN extras/DeviceResources/ipad-air-spacegray.jp2
  161. BIN extras/DeviceResources/ipad-mini-silver-hand.jp2
  162. BIN extras/DeviceResources/ipad-mini-silver.jp2
  163. BIN extras/DeviceResources/ipad-mini-spacegray-hand.jp2
  164. BIN extras/DeviceResources/ipad-mini-spacegray.jp2
  165. BIN extras/DeviceResources/iphone-5c-blue-hand.jp2
  166. BIN extras/DeviceResources/iphone-5c-blue.jp2
  167. BIN extras/DeviceResources/iphone-5c-green-hand.jp2
  168. BIN extras/DeviceResources/iphone-5c-green.jp2
  169. BIN extras/DeviceResources/iphone-5c-pink-hand.jp2
  170. BIN extras/DeviceResources/iphone-5c-pink.jp2
  171. BIN extras/DeviceResources/iphone-5c-white-hand.jp2
  172. BIN extras/DeviceResources/iphone-5c-white.jp2
  173. BIN extras/DeviceResources/iphone-5c-yellow-hand.jp2
  174. BIN extras/DeviceResources/iphone-5c-yellow.jp2
  175. BIN extras/DeviceResources/iphone-5s-gold-hand.jp2
  176. BIN extras/DeviceResources/iphone-5s-gold.jp2
  177. BIN extras/DeviceResources/iphone-5s-silver-hand.jp2
  178. BIN extras/DeviceResources/iphone-5s-silver.jp2
  179. BIN extras/DeviceResources/iphone-5s-spacegray-hand.jp2
  180. BIN extras/DeviceResources/iphone-5s-spacegray.jp2
  181. BIN extras/DeviceResources/iphone-6-gold-hand.jp2
  182. BIN extras/DeviceResources/iphone-6-gold.jp2
  183. BIN extras/DeviceResources/iphone-6-silver-hand.jp2
  184. BIN extras/DeviceResources/iphone-6-silver.jp2
  185. BIN extras/DeviceResources/iphone-6-spacegray-hand.jp2
  186. BIN extras/DeviceResources/iphone-6-spacegray.jp2
  187. BIN extras/DeviceResources/iphone-6plus-gold-hand.jp2
  188. BIN extras/DeviceResources/iphone-6plus-gold.jp2
  189. BIN extras/DeviceResources/iphone-6plus-silver-hand.jp2
  190. BIN extras/DeviceResources/iphone-6plus-silver.jp2
  191. BIN extras/DeviceResources/iphone-6plus-spacegray-hand.jp2
  192. BIN extras/DeviceResources/iphone-6plus-spacegray.jp2
  193. BIN extras/DeviceResources/iphone-hands-1.jp2
  194. BIN extras/DeviceResources/iphone-hands-1.png
  195. BIN extras/DeviceResources/iphone-hands-2.jp2
  196. BIN extras/DeviceResources/iphone-hands-2.png
  197. BIN extras/DeviceResources/iphone6plus-gold-hand.jp2
  198. BIN extras/DeviceResources/iphone6plus-gold.jp2
  199. BIN extras/DeviceResources/iphone6plus-silver-hand.jp2
  200. BIN extras/DeviceResources/iphone6plus-silver.jp2
  201. BIN extras/DeviceResources/iphone6plus-spacegray-hand.jp2
  202. BIN extras/DeviceResources/iphone6plus-spacegray.jp2
  203. BIN extras/DeviceResources/microsoft-lumia-950-black.jp2
  204. BIN extras/DeviceResources/microsoft-lumia-950-black.png
  205. BIN extras/DeviceResources/microsoft-lumia-950-white.jp2
  206. BIN extras/DeviceResources/microsoft-lumia-950-white.png
  207. BIN extras/DeviceResources/nexus-5-black-hand.jp2
  208. BIN extras/DeviceResources/nexus-5-black.jp2
  209. BIN extras/DeviceResources/nexus-9.jp2
  210. BIN extras/DeviceResources/samsung-galaxy-note-5-black.jp2
  211. BIN extras/DeviceResources/samsung-galaxy-note-5-black.png
  212. BIN extras/DeviceResources/samsung-galaxy-note-5-gold.jp2
  213. BIN extras/DeviceResources/samsung-galaxy-note-5-gold.png
  214. BIN extras/DeviceResources/samsung-galaxy-note-5-pink.jp2
  215. BIN extras/DeviceResources/samsung-galaxy-note-5-pink.png
  216. BIN extras/DeviceResources/samsung-galaxy-note-5-silver-titanium.jp2
  217. BIN extras/DeviceResources/samsung-galaxy-note-5-silver-titanium.png
  218. BIN extras/DeviceResources/samsung-galaxy-note-5-white.jp2
  219. BIN extras/DeviceResources/samsung-galaxy-note-5-white.png
  220. +1 −1 extras/Studio.framer/framer/version
  221. 0 extras/Studio.framer/modules/.gitkeep
  222. +575 −237 framer/Components/DeviceComponent.coffee
  223. +0 −1 framer/Config.coffee
  224. +4 −1 framer/Context.coffee
  225. +3 −2 framer/Defaults.coffee
  226. +2 −2 framer/Screen.coffee
  227. +16 −0 framer/Utils.coffee
  228. +27 −0 scripts/framerDeviceNaming.workflow/Contents/Info.plist
  229. BIN scripts/framerDeviceNaming.workflow/Contents/QuickLook/Preview.png
  230. +1,979 −0 scripts/framerDeviceNaming.workflow/Contents/document.wflow
  231. +1 −1 scripts/optimize.py
  232. +10 −3 test/tests/DeviceComponentTest.coffee
No changes.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
View
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
View
Diff not rendered.
Binary file not shown.
View
Diff not rendered.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
@@ -1 +1 @@
1
2
No changes.
Oops, something went wrong.

0 comments on commit 195bc4d

Please sign in to comment.