Move crumbs to first element of content-view

Summary: Moves the crumbs inside content area.

Test Plan: Review places that have navigation and crumbs

Reviewers: btrahan, epriestley

Reviewed By: epriestley

CC: aran, Korvin

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

src/__celerity_resource_map__.php

@@ -2664,7 +2664,7 @@ celerity_register_resource_map(array(
   ),
   'phabricator-nav-view-css' =>
   array(
-    'uri' => '/res/f29594ae/rsrc/css/aphront/phabricator-nav-view.css',
+    'uri' => '/res/00ba5b11/rsrc/css/aphront/phabricator-nav-view.css',
     'type' => 'css',
     'requires' =>
     array(
@@ -3078,7 +3078,7 @@ celerity_register_resource_map(array(
   ),
   'phabricator-zindex-css' =>
   array(
-    'uri' => '/res/81ca67ef/rsrc/css/core/z-index.css',
+    'uri' => '/res/99eb34fd/rsrc/css/core/z-index.css',
     'type' => 'css',
     'requires' =>
     array(
@@ -3268,7 +3268,7 @@ celerity_register_resource_map(array(
 ), array(
   'packages' =>
   array(
-    'b6d1f956' =>
+    'e56a4224' =>
     array(
       'name' => 'core.pkg.css',
       'symbols' =>
@@ -3313,7 +3313,7 @@ celerity_register_resource_map(array(
         37 => 'phabricator-object-item-list-view-css',
         38 => 'global-drag-and-drop-css',
       ),
-      'uri' => '/res/pkg/b6d1f956/core.pkg.css',
+      'uri' => '/res/pkg/e56a4224/core.pkg.css',
       'type' => 'css',
     ),
     'b239ff06' =>
@@ -3502,19 +3502,19 @@ celerity_register_resource_map(array(
   'reverse' =>
   array(
     'aphront-attached-file-view-css' => 'ac211174',
-    'aphront-crumbs-view-css' => 'b6d1f956',
-    'aphront-dialog-view-css' => 'b6d1f956',
-    'aphront-error-view-css' => 'b6d1f956',
-    'aphront-form-view-css' => 'b6d1f956',
+    'aphront-crumbs-view-css' => 'e56a4224',
+    'aphront-dialog-view-css' => 'e56a4224',
+    'aphront-error-view-css' => 'e56a4224',
+    'aphront-form-view-css' => 'e56a4224',
     'aphront-headsup-action-list-view-css' => '20933a11',
-    'aphront-headsup-view-css' => 'b6d1f956',
-    'aphront-list-filter-view-css' => 'b6d1f956',
-    'aphront-pager-view-css' => 'b6d1f956',
-    'aphront-panel-view-css' => 'b6d1f956',
-    'aphront-table-view-css' => 'b6d1f956',
-    'aphront-tokenizer-control-css' => 'b6d1f956',
-    'aphront-tooltip-css' => 'b6d1f956',
-    'aphront-typeahead-control-css' => 'b6d1f956',
+    'aphront-headsup-view-css' => 'e56a4224',
+    'aphront-list-filter-view-css' => 'e56a4224',
+    'aphront-pager-view-css' => 'e56a4224',
+    'aphront-panel-view-css' => 'e56a4224',
+    'aphront-table-view-css' => 'e56a4224',
+    'aphront-tokenizer-control-css' => 'e56a4224',
+    'aphront-tooltip-css' => 'e56a4224',
+    'aphront-typeahead-control-css' => 'e56a4224',
     'differential-changeset-view-css' => '20933a11',
     'differential-core-view-css' => '20933a11',
     'differential-inline-comment-editor' => 'bbd79ca2',
@@ -3528,7 +3528,7 @@ celerity_register_resource_map(array(
     'differential-table-of-contents-css' => '20933a11',
     'diffusion-commit-view-css' => 'c8ce2d88',
     'diffusion-icons-css' => 'c8ce2d88',
-    'global-drag-and-drop-css' => 'b6d1f956',
+    'global-drag-and-drop-css' => 'e56a4224',
     'inline-comment-summary-css' => '20933a11',
     'javelin-aphlict' => 'b239ff06',
     'javelin-behavior' => 'fbeded59',
@@ -3597,49 +3597,49 @@ celerity_register_resource_map(array(
     'javelin-util' => 'fbeded59',
     'javelin-vector' => 'fbeded59',
     'javelin-workflow' => 'fbeded59',
-    'lightbox-attachment-css' => 'b6d1f956',
+    'lightbox-attachment-css' => 'e56a4224',
     'maniphest-task-summary-css' => 'ac211174',
     'maniphest-transaction-detail-css' => 'ac211174',
-    'phabricator-app-buttons-css' => 'b6d1f956',
+    'phabricator-app-buttons-css' => 'e56a4224',
     'phabricator-busy' => 'b239ff06',
     'phabricator-content-source-view-css' => '20933a11',
-    'phabricator-core-buttons-css' => 'b6d1f956',
-    'phabricator-core-css' => 'b6d1f956',
-    'phabricator-crumbs-view-css' => 'b6d1f956',
-    'phabricator-directory-css' => 'b6d1f956',
+    'phabricator-core-buttons-css' => 'e56a4224',
+    'phabricator-core-css' => 'e56a4224',
+    'phabricator-crumbs-view-css' => 'e56a4224',
+    'phabricator-directory-css' => 'e56a4224',
     'phabricator-drag-and-drop-file-upload' => 'bbd79ca2',
     'phabricator-dropdown-menu' => 'b239ff06',
     'phabricator-file-upload' => 'b239ff06',
-    'phabricator-filetree-view-css' => 'b6d1f956',
-    'phabricator-flag-css' => 'b6d1f956',
-    'phabricator-form-view-css' => 'b6d1f956',
-    'phabricator-header-view-css' => 'b6d1f956',
-    'phabricator-jump-nav' => 'b6d1f956',
+    'phabricator-filetree-view-css' => 'e56a4224',
+    'phabricator-flag-css' => 'e56a4224',
+    'phabricator-form-view-css' => 'e56a4224',
+    'phabricator-header-view-css' => 'e56a4224',
+    'phabricator-jump-nav' => 'e56a4224',
     'phabricator-keyboard-shortcut' => 'b239ff06',
     'phabricator-keyboard-shortcut-manager' => 'b239ff06',
-    'phabricator-main-menu-view' => 'b6d1f956',
+    'phabricator-main-menu-view' => 'e56a4224',
     'phabricator-menu-item' => 'b239ff06',
-    'phabricator-nav-view-css' => 'b6d1f956',
+    'phabricator-nav-view-css' => 'e56a4224',
     'phabricator-notification' => 'b239ff06',
-    'phabricator-notification-css' => 'b6d1f956',
-    'phabricator-notification-menu-css' => 'b6d1f956',
-    'phabricator-object-item-list-view-css' => 'b6d1f956',
+    'phabricator-notification-css' => 'e56a4224',
+    'phabricator-notification-menu-css' => 'e56a4224',
+    'phabricator-object-item-list-view-css' => 'e56a4224',
     'phabricator-object-selector-css' => '20933a11',
     'phabricator-paste-file-upload' => 'b239ff06',
     'phabricator-prefab' => 'b239ff06',
     'phabricator-project-tag-css' => 'ac211174',
-    'phabricator-remarkup-css' => 'b6d1f956',
+    'phabricator-remarkup-css' => 'e56a4224',
     'phabricator-shaped-request' => 'bbd79ca2',
-    'phabricator-side-menu-view-css' => 'b6d1f956',
-    'phabricator-standard-page-view' => 'b6d1f956',
+    'phabricator-side-menu-view-css' => 'e56a4224',
+    'phabricator-standard-page-view' => 'e56a4224',
     'phabricator-textareautils' => 'b239ff06',
     'phabricator-tooltip' => 'b239ff06',
-    'phabricator-transaction-view-css' => 'b6d1f956',
-    'phabricator-zindex-css' => 'b6d1f956',
-    'sprite-apps-large-css' => 'b6d1f956',
-    'sprite-gradient-css' => 'b6d1f956',
-    'sprite-icon-css' => 'b6d1f956',
-    'sprite-menu-css' => 'b6d1f956',
-    'syntax-highlighting-css' => 'b6d1f956',
+    'phabricator-transaction-view-css' => 'e56a4224',
+    'phabricator-zindex-css' => 'e56a4224',
+    'sprite-apps-large-css' => 'e56a4224',
+    'sprite-gradient-css' => 'e56a4224',
+    'sprite-icon-css' => 'e56a4224',
+    'sprite-menu-css' => 'e56a4224',
+    'syntax-highlighting-css' => 'e56a4224',
   ),
 ));

src/view/layout/AphrontSideNavFilterView.php

@@ -227,7 +227,7 @@ final class AphrontSideNavFilterView extends AphrontView {
       }
     }
 
-    return $crumbs.phutil_render_tag(
+    return phutil_render_tag(
       'div',
       array(
         'class' => implode(' ', $nav_classes),
@@ -241,7 +241,7 @@ final class AphrontSideNavFilterView extends AphrontView {
           'class' => 'phabricator-nav-content',
           'id' => $content_id,
         ),
-        $this->renderChildren()));
+        $crumbs.$this->renderChildren()));
   }
 
 }

webroot/rsrc/css/aphront/phabricator-nav-view.css

@@ -43,7 +43,7 @@
   position: fixed;
   top: 0;
   bottom: 0;
-  left: 205px;
+  left: 198px;
   width: 7px;
 
   cursor: col-resize;

webroot/rsrc/css/core/z-index.css

@@ -43,7 +43,7 @@
 }
 
 .phabricator-crumbs-view {
-  z-index: 5;
+  z-index: 3;
 }
 
 .phabricator-main-menu {