From 12ae08b6b1a1b7c330593e76c32817f7cdbc87dd Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Thu, 24 Aug 2017 19:36:33 -0700
Subject: [PATCH] Move differential revision to its own table column in blame
 view

Summary: There is still some layout issues with revisions, so I've tested it better and moved it to it's own column

Test Plan: Fake in some revision data, test various sizes and shapes.

Reviewers: epriestley

Reviewed By: epriestley

Spies: Korvin

Differential Revision: https://secure.phabricator.com/D18473
---
 resources/celerity/map.php                    |  4 ++--
 .../controller/DiffusionBrowseController.php  | 19 +++++++++++--------
 .../diffusion/diffusion-source.css            | 18 ++++++++++--------
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index e078912296..10305393cc 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -74,7 +74,7 @@ return array(
     'rsrc/css/application/diffusion/diffusion-icons.css' => '0c15255e',
     'rsrc/css/application/diffusion/diffusion-readme.css' => '419dd5b6',
     'rsrc/css/application/diffusion/diffusion-repository.css' => 'ee6f20ec',
-    'rsrc/css/application/diffusion/diffusion-source.css' => '5c697665',
+    'rsrc/css/application/diffusion/diffusion-source.css' => 'cb2bf02e',
     'rsrc/css/application/diffusion/diffusion.css' => 'ceacf994',
     'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
     'rsrc/css/application/files/global-drag-and-drop.css' => 'b556a948',
@@ -574,7 +574,7 @@ return array(
     'diffusion-icons-css' => '0c15255e',
     'diffusion-readme-css' => '419dd5b6',
     'diffusion-repository-css' => 'ee6f20ec',
-    'diffusion-source-css' => '5c697665',
+    'diffusion-source-css' => 'cb2bf02e',
     'diviner-shared-css' => '896f1d43',
     'font-fontawesome' => 'e838e088',
     'font-lato' => 'c7ccd872',
diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index f3c9210c50..ac2d08ef1f 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -706,6 +706,7 @@ final class DiffusionBrowseController extends DiffusionController {
 
     $buttons[] =
       id(new PHUIButtonView())
+        ->setTag('a')
         ->setText(pht('Last Change'))
         ->setColor(PHUIButtonView::GREY)
         ->setHref(
@@ -1175,19 +1176,21 @@ final class DiffusionBrowseController extends DiffusionController {
           ),
           $before_link);
 
-        $object_links = array();
-        $object_links[] = $commit_link;
-        if ($revision_link) {
-          $object_links[] = phutil_tag('span', array(), '/');
-          $object_links[] = $revision_link;
-        }
-
         $row[] = phutil_tag(
           'th',
           array(
             'class' => 'diffusion-rev-link',
           ),
-          $object_links);
+          $commit_link);
+
+        if ($revision_link) {
+          $row[] = phutil_tag(
+            'th',
+            array(
+              'class' => 'diffusion-blame-revision',
+            ),
+            $revision_link);
+        }
 
         $row[] = phutil_tag(
           'th',
diff --git a/webroot/rsrc/css/application/diffusion/diffusion-source.css b/webroot/rsrc/css/application/diffusion/diffusion-source.css
index 8662683a0c..90b1fb01fe 100644
--- a/webroot/rsrc/css/application/diffusion/diffusion-source.css
+++ b/webroot/rsrc/css/application/diffusion/diffusion-source.css
@@ -40,11 +40,12 @@
 .diffusion-blame-date {
   background: {$lightgreybackground};
   font: {$basefont};
-  font-size: {$smallestfontsize};
+  font-size: {$smallerfontsize};
 }
 
 .diffusion-blame-link,
-.diffusion-line-link  {
+.diffusion-line-link,
+.diffusion-blame-revision {
   background: {$lightgreybackground};
 }
 
@@ -53,7 +54,7 @@
   min-width: 130px;
   background: {$lightgreybackground};
   font: {$basefont};
-  font-size: {$smallestfontsize};
+  font-size: {$smallerfontsize};
 }
 
 .diffusion-source a {
@@ -61,17 +62,18 @@
 }
 
 .diffusion-rev-link a {
-  max-width: 340px;
+  max-width: 300px;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
+  margin: 3px 8px;
+  display: block;
 }
 
-.diffusion-rev-link a,
-.diffusion-rev-link span,
-.diffusion-blame-date a {
+.diffusion-blame-date a,
+.diffusion-blame-revision a {
+  float: right;
   margin: 3px 8px;
-  float: left;
 }
 
 .diffusion-rev-link span {