From d70d09c02ccdbb5cc377e2a9b8f5888bdcde2b93 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Tue, 25 Apr 2017 16:40:34 -0700
Subject: [PATCH] Fix notice spacing on table views

Summary: When a notice is in a table view in a two column layout, reset the margins.

Test Plan: Visit OwnerDetails with no paths set.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D17792
---
 resources/celerity/map.php                                | 6 +++---
 .../controller/PhabricatorOwnersDetailController.php      | 8 ++++----
 webroot/rsrc/css/aphront/table-view.css                   | 4 ++++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 12f1922102..15ad603b24 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@ return array(
   'names' => array(
     'conpherence.pkg.css' => 'ff161f2d',
     'conpherence.pkg.js' => 'b5b51108',
-    'core.pkg.css' => 'c54a8bec',
+    'core.pkg.css' => '84ce260a',
     'core.pkg.js' => '47a69358',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '90b30783',
@@ -32,7 +32,7 @@ return array(
     'rsrc/css/aphront/notification.css' => '3f6c89c9',
     'rsrc/css/aphront/panel-view.css' => '8427b78d',
     'rsrc/css/aphront/phabricator-nav-view.css' => 'faf6a6fc',
-    'rsrc/css/aphront/table-view.css' => '6ca8e057',
+    'rsrc/css/aphront/table-view.css' => '34cf86b4',
     'rsrc/css/aphront/tokenizer.css' => '9a8cb501',
     'rsrc/css/aphront/tooltip.css' => '173b9431',
     'rsrc/css/aphront/typeahead-browse.css' => '8904346a',
@@ -549,7 +549,7 @@ return array(
     'aphront-list-filter-view-css' => '5d6f0526',
     'aphront-multi-column-view-css' => '84cc6640',
     'aphront-panel-view-css' => '8427b78d',
-    'aphront-table-view-css' => '6ca8e057',
+    'aphront-table-view-css' => '34cf86b4',
     'aphront-tokenizer-control-css' => '9a8cb501',
     'aphront-tooltip-css' => '173b9431',
     'aphront-typeahead-control-css' => '8a84cc7d',
diff --git a/src/applications/owners/controller/PhabricatorOwnersDetailController.php b/src/applications/owners/controller/PhabricatorOwnersDetailController.php
index b6260416da..3c6ae3836c 100644
--- a/src/applications/owners/controller/PhabricatorOwnersDetailController.php
+++ b/src/applications/owners/controller/PhabricatorOwnersDetailController.php
@@ -323,6 +323,10 @@ final class PhabricatorOwnersDetailController
           'wide',
         ));
 
+    if ($info) {
+      $table->setNotice($info);
+    }
+
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Paths'))
       ->setHeaderIcon('fa-folder-open');
@@ -332,10 +336,6 @@ final class PhabricatorOwnersDetailController
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setTable($table);
 
-    if ($info) {
-      $box->setInfoView($info);
-    }
-
     return $box;
   }
 
diff --git a/webroot/rsrc/css/aphront/table-view.css b/webroot/rsrc/css/aphront/table-view.css
index 8ea7691130..2de08095dd 100644
--- a/webroot/rsrc/css/aphront/table-view.css
+++ b/webroot/rsrc/css/aphront/table-view.css
@@ -29,6 +29,10 @@
   border-bottom: 1px solid {$thinblueborder};
 }
 
+.phui-two-column-view .aphront-table-notice .phui-info-view {
+  margin: 0;
+}
+
 .aphront-table-view tr.alt {
   background: {$lightgreybackground};
 }
-- 
2.51.2