From 32803ae1ad538ce4997d3646c13061be3a7a6f8c Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Thu, 17 Oct 2013 20:41:13 -0700
Subject: [PATCH] Back out dc42a14663fe (bug 927226) for either causing or
 landing on bustage CLOSED TREE

---
 .../base/content/startui/BookmarksView.js     |  4 +--
 .../metro/base/content/startui/HistoryView.js |  2 +-
 .../base/content/startui/RemoteTabsView.js    |  4 +--
 .../base/content/startui/TopSitesView.js      |  2 +-
 browser/metro/theme/platform.css              | 28 -------------------
 browser/metro/theme/tiles.css                 |  4 ++-
 6 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/browser/metro/base/content/startui/BookmarksView.js b/browser/metro/base/content/startui/BookmarksView.js
index bb9cd41e91e..de3520638d4 100644
--- a/browser/metro/base/content/startui/BookmarksView.js
+++ b/browser/metro/base/content/startui/BookmarksView.js
@@ -142,6 +142,7 @@ BookmarksView.prototype = Util.extend(Object.create(View.prototype), {
         this._set.removeItemAt(this._set.itemCount - 1, true);
     }
     this._set.arrangeItems();
+    this._set.removeAttribute("fade");
     this._inBatch = false;
     rootNode.containerOpen = false;
   },
@@ -307,8 +308,7 @@ let BookmarksStartView = {
   init: function init() {
     this._view = new BookmarksView(this._grid, StartUI.maxResultsPerSection, Bookmarks.metroRoot, true);
     this._view.getBookmarks();
-    this._grid.removeAttribute("fade");
-},
+  },
 
   uninit: function uninit() {
     if (this._view) {
diff --git a/browser/metro/base/content/startui/HistoryView.js b/browser/metro/base/content/startui/HistoryView.js
index ec2cfc7374d..49ff84dc5c2 100644
--- a/browser/metro/base/content/startui/HistoryView.js
+++ b/browser/metro/base/content/startui/HistoryView.js
@@ -95,6 +95,7 @@ HistoryView.prototype = Util.extend(Object.create(View.prototype), {
 
     rootNode.containerOpen = false;
     this._set.arrangeItems();
+    this._set.removeAttribute("fade");
     if (this._inBatch > 0)
       this._inBatch--;
   },
@@ -299,7 +300,6 @@ let HistoryStartView = {
   init: function init() {
     this._view = new HistoryView(this._grid, StartUI.maxResultsPerSection, true);
     this._view.populateGrid();
-    this._grid.removeAttribute("fade");
   },
 
   uninit: function uninit() {
diff --git a/browser/metro/base/content/startui/RemoteTabsView.js b/browser/metro/base/content/startui/RemoteTabsView.js
index 1fbde53036b..2bf8726b596 100644
--- a/browser/metro/base/content/startui/RemoteTabsView.js
+++ b/browser/metro/base/content/startui/RemoteTabsView.js
@@ -93,6 +93,7 @@ RemoteTabsView.prototype = Util.extend(Object.create(View.prototype), {
     }
     this.setUIAccessVisible(show);
     this._set.arrangeItems();
+    this._set.removeAttribute("fade");
   },
 
   destruct: function destruct() {
@@ -115,8 +116,7 @@ let RemoteTabsStartView = {
     let vbox = document.getElementById("start-remotetabs");
     let uiList = [vbox];
     this._view = new RemoteTabsView(this._grid, uiList);
-    this._grid.removeAttribute("fade");
-},
+  },
 
   uninit: function uninit() {
     if (this._view) {
diff --git a/browser/metro/base/content/startui/TopSitesView.js b/browser/metro/base/content/startui/TopSitesView.js
index f506000b3cb..5b9d4904f95 100644
--- a/browser/metro/base/content/startui/TopSitesView.js
+++ b/browser/metro/base/content/startui/TopSitesView.js
@@ -199,6 +199,7 @@ TopSitesView.prototype = Util.extend(Object.create(View.prototype), {
       this.updateTile(slot, site);
     }
     tileset.arrangeItems();
+    tileset.removeAttribute("fade");
     this.isUpdating = false;
   },
 
@@ -298,7 +299,6 @@ let TopSitesStartView = {
       let topsitesVbox = document.getElementById("start-topsites");
       topsitesVbox.setAttribute("hidden", "true");
     }
-    this._grid.removeAttribute("fade");
   },
 
   uninit: function uninit() {
diff --git a/browser/metro/theme/platform.css b/browser/metro/theme/platform.css
index 93a80f00b52..eca835e5631 100644
--- a/browser/metro/theme/platform.css
+++ b/browser/metro/theme/platform.css
@@ -689,34 +689,6 @@ arrowbox {
   padding: 0;
 }
 
-.meta-section > richgrid {
-  opacity: 1;
-  transform: translateX(0) scale(1);
-  transition-duration: 367ms;
-  transition-delay: 500ms;
-  transition-timing-function: @metro_animation_easing@;
-}
-
-.meta-section:nth-child(2) > richgrid {
-  transition-delay: 600ms;
-}
-.meta-section:nth-child(3) > richgrid > richgrid {
-  transition-delay: 700ms;
-}
-.meta-section:nth-child(4) > richgrid > richgrid {
-  transition-delay: 800ms;
-}
-
-.meta-section > richgrid[fade] {
-  opacity: 0;
-  transform: translateX(150px) scale(.9);
-}
-
-#start-container[viewstate="snapped"] .meta-section > richgrid {
-  transition-property: none;
-}
-
-
 /* App bars ----------------------------------------------------------------- */
 
 appbar {
diff --git a/browser/metro/theme/tiles.css b/browser/metro/theme/tiles.css
index af40365ddd1..578b7dece64 100644
--- a/browser/metro/theme/tiles.css
+++ b/browser/metro/theme/tiles.css
@@ -32,7 +32,6 @@ richgrid {
   display: -moz-box;
   overflow: hidden;
 }
-
 richgrid > .richgrid-grid {
   -moz-column-width: @grid_double_column_width@; /* tile width (2x unit + gutter) */
   min-width: @grid_double_column_width@; /* min 1 column */
@@ -55,6 +54,9 @@ richgriditem {
   -moz-column-gap: 0;
   overflow:hidden;
   cursor: default;
+  transition: 300ms height ease-out,
+              150ms opacity ease-out,
+              100ms transform ease-out;
 }
 
 .tile-content {