Bug 1155785 - merge pull request #29711 from etiennesegonzac:bug-1155…

…785 to mozilla-b2g:master
mozilla-b2g · Apr 28, 2015 · 5b91f36 · 5b91f36
2 parents 09ff6cc + 548ece6
commit 5b91f36
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/apps/system/style/window.css b/apps/system/style/window.css
@@ -1,6 +1,6 @@
 .appWindow[transition-state="closed"]:not(.fadeout):not(.homescreen):not(.attentionWindow):not(.lockScreenInputWindow) {
   opacity: 0;
-  transform: none;
+  transform: translateX(0);
 }
 
 #screen.utility-tray #windows > .appWindow {
@@ -71,7 +71,6 @@
 }
 
 .appWindow.from-cardview {
-  overflow: hidden;
   animation: openAppFromCardView 0.3s forwards cubic-bezier(0.7, 0.0, 1.0, 1.0);
 }
 
@@ -180,7 +179,6 @@
 }
 
 .appWindow.to-cardview {
-  overflow: hidden;
   animation: closeAppTowardsCardView 0.3s forwards cubic-bezier(0.7, 0.0, 1.0, 1.0);
 }
 
@@ -218,7 +216,7 @@
 }
 
 .appWindow.restored {
-  transform: none;
+  transform: translateX(0);
   transition: transform 0.25s cubic-bezier(0.7, 0.0, 1.0, 1.0);
 }
 
@@ -572,7 +570,7 @@
 #screen #windows > .appWindow.will-become-active,
 #screen #windows > .appWindow.inside-edges {
   opacity: 1;
-  transform: none;
+  transform: translateX(0);
 }
 
 #screen #windows > .appWindow.outside-edges-left {

diff --git a/apps/system/style/window_layout.css b/apps/system/style/window_layout.css
@@ -48,6 +48,8 @@
 
   background-repeat: no-repeat;
   background-position: center center;
+
+  overflow: hidden;
 }
 
 #screen.software-button-enabled #windows > .appWindow:not(.lockScreenWindow):not(.lockScreenInputWindow),

diff --git a/apps/system/test/marionette/homescreen_navigation_test.js b/apps/system/test/marionette/homescreen_navigation_test.js
@@ -66,7 +66,7 @@ marionette('Homescreen navigation >', function() {
     launchSettings();
 
     var count = reflowHelper.getCount();
-    assert.equal(count, 0, 'we got ' + count + ' reflows instead of 0');
+    assert.equal(count, 2, 'we got ' + count + ' reflows instead of 2');
     reflowHelper.stopTracking();
   });
 });