From 562d427f097e1761c1a3e885f978158dc580df5f Mon Sep 17 00:00:00 2001
From: Chad Little <chad@chadsdomain.com>
Date: Sun, 1 May 2016 12:48:56 -0700
Subject: [PATCH] New icons, colors for per reviewer status

Summary: Fixes T10906, Fixes T10820. Adds new icons, grey-er colors for previous states. Also, I think fixed a few bugs?

Test Plan: Fake each state, verify icon is as intended.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Maniphest Tasks: T10820, T10906

Differential Revision: https://secure.phabricator.com/D15830
---
 resources/celerity/map.php                    |  6 +++---
 .../view/DifferentialReviewersView.php        | 19 ++++++++++---------
 webroot/rsrc/css/phui/phui-status.css         | 13 ++++++++-----
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index cd0efd5db5..08ff8d1298 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
  */
 return array(
   'names' => array(
-    'core.pkg.css' => 'b729f9f5',
+    'core.pkg.css' => 'dd240688',
     'core.pkg.js' => '6972d365',
     'darkconsole.pkg.js' => 'e7393ebb',
     'differential.pkg.css' => '7ba78475',
@@ -153,7 +153,7 @@ return array(
     'rsrc/css/phui/phui-remarkup-preview.css' => '1a8f2591',
     'rsrc/css/phui/phui-segment-bar-view.css' => '46342871',
     'rsrc/css/phui/phui-spacing.css' => '042804d6',
-    'rsrc/css/phui/phui-status.css' => '37309046',
+    'rsrc/css/phui/phui-status.css' => 'd5263e49',
     'rsrc/css/phui/phui-tag-view.css' => '6bbd83e2',
     'rsrc/css/phui/phui-timeline-view.css' => '6e342216',
     'rsrc/css/phui/phui-two-column-view.css' => 'b9538af1',
@@ -848,7 +848,7 @@ return array(
     'phui-remarkup-preview-css' => '1a8f2591',
     'phui-segment-bar-view-css' => '46342871',
     'phui-spacing-css' => '042804d6',
-    'phui-status-list-view-css' => '37309046',
+    'phui-status-list-view-css' => 'd5263e49',
     'phui-tag-view-css' => '6bbd83e2',
     'phui-theme-css' => '027ba77e',
     'phui-timeline-view-css' => '6e342216',
diff --git a/src/applications/differential/view/DifferentialReviewersView.php b/src/applications/differential/view/DifferentialReviewersView.php
index ac4e482278..b94e246d73 100644
--- a/src/applications/differential/view/DifferentialReviewersView.php
+++ b/src/applications/differential/view/DifferentialReviewersView.php
@@ -58,15 +58,15 @@ final class DifferentialReviewersView extends AphrontView {
           } else {
             $item->setIcon(
               PHUIStatusItemView::ICON_ACCEPT,
-              'dark',
+              'bluegrey',
               pht('Accepted Prior Diff'));
           }
           break;
 
         case DifferentialReviewerStatus::STATUS_ACCEPTED_OLDER:
           $item->setIcon(
-            PHUIStatusItemView::ICON_ACCEPT,
-            'dark',
+            'fa-check-circle-o',
+            'bluegrey',
             pht('Accepted Prior Diff'));
           break;
 
@@ -78,28 +78,29 @@ final class DifferentialReviewersView extends AphrontView {
               pht('Requested Changes'));
           } else {
             $item->setIcon(
-              PHUIStatusItemView::ICON_REJECT,
-              'dark',
+              'fa-times-circle-o',
+              'bluegrey',
               pht('Requested Changes to Prior Diff'));
           }
           break;
 
         case DifferentialReviewerStatus::STATUS_REJECTED_OLDER:
           $item->setIcon(
-            PHUIStatusItemView::ICON_REJECT,
-            'dark',
+            'fa-times-circle-o',
+            'bluegrey',
             pht('Rejected Prior Diff'));
           break;
 
         case DifferentialReviewerStatus::STATUS_COMMENTED:
           if ($is_current) {
             $item->setIcon(
-              PHUIStatusItemView::ICON_INFO,
+              'fa-question-circle',
               'blue',
               pht('Commented'));
           } else {
             $item->setIcon(
-              'info-dark',
+              'fa-question-circle-o',
+              'bluegrey',
               pht('Commented Previously'));
           }
           break;
diff --git a/webroot/rsrc/css/phui/phui-status.css b/webroot/rsrc/css/phui/phui-status.css
index d8f46c002f..dd22e6f337 100644
--- a/webroot/rsrc/css/phui/phui-status.css
+++ b/webroot/rsrc/css/phui/phui-status.css
@@ -13,8 +13,7 @@
 }
 
 .phui-status-item-target {
-  padding: 0 12px 0 0;
-  line-height: 20px;
+  padding: 1px 8px;
   white-space: nowrap;
 }
 
@@ -22,14 +21,18 @@
   width: 100%;
   color: {$greytext};
   line-height: 14px;
-  padding: 3px 0;
+  padding: 3px 4px;
 }
 
 .phui-status-item-highlighted td {
-  background-color: {$lightyellow};
+  background-color: {$sh-yellowbackground};
+  border-radius: 3px;
+}
+
+.phui-status-list-view td a {
+ color: {$darkbluetext};
 }
 
 .phui-status-item-highlighted td.phui-status-item-note {
   background-color: transparent;
-  padding-left: 4px;
 }