From 89d35b98c8926d209a1b7f63e403315f6eba0117 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@chadsdomain.com>
Date: Wed, 16 Oct 2013 13:09:12 -0700
Subject: [PATCH] Misc Diffusion/Differential CSS tweaks

Summary: Various tweaks and fixes. Adds a File Contents view in Diffusion, normalizes spaces, colors.

Test Plan: tested differential and diffusion in my sandbox.

Reviewers: epriestley, btrahan

Reviewed By: epriestley

CC: Korvin, epriestley, aran

Maniphest Tasks: T3952

Differential Revision: https://secure.phabricator.com/D7325
---
 src/__celerity_resource_map__.php             | 46 +++++++++----------
 .../DiffusionBrowseFileController.php         |  5 +-
 .../controller/DiffusionCommitController.php  | 10 ++--
 .../differential/changeset-view.css           |  9 ++--
 .../differential/revision-history.css         | 23 ++++------
 .../css/application/diffusion/commit-view.css |  4 --
 .../diffusion/diffusion-source.css            | 26 +++++------
 7 files changed, 58 insertions(+), 65 deletions(-)

diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php
index 844f1d2189..139a2cf700 100644
--- a/src/__celerity_resource_map__.php
+++ b/src/__celerity_resource_map__.php
@@ -1031,7 +1031,7 @@ celerity_register_resource_map(array(
   ),
   'differential-changeset-view-css' =>
   array(
-    'uri' => '/res/f8fc5deb/rsrc/css/application/differential/changeset-view.css',
+    'uri' => '/res/0e780c41/rsrc/css/application/differential/changeset-view.css',
     'type' => 'css',
     'requires' =>
     array(
@@ -1109,7 +1109,7 @@ celerity_register_resource_map(array(
   ),
   'differential-revision-history-css' =>
   array(
-    'uri' => '/res/bb29e0e8/rsrc/css/application/differential/revision-history.css',
+    'uri' => '/res/13b4c17b/rsrc/css/application/differential/revision-history.css',
     'type' => 'css',
     'requires' =>
     array(
@@ -1136,7 +1136,7 @@ celerity_register_resource_map(array(
   ),
   'diffusion-commit-view-css' =>
   array(
-    'uri' => '/res/b445944e/rsrc/css/application/diffusion/commit-view.css',
+    'uri' => '/res/a48ea65a/rsrc/css/application/diffusion/commit-view.css',
     'type' => 'css',
     'requires' =>
     array(
@@ -1154,7 +1154,7 @@ celerity_register_resource_map(array(
   ),
   'diffusion-source-css' =>
   array(
-    'uri' => '/res/072800bb/rsrc/css/application/diffusion/diffusion-source.css',
+    'uri' => '/res/f4a2f867/rsrc/css/application/diffusion/diffusion-source.css',
     'type' => 'css',
     'requires' =>
     array(
@@ -4383,7 +4383,7 @@ celerity_register_resource_map(array(
       'uri' => '/res/pkg/4ccfeb47/darkconsole.pkg.js',
       'type' => 'js',
     ),
-    'f5d1e7d3' =>
+    '7cd7e387' =>
     array(
       'name' => 'differential.pkg.css',
       'symbols' =>
@@ -4402,7 +4402,7 @@ celerity_register_resource_map(array(
         11 => 'differential-local-commits-view-css',
         12 => 'inline-comment-summary-css',
       ),
-      'uri' => '/res/pkg/f5d1e7d3/differential.pkg.css',
+      'uri' => '/res/pkg/7cd7e387/differential.pkg.css',
       'type' => 'css',
     ),
     '5e9e5c4e' =>
@@ -4433,7 +4433,7 @@ celerity_register_resource_map(array(
       'uri' => '/res/pkg/5e9e5c4e/differential.pkg.js',
       'type' => 'js',
     ),
-    'c8ce2d88' =>
+    '270f4eb4' =>
     array(
       'name' => 'diffusion.pkg.css',
       'symbols' =>
@@ -4441,7 +4441,7 @@ celerity_register_resource_map(array(
         0 => 'diffusion-commit-view-css',
         1 => 'diffusion-icons-css',
       ),
-      'uri' => '/res/pkg/c8ce2d88/diffusion.pkg.css',
+      'uri' => '/res/pkg/270f4eb4/diffusion.pkg.css',
       'type' => 'css',
     ),
     96909266 =>
@@ -4522,21 +4522,21 @@ celerity_register_resource_map(array(
     'aphront-tokenizer-control-css' => 'a4e76ef8',
     'aphront-tooltip-css' => 'a4e76ef8',
     'aphront-typeahead-control-css' => 'a4e76ef8',
-    'differential-changeset-view-css' => 'f5d1e7d3',
-    'differential-core-view-css' => 'f5d1e7d3',
+    'differential-changeset-view-css' => '7cd7e387',
+    'differential-core-view-css' => '7cd7e387',
     'differential-inline-comment-editor' => '5e9e5c4e',
-    'differential-local-commits-view-css' => 'f5d1e7d3',
-    'differential-results-table-css' => 'f5d1e7d3',
-    'differential-revision-add-comment-css' => 'f5d1e7d3',
-    'differential-revision-comment-css' => 'f5d1e7d3',
-    'differential-revision-comment-list-css' => 'f5d1e7d3',
-    'differential-revision-history-css' => 'f5d1e7d3',
-    'differential-revision-list-css' => 'f5d1e7d3',
-    'differential-table-of-contents-css' => 'f5d1e7d3',
-    'diffusion-commit-view-css' => 'c8ce2d88',
-    'diffusion-icons-css' => 'c8ce2d88',
+    'differential-local-commits-view-css' => '7cd7e387',
+    'differential-results-table-css' => '7cd7e387',
+    'differential-revision-add-comment-css' => '7cd7e387',
+    'differential-revision-comment-css' => '7cd7e387',
+    'differential-revision-comment-list-css' => '7cd7e387',
+    'differential-revision-history-css' => '7cd7e387',
+    'differential-revision-list-css' => '7cd7e387',
+    'differential-table-of-contents-css' => '7cd7e387',
+    'diffusion-commit-view-css' => '270f4eb4',
+    'diffusion-icons-css' => '270f4eb4',
     'global-drag-and-drop-css' => 'a4e76ef8',
-    'inline-comment-summary-css' => 'f5d1e7d3',
+    'inline-comment-summary-css' => '7cd7e387',
     'javelin-aphlict' => 'adee86d9',
     'javelin-behavior' => '3e3be199',
     'javelin-behavior-aphlict-dropdown' => 'adee86d9',
@@ -4615,7 +4615,7 @@ celerity_register_resource_map(array(
     'phabricator-action-list-view-css' => 'a4e76ef8',
     'phabricator-application-launch-view-css' => 'a4e76ef8',
     'phabricator-busy' => 'adee86d9',
-    'phabricator-content-source-view-css' => 'f5d1e7d3',
+    'phabricator-content-source-view-css' => '7cd7e387',
     'phabricator-core-css' => 'a4e76ef8',
     'phabricator-crumbs-view-css' => 'a4e76ef8',
     'phabricator-drag-and-drop-file-upload' => '5e9e5c4e',
@@ -4633,7 +4633,7 @@ celerity_register_resource_map(array(
     'phabricator-notification' => 'adee86d9',
     'phabricator-notification-css' => 'a4e76ef8',
     'phabricator-notification-menu-css' => 'a4e76ef8',
-    'phabricator-object-selector-css' => 'f5d1e7d3',
+    'phabricator-object-selector-css' => '7cd7e387',
     'phabricator-phtize' => 'adee86d9',
     'phabricator-prefab' => 'adee86d9',
     'phabricator-project-tag-css' => '49898640',
diff --git a/src/applications/diffusion/controller/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/DiffusionBrowseFileController.php
index f19b1ea0a0..dac6ca229c 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseFileController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseFileController.php
@@ -297,11 +297,14 @@ final class DiffusionBrowseFileController extends DiffusionBrowseController {
       $corpus = phutil_tag(
         'div',
         array(
-          'style' => 'padding: 0 2em;',
           'id' => $id,
         ),
         $corpus_table);
 
+      $corpus = id(new PHUIObjectBoxView())
+        ->setHeaderText('File Contents')
+        ->appendChild($corpus);
+
       Javelin::initBehavior('load-blame', array('id' => $id));
     }
 
diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
index 584a1c7b4a..a79ef123c0 100644
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -129,7 +129,11 @@ final class DiffusionCommitController extends DiffusionController {
       $message = $engine->markupText($message);
 
       $property_list->invokeWillRenderEvent();
-      $property_list->addTextContent(
+      $property_list->setActionList($headsup_actions);
+
+      $detail_list = new PHUIPropertyListView();
+      $detail_list->addSectionHeader(pht('Description'));
+      $detail_list->addTextContent(
         phutil_tag(
           'div',
           array(
@@ -137,11 +141,11 @@ final class DiffusionCommitController extends DiffusionController {
           ),
           $message));
       $content[] = $top_anchor;
-      $property_list->setActionList($headsup_actions);
 
       $object_box = id(new PHUIObjectBoxView())
         ->setHeader($headsup_view)
-        ->addPropertyList($property_list);
+        ->addPropertyList($property_list)
+        ->addPropertyList($detail_list);
 
       $content[] = $object_box;
     }
diff --git a/webroot/rsrc/css/application/differential/changeset-view.css b/webroot/rsrc/css/application/differential/changeset-view.css
index f707902af3..128e9b67ab 100644
--- a/webroot/rsrc/css/application/differential/changeset-view.css
+++ b/webroot/rsrc/css/application/differential/changeset-view.css
@@ -5,7 +5,7 @@
 .differential-changeset {
   position: relative;
   margin: 0;
-  padding: 16px 0;
+  padding-top: 32px;
 }
 
 .differential-diff {
@@ -268,7 +268,7 @@ td.cov-X {
 }
 
 .differential-inline-comment-synthetic .differential-inline-comment-head {
-  border-bottom: 1px solid {$thinblueborder};
+  border-bottom: 1px solid {$blueborder};
 }
 
 
@@ -303,7 +303,7 @@ td.cov-X {
 
 .differential-property-table {
   width: auto;
-  margin: .75em auto;
+  margin: 12px auto;
   background: #e3e3e3;
 }
 
@@ -367,8 +367,7 @@ td.cov-X {
 }
 
 .differential-inline-comment-edit-buttons {
-  padding: 5px 0 0 0;
-
+  padding: 4px 0 0 0;
 }
 
 .differential-inline-comment-edit-buttons button {
diff --git a/webroot/rsrc/css/application/differential/revision-history.css b/webroot/rsrc/css/application/differential/revision-history.css
index f330a5688f..20fa1d9169 100644
--- a/webroot/rsrc/css/application/differential/revision-history.css
+++ b/webroot/rsrc/css/application/differential/revision-history.css
@@ -8,13 +8,10 @@
   border-spacing: 1px;
 }
 
-.differential-revision-history-table th {
-  color: {$greytext};
-  padding: 4px 6px;
-}
-
+.differential-revision-history-table th,
 .differential-revision-history-table td {
-  padding: 4px 6px;
+  color: {$darkbluetext};
+  padding: 4px 8px;
 }
 
 .differential-revision-history-table td {
@@ -22,10 +19,9 @@
 }
 
 .differential-revision-history-table tr.alt {
-  background: #dcdcdc;
+  background: {$greybackground};
 }
 
-
 .differential-revision-history-table td.revhistory-desc {
   width: 100%;
   white-space: normal;
@@ -41,7 +37,7 @@
 
 .differential-revision-history-table td.revhistory-old,
 .differential-revision-history-table td.revhistory-new {
-  padding: 0em 1.5em;
+  padding: 0 16px;
   text-align: center;
 }
 
@@ -65,21 +61,18 @@
   text-align: center;
 }
 
-
-
-
 .differential-revision-history-table td.diff-differ-submit {
   text-align: right;
   border-bottom: none;
-  padding: 8px 0px 4px 0px;
+  padding: 8px 0 4px 0;
 }
 
 .differential-revision-history-table td.diff-differ-submit button {
-  margin-left: 1em;
+  margin-left: 12px;
 }
 
 .differential-revision-history-table td.diff-differ-submit label {
   font-weight: bold;
-  padding-right: .25em;
+  padding-right: 4px;
   color: {$darkgreytext};
 }
diff --git a/webroot/rsrc/css/application/diffusion/commit-view.css b/webroot/rsrc/css/application/diffusion/commit-view.css
index ffd319e0bc..344d7ed73c 100644
--- a/webroot/rsrc/css/application/diffusion/commit-view.css
+++ b/webroot/rsrc/css/application/diffusion/commit-view.css
@@ -2,10 +2,6 @@
  * @provides diffusion-commit-view-css
  */
 
-.diffusion-commit-message {
-  padding: 8px;
-}
-
 .diffusion-comment-list {
   margin: 2em;
 }
diff --git a/webroot/rsrc/css/application/diffusion/diffusion-source.css b/webroot/rsrc/css/application/diffusion/diffusion-source.css
index 52ecea4e9b..dd87b5b802 100644
--- a/webroot/rsrc/css/application/diffusion/diffusion-source.css
+++ b/webroot/rsrc/css/application/diffusion/diffusion-source.css
@@ -3,7 +3,6 @@
  */
 
 .diffusion-source {
-  margin: 1em 0 2em;
   width: 100%;
   font-family: "Monaco", Consolas, monospace;
   font-size: 10px;
@@ -15,14 +14,12 @@
 }
 
 .diffusion-source th {
-  text-align:         right;
-  vertical-align:     top;
-  background:         #eeeeee;
-  color:              {$lightgreytext};
-  border-style:       solid;
-  border-width:       0px 1px;
-  border-color:       #eeeeee #999999 #eeeeee #dddddd;
-  font-size:          11px;
+  text-align: right;
+  vertical-align: top;
+  background: {$lightgreybackground};
+  color: {$bluetext};
+  border-right: 1px solid {$thinblueborder};
+  font-size: 11px;
 }
 
 .diffusion-source td {
@@ -46,7 +43,7 @@
 }
 
 .diffusion-blame-link {
-  min-width: 25px;
+  min-width: 28px;
 }
 
 .diffusion-rev-link {
@@ -61,20 +58,21 @@
 .diffusion-rev-link a,
 .diffusion-author-link a,
 .diffusion-line-link a {
-  font-weight:  bold;
+  color: {$darkbluetext};
 }
 
 .diffusion-rev-link a,
 .diffusion-author-link span,
 .diffusion-author-link a {
-  margin:       0 8px;
+  margin: 2px 8px 0;
+  display: block;
 }
 
 .diffusion-blame-link a,
 .diffusion-line-link a {
   /* Give the user a larger click target. */
-  display:      block;
-  padding:      2px 8px;
+  display: block;
+  padding: 2px 8px;
 }
 
 .diffusion-line-link {