From e498d4476d4f007faddb05a1b2f331c6685eb3fa Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Fri, 30 Sep 2016 14:55:04 -0700
Subject: [PATCH] Fix some Quicksand bugs

Summary: Packages AppSearch, fixes body color, moves Differential filetree into differential package.

Test Plan: Enable quicksand. Navigate home -> differential -> diff.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D16641
---
 resources/celerity/map.php                                 | 7 ++++---
 resources/celerity/packages.php                            | 3 ++-
 .../controller/PhabricatorApplicationSearchController.php  | 6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 45043f52bc..78ec532eef 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,10 +9,10 @@ return array(
   'names' => array(
     'conpherence.pkg.css' => 'b1547973',
     'conpherence.pkg.js' => '11f3e07e',
-    'core.pkg.css' => 'b6cbe7ca',
+    'core.pkg.css' => 'cfc3eabe',
     'core.pkg.js' => '975d6a27',
     'darkconsole.pkg.js' => 'e7393ebb',
-    'differential.pkg.css' => '3fb7f532',
+    'differential.pkg.css' => 'e1d704ce',
     'differential.pkg.js' => '634399e9',
     'diffusion.pkg.css' => '91c5d3a6',
     'diffusion.pkg.js' => '84c8f8fd',
@@ -2332,6 +2332,7 @@ return array(
       'aphront-tokenizer-control-css',
       'aphront-typeahead-control-css',
       'aphront-list-filter-view-css',
+      'application-search-view-css',
       'phabricator-remarkup-css',
       'syntax-highlighting-css',
       'syntax-default-css',
@@ -2344,7 +2345,6 @@ return array(
       'phabricator-notification-menu-css',
       'lightbox-attachment-css',
       'phui-header-view-css',
-      'phabricator-filetree-view-css',
       'phabricator-nav-view-css',
       'phui-basic-nav-view-css',
       'phui-crumbs-view-css',
@@ -2479,6 +2479,7 @@ return array(
       'phabricator-content-source-view-css',
       'inline-comment-summary-css',
       'phui-inline-comment-view-css',
+      'phabricator-filetree-view-css',
     ),
     'differential.pkg.js' => array(
       'phabricator-drag-and-drop-file-upload',
diff --git a/resources/celerity/packages.php b/resources/celerity/packages.php
index 6e553a8c6e..a3a2a6132a 100644
--- a/resources/celerity/packages.php
+++ b/resources/celerity/packages.php
@@ -98,6 +98,7 @@ return array(
     'aphront-tokenizer-control-css',
     'aphront-typeahead-control-css',
     'aphront-list-filter-view-css',
+    'application-search-view-css',
 
     'phabricator-remarkup-css',
     'syntax-highlighting-css',
@@ -112,7 +113,6 @@ return array(
     'phabricator-notification-menu-css',
     'lightbox-attachment-css',
     'phui-header-view-css',
-    'phabricator-filetree-view-css',
     'phabricator-nav-view-css',
     'phui-basic-nav-view-css',
     'phui-crumbs-view-css',
@@ -180,6 +180,7 @@ return array(
     'phabricator-content-source-view-css',
     'inline-comment-summary-css',
     'phui-inline-comment-view-css',
+    'phabricator-filetree-view-css',
   ),
   'differential.pkg.js' => array(
     'phabricator-drag-and-drop-file-upload',
diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php
index a463e50471..d36d279c55 100644
--- a/src/applications/search/controller/PhabricatorApplicationSearchController.php
+++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php
@@ -320,6 +320,7 @@ final class PhabricatorApplicationSearchController
       $crumbs->addTextCrumb($title);
     }
 
+    $nav->addClass('application-search-view');
     require_celerity_resource('application-search-view-css');
 
     return $this->newPage()
@@ -327,8 +328,7 @@ final class PhabricatorApplicationSearchController
       ->setTitle(pht('Query: %s', $title))
       ->setCrumbs($crumbs)
       ->setNavigation($nav)
-      ->appendChild($body)
-      ->addClass('application-search-view');
+      ->appendChild($body);
   }
 
   private function processEditRequest() {
@@ -419,6 +419,7 @@ final class PhabricatorApplicationSearchController
       ->setObjectList($list)
       ->addClass('application-search-results');
 
+    $nav->addClass('application-search-view');
     require_celerity_resource('application-search-view-css');
 
     return $this->newPage()
@@ -426,7 +427,6 @@ final class PhabricatorApplicationSearchController
       ->setTitle(pht('Saved Queries'))
       ->setCrumbs($crumbs)
       ->setNavigation($nav)
-      ->addClass('application-search-view')
       ->appendChild($box);
   }