From b8d323ea8e734a25df07d8e21b6d0ff6628a22ee Mon Sep 17 00:00:00 2001
From: Chad Little <chad@chadsdomain.com>
Date: Sat, 14 Mar 2015 13:12:26 -0700
Subject: [PATCH] Normalize 'conpherence-edited' UI between full and column

Summary: Normalizes size and colors. Default to non-bold names, grey text, and hide the time in column. Also re-evaluated header spacing in Photoshop.

Test Plan: Lots of photoshop, tested full in desktop, mobile and tablet and normal durable column. This was sadly 2 hours of work.

Reviewers: epriestley

Subscribers: Korvin, epriestley

Differential Revision: https://secure.phabricator.com/D12087
---
 resources/celerity/map.php                    |  8 +++----
 .../conpherence/durable-column.css            | 14 ++++++++++--
 .../application/conpherence/message-pane.css  | 22 +++++++++++++------
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 2ded5185cf..5c4a1e9282 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -44,9 +44,9 @@ return array(
     'rsrc/css/application/config/config-welcome.css' => '6abd79be',
     'rsrc/css/application/config/setup-issue.css' => '22270af2',
     'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2',
-    'rsrc/css/application/conpherence/durable-column.css' => '8c951609',
+    'rsrc/css/application/conpherence/durable-column.css' => 'a27580c5',
     'rsrc/css/application/conpherence/menu.css' => 'c6ac5299',
-    'rsrc/css/application/conpherence/message-pane.css' => '5930260a',
+    'rsrc/css/application/conpherence/message-pane.css' => '2526107d',
     'rsrc/css/application/conpherence/notification.css' => '04a6e10a',
     'rsrc/css/application/conpherence/update.css' => '1099a660',
     'rsrc/css/application/conpherence/widget-pane.css' => '3d575438',
@@ -513,9 +513,9 @@ return array(
     'changeset-view-manager' => '88be0133',
     'config-options-css' => '7fedf08b',
     'config-welcome-css' => '6abd79be',
-    'conpherence-durable-column-view' => '8c951609',
+    'conpherence-durable-column-view' => 'a27580c5',
     'conpherence-menu-css' => 'c6ac5299',
-    'conpherence-message-pane-css' => '5930260a',
+    'conpherence-message-pane-css' => '2526107d',
     'conpherence-notification-css' => '04a6e10a',
     'conpherence-thread-manager' => '0324970d',
     'conpherence-update-css' => '1099a660',
diff --git a/webroot/rsrc/css/application/conpherence/durable-column.css b/webroot/rsrc/css/application/conpherence/durable-column.css
index ca1b7b14fc..385c8b5521 100644
--- a/webroot/rsrc/css/application/conpherence/durable-column.css
+++ b/webroot/rsrc/css/application/conpherence/durable-column.css
@@ -128,6 +128,17 @@
   padding: 8px 12px 0;
 }
 
+.conpherence-durable-column-transactions .conpherence-edited {
+  color: {$lightgreytext};
+  font-size: 12px;
+  margin: 0;
+}
+
+.conpherence-durable-column-transactions .conpherence-edited
+  .phabricator-transaction-header {
+    display: none;
+}
+
 .conpherence-durable-column-transactions .phabricator-transaction-view {
   background: none;
   margin: 0;
@@ -149,7 +160,7 @@
 .conpherence-durable-column-transactions .phabricator-transaction-detail
 .phabricator-transaction-header {
   background: none;
-  padding: 0 0 4px 0;
+  padding: 0 0 2px 0;
 }
 
 .conpherence-durable-column-transactions .date-marker {
@@ -182,7 +193,6 @@
 
 .conpherence-durable-column-transactions .phabricator-transaction-detail
 .phabricator-transaction-content .phui-link-person {
-  font-weight: bold;
   color: {$darkbluetext};
 }
 
diff --git a/webroot/rsrc/css/application/conpherence/message-pane.css b/webroot/rsrc/css/application/conpherence/message-pane.css
index ddf22f49f2..1c2a3af0a1 100644
--- a/webroot/rsrc/css/application/conpherence/message-pane.css
+++ b/webroot/rsrc/css/application/conpherence/message-pane.css
@@ -161,13 +161,25 @@
   font-size: 12px;
   padding: 0px 5px;
 }
+
 .device-phone .conpherence-message-pane .phabricator-transaction-detail {
   min-height: auto;
 }
 
-.conpherence-message-pane .conpherence-edited {
+.conpherence-message-pane .conpherence-edited .phabricator-transaction-content {
   color: {$lightgreytext};
+  font-size: 13px;
   margin: 0;
+  padding: 0;
+  float: left;
+}
+
+.conpherence-message-pane .conpherence-edited .phabricator-transaction-header {
+  float: right;
+}
+
+.conpherence-message-pane .conpherence-edited {
+  padding-top: 12px;
 }
 
 .device-phone .conpherence-message-pane .conpherence-edited {
@@ -175,13 +187,8 @@
   margin: 0 10px;
 }
 
-.conpherence-message-pane .conpherence-edited .phabricator-transaction-content {
-  padding: 0 0 4px 45px;
-}
-
 .conpherence-message-pane .conpherence-edited
   .phabricator-transaction-content a {
-  font-weight: bold;
   color: {$darkbluetext};
 }
 
@@ -192,8 +199,9 @@
 
 .conpherence-message-pane .phabricator-transaction-info,
 .conpherence-message-pane .phabricator-content-source-view {
-  color: #b7b7b7;
+  color: {$lightbluetext};
   line-height: 16px;
+  font-size: 12px;
 }
 
 .conpherence-message-pane .phabricator-transaction-header,