Fix search and core icons in top nav

Summary: Fixes T3330

Test Plan: Test desktop and mobile menus in chrome and ios.

Reviewers: epriestley, btrahan

Reviewed By: epriestley

CC: aran, Korvin

Maniphest Tasks: T3330

Differential Revision: https://secure.phabricator.com/D6157

src/__celerity_resource_map__.php

@@ -3158,7 +3158,7 @@ celerity_register_resource_map(array(
   ),
   'phabricator-main-menu-view' =>
   array(
-    'uri' => '/res/0c386cc5/rsrc/css/application/base/main-menu-view.css',
+    'uri' => '/res/c9685da2/rsrc/css/application/base/main-menu-view.css',
     'type' => 'css',
     'requires' =>
     array(
@@ -4025,7 +4025,7 @@ celerity_register_resource_map(array(
 ), array(
   'packages' =>
   array(
-    'f47c276a' =>
+    '421eb3b7' =>
     array(
       'name' => 'core.pkg.css',
       'symbols' =>
@@ -4073,7 +4073,7 @@ celerity_register_resource_map(array(
         40 => 'phabricator-property-list-view-css',
         41 => 'phabricator-tag-view-css',
       ),
-      'uri' => '/res/pkg/f47c276a/core.pkg.css',
+      'uri' => '/res/pkg/421eb3b7/core.pkg.css',
       'type' => 'css',
     ),
     'f2ad0683' =>
@@ -4267,16 +4267,16 @@ celerity_register_resource_map(array(
   'reverse' =>
   array(
     'aphront-attached-file-view-css' => 'a7ca34a9',
-    'aphront-dialog-view-css' => 'f47c276a',
-    'aphront-error-view-css' => 'f47c276a',
-    'aphront-form-view-css' => 'f47c276a',
-    'aphront-list-filter-view-css' => 'f47c276a',
-    'aphront-pager-view-css' => 'f47c276a',
-    'aphront-panel-view-css' => 'f47c276a',
-    'aphront-table-view-css' => 'f47c276a',
-    'aphront-tokenizer-control-css' => 'f47c276a',
-    'aphront-tooltip-css' => 'f47c276a',
-    'aphront-typeahead-control-css' => 'f47c276a',
+    'aphront-dialog-view-css' => '421eb3b7',
+    'aphront-error-view-css' => '421eb3b7',
+    'aphront-form-view-css' => '421eb3b7',
+    'aphront-list-filter-view-css' => '421eb3b7',
+    'aphront-pager-view-css' => '421eb3b7',
+    'aphront-panel-view-css' => '421eb3b7',
+    'aphront-table-view-css' => '421eb3b7',
+    'aphront-tokenizer-control-css' => '421eb3b7',
+    'aphront-tooltip-css' => '421eb3b7',
+    'aphront-typeahead-control-css' => '421eb3b7',
     'differential-changeset-view-css' => 'dd27a69b',
     'differential-core-view-css' => 'dd27a69b',
     'differential-inline-comment-editor' => '9488bb69',
@@ -4290,7 +4290,7 @@ celerity_register_resource_map(array(
     'differential-table-of-contents-css' => 'dd27a69b',
     'diffusion-commit-view-css' => 'c8ce2d88',
     'diffusion-icons-css' => 'c8ce2d88',
-    'global-drag-and-drop-css' => 'f47c276a',
+    'global-drag-and-drop-css' => '421eb3b7',
     'inline-comment-summary-css' => 'dd27a69b',
     'javelin-aphlict' => 'f2ad0683',
     'javelin-behavior' => 'a9f14d76',
@@ -4364,55 +4364,55 @@ celerity_register_resource_map(array(
     'javelin-util' => 'a9f14d76',
     'javelin-vector' => 'a9f14d76',
     'javelin-workflow' => 'a9f14d76',
-    'lightbox-attachment-css' => 'f47c276a',
+    'lightbox-attachment-css' => '421eb3b7',
     'maniphest-task-summary-css' => 'a7ca34a9',
     'maniphest-transaction-detail-css' => 'a7ca34a9',
-    'phabricator-action-list-view-css' => 'f47c276a',
-    'phabricator-application-launch-view-css' => 'f47c276a',
+    'phabricator-action-list-view-css' => '421eb3b7',
+    'phabricator-application-launch-view-css' => '421eb3b7',
     'phabricator-busy' => 'f2ad0683',
     'phabricator-content-source-view-css' => 'dd27a69b',
-    'phabricator-core-buttons-css' => 'f47c276a',
-    'phabricator-core-css' => 'f47c276a',
-    'phabricator-crumbs-view-css' => 'f47c276a',
+    'phabricator-core-buttons-css' => '421eb3b7',
+    'phabricator-core-css' => '421eb3b7',
+    'phabricator-crumbs-view-css' => '421eb3b7',
     'phabricator-drag-and-drop-file-upload' => '9488bb69',
     'phabricator-dropdown-menu' => 'f2ad0683',
     'phabricator-file-upload' => 'f2ad0683',
-    'phabricator-filetree-view-css' => 'f47c276a',
-    'phabricator-flag-css' => 'f47c276a',
-    'phabricator-form-view-css' => 'f47c276a',
-    'phabricator-header-view-css' => 'f47c276a',
+    'phabricator-filetree-view-css' => '421eb3b7',
+    'phabricator-flag-css' => '421eb3b7',
+    'phabricator-form-view-css' => '421eb3b7',
+    'phabricator-header-view-css' => '421eb3b7',
     'phabricator-hovercard' => 'f2ad0683',
-    'phabricator-jump-nav' => 'f47c276a',
+    'phabricator-jump-nav' => '421eb3b7',
     'phabricator-keyboard-shortcut' => 'f2ad0683',
     'phabricator-keyboard-shortcut-manager' => 'f2ad0683',
-    'phabricator-main-menu-view' => 'f47c276a',
+    'phabricator-main-menu-view' => '421eb3b7',
     'phabricator-menu-item' => 'f2ad0683',
-    'phabricator-nav-view-css' => 'f47c276a',
+    'phabricator-nav-view-css' => '421eb3b7',
     'phabricator-notification' => 'f2ad0683',
-    'phabricator-notification-css' => 'f47c276a',
-    'phabricator-notification-menu-css' => 'f47c276a',
-    'phabricator-object-item-list-view-css' => 'f47c276a',
+    'phabricator-notification-css' => '421eb3b7',
+    'phabricator-notification-menu-css' => '421eb3b7',
+    'phabricator-object-item-list-view-css' => '421eb3b7',
     'phabricator-object-selector-css' => 'dd27a69b',
     'phabricator-phtize' => 'f2ad0683',
     'phabricator-prefab' => 'f2ad0683',
     'phabricator-project-tag-css' => 'a7ca34a9',
-    'phabricator-property-list-view-css' => 'f47c276a',
-    'phabricator-remarkup-css' => 'f47c276a',
+    'phabricator-property-list-view-css' => '421eb3b7',
+    'phabricator-remarkup-css' => '421eb3b7',
     'phabricator-shaped-request' => '9488bb69',
-    'phabricator-side-menu-view-css' => 'f47c276a',
-    'phabricator-standard-page-view' => 'f47c276a',
-    'phabricator-tag-view-css' => 'f47c276a',
+    'phabricator-side-menu-view-css' => '421eb3b7',
+    'phabricator-standard-page-view' => '421eb3b7',
+    'phabricator-tag-view-css' => '421eb3b7',
     'phabricator-textareautils' => 'f2ad0683',
     'phabricator-tooltip' => 'f2ad0683',
-    'phabricator-transaction-view-css' => 'f47c276a',
-    'phabricator-zindex-css' => 'f47c276a',
-    'phui-form-css' => 'f47c276a',
-    'phui-icon-view-css' => 'f47c276a',
-    'spacing-css' => 'f47c276a',
-    'sprite-apps-large-css' => 'f47c276a',
-    'sprite-gradient-css' => 'f47c276a',
-    'sprite-icons-css' => 'f47c276a',
-    'sprite-menu-css' => 'f47c276a',
-    'syntax-highlighting-css' => 'f47c276a',
+    'phabricator-transaction-view-css' => '421eb3b7',
+    'phabricator-zindex-css' => '421eb3b7',
+    'phui-form-css' => '421eb3b7',
+    'phui-icon-view-css' => '421eb3b7',
+    'spacing-css' => '421eb3b7',
+    'sprite-apps-large-css' => '421eb3b7',
+    'sprite-gradient-css' => '421eb3b7',
+    'sprite-icons-css' => '421eb3b7',
+    'sprite-menu-css' => '421eb3b7',
+    'syntax-highlighting-css' => '421eb3b7',
   ),
 ));

src/applications/diviner/application/PhabricatorApplicationDiviner.php

@@ -53,6 +53,7 @@ final class PhabricatorApplicationDiviner extends PhabricatorApplication {
     if ($application && $application->getHelpURI()) {
       $item = new PHUIListItemView();
       $item->setName(pht('%s Help', $application->getName()));
+      $item->addClass('core-menu-item');
       $item->setIcon('help');
       $item->setHref($application->getHelpURI());
       $items[] = $item;

src/applications/people/application/PhabricatorApplicationPeople.php

@@ -66,7 +66,7 @@ final class PhabricatorApplicationPeople extends PhabricatorApplication {
       $item = new PHUIListItemView();
       $item->setName($user->getUsername());
       $item->setHref('/p/'.$user->getUsername().'/');
-      $item->addClass('phabricator-core-menu-item');
+      $item->addClass('core-menu-item');
 
       $classes = array(
         'phabricator-core-menu-icon',

src/applications/settings/application/PhabricatorApplicationSettings.php

@@ -42,7 +42,7 @@ final class PhabricatorApplicationSettings extends PhabricatorApplication {
       $item = new PHUIListItemView();
       $item->setName(pht('Settings'));
       $item->setIcon('settings');
-      $item->addClass('phabricator-core-menu-item');
+      $item->addClass('core-menu-item');
       $item->setSelected($selected);
       $item->setHref('/settings/');
       $items[] = $item;

src/view/page/menu/PhabricatorMainMenuView.php

@@ -166,7 +166,6 @@ final class PhabricatorMainMenuView extends AphrontView {
     if ($actions) {
       $view->addMenuItem(
         id(new PHUIListItemView())
-          ->addClass('phabricator-core-item-device')
           ->setType(PHUIListItemView::TYPE_LABEL)
           ->setName(pht('Actions')));
       foreach ($actions as $action) {
@@ -185,8 +184,7 @@ final class PhabricatorMainMenuView extends AphrontView {
     if ($user->isLoggedIn()) {
       $view->addMenuItem(
         id(new PHUIListItemView())
-          ->addClass('phui-list-item-type-link')
-          ->addClass('phabricator-core-menu-item')
+          ->addClass('core-menu-item')
           ->setName(pht('Log Out'))
           ->setHref('/logout/')
           ->appendChild($this->renderMenuIcon('power-light-large')));

webroot/rsrc/css/application/base/main-menu-view.css

@@ -103,6 +103,10 @@
   width: 220px;
 }
 
+.device .phabricator-main-menu-search {
+  height: 40px;
+}
+
 .phabricator-main-menu-search-container {
   padding: 10px 0;
   position: relative;
@@ -126,7 +130,7 @@
 }
 
 .device .phabricator-main-menu-search-container {
-  padding: 0;
+  padding: 4px 0;
 }
 
 .phabricator-main-menu .phabricator-main-menu-search input {
@@ -185,7 +189,7 @@
 }
 
 .device .phabricator-main-menu-search button {
-  top: 3px;
+  top: 7px;
 }
 
 .phabricator-main-menu-search-target div.jx-typeahead-results {
@@ -219,6 +223,11 @@
   font-weight: normal;
 }
 
+.device .phabricator-application-menu-expanded.phabricator-search-menu-expanded
+ .phabricator-search-menu {
+  padding: 0;
+}
+
 
 /* - Alert ---------------------------------------------------------------------
 
@@ -291,7 +300,7 @@
   border-width: 1px 0;
   border-style: solid;
   border-color: #34373b transparent #282c2d;
-  background-image: url(/res/41ee673a/rsrc/image/texture/dark-menu.png);
+  background-image: url(/rsrc/image/texture/dark-menu.png);
   padding: 4px 0;
   display: block;
 }
@@ -313,7 +322,6 @@
 
 .device-desktop .phabricator-search-menu {
   float: right;
-  margin-right: 116px;
 }
 
 .device .phabricator-search-menu-expanded .phabricator-search-menu {
@@ -333,39 +341,30 @@
 }
 
 .device-desktop .phabricator-application-menu {
-  position: absolute;
-  right: 0;
-  top: 0;
-  vertical-align: top;
+  float: right;
 }
 
-.device-desktop .phabricator-application-menu a.phui-list-item-view,
-.device-desktop .phabricator-application-menu .phui-list-item-name {
+.device-desktop .phabricator-application-menu .phui-list-item-view,
+.device-desktop .phabricator-application-menu .phui-list-item-name  {
   display: none;
 }
 
-.device-desktop .phabricator-application-menu
-  a.phui-list-item-view.phabricator-core-menu-item {
+.device-desktop .phabricator-application-menu .phui-list-item-view.core-menu-item {
   display: block;
 }
 
 .device-desktop .phabricator-application-menu
-  a.phui-list-item-view.phabricator-core-menu-item:hover {
+ .core-menu-item.phui-list-item-view:hover {
   background-color: #1e2225;
 }
 
 .device-desktop .phabricator-application-menu .phui-list-item-view {
-  display: block;
   float: left;
   position: relative;
   min-width: 40px;
   height: 44px;
 }
 
-.device-desktop .phabricator-application-menu .phabricator-core-item-device {
-  display: none;
-}
-
 .device-desktop .phabricator-core-menu-icon {
   top: 9px;
   left: 6px;