Permalink
Browse files

Merge pull request #407 from koenbok/feature/DesktopDevices

Support for new notebook and desktop devices
  • Loading branch information...
koenbok committed Aug 29, 2016
2 parents f87b3ab + 566aa25 commit 5093eeddf4aab71a86970782f8c6c9c440e3ce69
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,12 +1,2 @@
Device.customize
deviceType: Device.Type.Tablet
screenWidth: 720
screenHeight: 1024
deviceImage: "http://f.cl.ly/items/001L0v3c1f120t0p2z24/custom.png"
deviceImageWidth: 800
deviceImageHeight: 1214
Framer.Device.deviceType = "dell-xps"
Screen.backgroundColor = "28affa"
@@ -6,7 +6,7 @@
"sharedPrototype" : 1,
"contentScale" : 1,
"deviceType" : "custom",
"selectedHand" : "iphone-hands-1",
"selectedHand" : "",
"updateDelay" : 0.3,
"deviceScale" : "fit",
"foldedCodeRanges" : [
@@ -859,6 +859,46 @@ AppleWatch38BlackLeatherDevice =
screenHeight: 340
minStudioVersion: newDeviceMinVersion
AppleMacBook =
deviceImageWidth: 3084
deviceImageHeight: 1860
deviceImageCompression: true
screenWidth: 2304
screenHeight: 1440
minStudioVersion: newDeviceMinVersion
AppleMacBookAir =
deviceImageWidth: 2000
deviceImageHeight: 1220
deviceImageCompression: true
screenWidth: 1440
screenHeight: 900
minStudioVersion: newDeviceMinVersion
AppleMacBookPro =
deviceImageWidth: 3820
deviceImageHeight: 2320
deviceImageCompression: true
screenWidth: 2880
screenHeight: 1800
minStudioVersion: newDeviceMinVersion
AppleIMac =
deviceImageWidth: 2800
deviceImageHeight: 2940
deviceImageCompression: true
screenWidth: 2560
screenHeight: 1440
minStudioVersion: newDeviceMinVersion
DellXPS =
deviceImageWidth: 5200
deviceImageHeight: 3040
deviceImageCompression: true
screenWidth: 3840
screenHeight: 2160
minStudioVersion: newDeviceMinVersion
###########################################################################
# OLD DEVICE CONFIGURATIONS
@@ -1115,7 +1155,16 @@ Devices =
"samsung-galaxy-note-5-silver-titanium": _.clone(SamsungGalaxyNote5BaseDevice)
"samsung-galaxy-note-5-white": _.clone(SamsungGalaxyNote5BaseDevice)
# Desktop Browser
# Notebooks
"apple-macbook": _.clone(AppleMacBook)
"apple-macbook-air": _.clone(AppleMacBookAir)
"apple-macbook-pro": _.clone(AppleMacBookPro)
"dell-xps": _.clone(DellXPS)
# Desktops
"apple-imac": _.clone(AppleIMac)
# OLD DEVICES
"desktop-safari-1024-600":
deviceType: "browser"
name: "Desktop Safari 1024 x 600"
@@ -1144,8 +1193,6 @@ Devices =
deviceImageCompression: true
backgroundColor: "white"
# OLD DEVICES
# iPhone 6
"iphone-6-spacegray": _.clone(old_iPhone6BaseDevice)
"iphone-6-spacegray-hand": _.clone(old_iPhone6BaseDeviceHand)

0 comments on commit 5093eed

Please sign in to comment.