From cd173119078c1040121b06aa041198ab5c5ea3d6 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@chadsdomain.com>
Date: Thu, 29 Jan 2015 14:56:36 -0800
Subject: [PATCH] Default Conpherence to Source Sans Pro

Summary: Main plan is to give conversations in Conpherence or Durable Column a different, lighter, chatty feel like Phriction.

Test Plan:
Tested a couple of threads and remarkup styles.

{F278086}

Reviewers: btrahan, epriestley

Reviewed By: epriestley

Subscribers: Korvin, epriestley

Differential Revision: https://secure.phabricator.com/D11562
---
 resources/celerity/map.php                                | 4 ++--
 .../conpherence/view/ConpherenceLayoutView.php            | 5 ++++-
 webroot/rsrc/css/application/conpherence/message-pane.css | 8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index ce25ea0962..691f5b3bd6 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -47,7 +47,7 @@ return array(
     'rsrc/css/application/config/setup-issue.css' => '8f852bc0',
     'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2',
     'rsrc/css/application/conpherence/menu.css' => '73774137',
-    'rsrc/css/application/conpherence/message-pane.css' => '684d1b80',
+    'rsrc/css/application/conpherence/message-pane.css' => 'cd4b74dc',
     'rsrc/css/application/conpherence/notification.css' => '04a6e10a',
     'rsrc/css/application/conpherence/update.css' => '1099a660',
     'rsrc/css/application/conpherence/widget-pane.css' => '3d575438',
@@ -511,7 +511,7 @@ return array(
     'config-options-css' => '7fedf08b',
     'config-welcome-css' => 'b0d16200',
     'conpherence-menu-css' => '73774137',
-    'conpherence-message-pane-css' => '684d1b80',
+    'conpherence-message-pane-css' => 'cd4b74dc',
     'conpherence-notification-css' => '04a6e10a',
     'conpherence-update-css' => '1099a660',
     'conpherence-widget-pane-css' => '3d575438',
diff --git a/src/applications/conpherence/view/ConpherenceLayoutView.php b/src/applications/conpherence/view/ConpherenceLayoutView.php
index 6458f37867..f90d711262 100644
--- a/src/applications/conpherence/view/ConpherenceLayoutView.php
+++ b/src/applications/conpherence/view/ConpherenceLayoutView.php
@@ -54,6 +54,9 @@ final class ConpherenceLayoutView extends AphrontView {
     require_celerity_resource('conpherence-message-pane-css');
     require_celerity_resource('conpherence-widget-pane-css');
 
+    require_celerity_resource('phui-fontkit-css');
+    require_celerity_resource('font-source-sans-pro');
+
     $layout_id = celerity_generate_unique_node_id();
 
     $selected_id = null;
@@ -207,7 +210,7 @@ final class ConpherenceLayoutView extends AphrontView {
             javelin_tag(
               'div',
               array(
-                'class' => 'conpherence-message-pane',
+                'class' => 'conpherence-message-pane phui-font-source-sans',
                 'id' => 'conpherence-message-pane',
                 'sigil' => 'conpherence-message-pane',
               ),
diff --git a/webroot/rsrc/css/application/conpherence/message-pane.css b/webroot/rsrc/css/application/conpherence/message-pane.css
index 075ef3b702..a458e5dd4a 100644
--- a/webroot/rsrc/css/application/conpherence/message-pane.css
+++ b/webroot/rsrc/css/application/conpherence/message-pane.css
@@ -136,7 +136,7 @@
 
 .conpherence-message-pane .date-marker {
   border-top: 1px solid #d7d7d7;
-  margin: 5px 15px;
+  margin: 12px 15px 4px;
   min-height: auto;
 }
 .device-phone .conpherence-message-pane .date-marker {
@@ -144,11 +144,11 @@
 }
 .conpherence-message-pane .date-marker .date {
   position: relative;
-  top: -8px;
+  top: -11px;
   left: 40px;
   background-color: #FFF;
-  color: #bfbfbf;
-  font-size: 11px;
+  color: {$bluetext};
+  font-size: 12px;
   padding: 0px 5px;
 }
 .device-phone .conpherence-message-pane .phabricator-transaction-detail {