From 111db01500a84739e32ce80e5a86d1f0b90e5cf0 Mon Sep 17 00:00:00 2001 From: Gunther Brunner Date: Mon, 12 May 2014 15:12:23 +0900 Subject: [PATCH] Transition for resizing was being overriden by rotation transition. --- .../control-panes/device-control/device-control.css | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/res/app/control-panes/device-control/device-control.css b/res/app/control-panes/device-control/device-control.css index 7333f202..860831df 100644 --- a/res/app/control-panes/device-control/device-control.css +++ b/res/app/control-panes/device-control/device-control.css @@ -1,7 +1,9 @@ device-screen canvas { - transition: width 100ms linear; - -ms-transform: width 100ms linear; - -webkit-transform: width 100ms linear; + transition: width 100ms linear, -webkit-transform 250ms ease-in-out; + -webkit-transform-origin: 50% 50%; + transform-origin: 50% 50%; + -webkit-transform: width, rotate(0deg); + transform: width, rotate(0deg); } device-screen { @@ -11,9 +13,6 @@ device-screen { } device-screen canvas { - -webkit-transition: -webkit-transform 250ms ease-in-out; - -webkit-transform-origin: 50% 50%; - -webkit-transform: rotate(0deg); position: absolute; margin: auto; top: 0;