From dc53d8a7f32b8982559f293c21265ea22b2dfc27 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Tue, 16 Jun 2015 06:46:53 -0700
Subject: [PATCH] [Redesign] Misc Buggypoos

Summary:
- Give preference to Segoe on Windows
- Move to Lato headers except documents
- Fix diviner issues
- Fix feed overwriting line-height
- Fix apps launcher
- Fix infoview + listview
- Make tall headers less tall
- Legalpad, Diviner tweaks

Test Plan: Random surfing. @epriestley can you just commit this for me, connection generally shitty.

Reviewers: btrahan, epriestley

Reviewed By: epriestley

Subscribers: Korvin, epriestley

Differential Revision: https://secure.phabricator.com/D13305
---
 resources/celerity/map.php                    | 62 +++++++++----------
 .../celerity/CelerityResourceTransformer.php  | 10 +--
 .../meta/query/PhabricatorAppSearchEngine.php |  2 +-
 src/view/phui/PHUIHeaderView.php              | 10 ---
 webroot/rsrc/css/diviner/diviner-shared.css   | 14 +++--
 webroot/rsrc/css/phui/phui-document.css       |  4 ++
 webroot/rsrc/css/phui/phui-feed-story.css     |  5 --
 webroot/rsrc/css/phui/phui-fontkit.css        | 14 +++--
 webroot/rsrc/css/phui/phui-header-view.css    |  5 +-
 webroot/rsrc/css/phui/phui-list.css           |  7 +++
 .../css/phui/phui-object-item-list-view.css   | 18 +-----
 11 files changed, 72 insertions(+), 79 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 55e1a5d2d0..f44ebf10fb 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,10 +7,10 @@
  */
 return array(
   'names' => array(
-    'core.pkg.css' => 'a50fc769',
+    'core.pkg.css' => '9993fd3a',
     'core.pkg.js' => '41f5edc5',
     'darkconsole.pkg.js' => 'e7393ebb',
-    'differential.pkg.css' => '49c9d302',
+    'differential.pkg.css' => 'fe951924',
     'differential.pkg.js' => 'ebef29b1',
     'diffusion.pkg.css' => '385e85b3',
     'diffusion.pkg.js' => '0115b37c',
@@ -58,9 +58,9 @@ return array(
     'rsrc/css/application/dashboard/dashboard.css' => 'eb458607',
     'rsrc/css/application/diff/inline-comment-summary.css' => '51efda3a',
     'rsrc/css/application/differential/add-comment.css' => 'c47f8c40',
-    'rsrc/css/application/differential/changeset-view.css' => '73712bee',
+    'rsrc/css/application/differential/changeset-view.css' => '9b8e8bb7',
     'rsrc/css/application/differential/core.css' => '7ac3cabc',
-    'rsrc/css/application/differential/phui-inline-comment.css' => 'e60ad106',
+    'rsrc/css/application/differential/phui-inline-comment.css' => 'fa5b8d1f',
     'rsrc/css/application/differential/results-table.css' => '181aa9d9',
     'rsrc/css/application/differential/revision-comment.css' => '14b8565a',
     'rsrc/css/application/differential/revision-history.css' => '0e8eb855',
@@ -107,11 +107,11 @@ return array(
     'rsrc/css/application/slowvote/slowvote.css' => '266df6a1',
     'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
     'rsrc/css/application/uiexample/example.css' => '528b19de',
-    'rsrc/css/core/core.css' => 'd3a3978f',
+    'rsrc/css/core/core.css' => '47adcf87',
     'rsrc/css/core/remarkup.css' => '13368efd',
     'rsrc/css/core/syntax.css' => '9fd11da8',
     'rsrc/css/core/z-index.css' => '63689f49',
-    'rsrc/css/diviner/diviner-shared.css' => '38813222',
+    'rsrc/css/diviner/diviner-shared.css' => '7545fd9e',
     'rsrc/css/font/font-awesome.css' => 'e2e712fe',
     'rsrc/css/font/font-lato.css' => '5f05d817',
     'rsrc/css/font/font-slabo.css' => '1f520937',
@@ -127,21 +127,21 @@ return array(
     'rsrc/css/phui/phui-action-list.css' => '32c388b3',
     'rsrc/css/phui/phui-action-panel.css' => '3ee9afd5',
     'rsrc/css/phui/phui-box.css' => 'a5bb366d',
-    'rsrc/css/phui/phui-button.css' => '5ccb5ce4',
+    'rsrc/css/phui/phui-button.css' => 'f4d9c140',
     'rsrc/css/phui/phui-crumbs-view.css' => 'ce840ec2',
-    'rsrc/css/phui/phui-document.css' => '7f67a837',
-    'rsrc/css/phui/phui-feed-story.css' => '153a2ebf',
-    'rsrc/css/phui/phui-fontkit.css' => 'ce1ce3ca',
+    'rsrc/css/phui/phui-document.css' => 'bc45d313',
+    'rsrc/css/phui/phui-feed-story.css' => '25913b7b',
+    'rsrc/css/phui/phui-fontkit.css' => '28739edc',
     'rsrc/css/phui/phui-form-view.css' => 'a0e8f168',
-    'rsrc/css/phui/phui-form.css' => '1ecbc461',
-    'rsrc/css/phui/phui-header-view.css' => '44fc449c',
+    'rsrc/css/phui/phui-form.css' => '17ce37a9',
+    'rsrc/css/phui/phui-header-view.css' => '0524711d',
     'rsrc/css/phui/phui-icon.css' => '88ba9081',
     'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8',
     'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
     'rsrc/css/phui/phui-info-view.css' => '33e54618',
-    'rsrc/css/phui/phui-list.css' => 'e448b6ba',
-    'rsrc/css/phui/phui-object-box.css' => '4fd75233',
-    'rsrc/css/phui/phui-object-item-list-view.css' => 'bf7463f7',
+    'rsrc/css/phui/phui-list.css' => '02ab3534',
+    'rsrc/css/phui/phui-object-box.css' => '3db9f358',
+    'rsrc/css/phui/phui-object-item-list-view.css' => 'a7d38075',
     'rsrc/css/phui/phui-pager.css' => 'bea33d23',
     'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
     'rsrc/css/phui/phui-property-list-view.css' => '1baf23eb',
@@ -507,7 +507,7 @@ return array(
     'conpherence-transaction-css' => '85d0974c',
     'conpherence-update-css' => '1099a660',
     'conpherence-widget-pane-css' => '6e0e290b',
-    'differential-changeset-view-css' => '73712bee',
+    'differential-changeset-view-css' => '9b8e8bb7',
     'differential-core-view-css' => '7ac3cabc',
     'differential-inline-comment-editor' => 'd4c87bf4',
     'differential-results-table-css' => '181aa9d9',
@@ -519,7 +519,7 @@ return array(
     'diffusion-icons-css' => '4ba18923',
     'diffusion-readme-css' => '2106ea08',
     'diffusion-source-css' => '66fdf661',
-    'diviner-shared-css' => '38813222',
+    'diviner-shared-css' => '7545fd9e',
     'font-fontawesome' => 'e2e712fe',
     'font-lato' => '5f05d817',
     'font-slabo' => '1f520937',
@@ -708,7 +708,7 @@ return array(
     'phabricator-busy' => '59a7976a',
     'phabricator-chatlog-css' => 'f1971c1c',
     'phabricator-content-source-view-css' => '4b8b05d4',
-    'phabricator-core-css' => 'd3a3978f',
+    'phabricator-core-css' => '47adcf87',
     'phabricator-countdown-css' => '86b7b0a0',
     'phabricator-dashboard-css' => 'eb458607',
     'phabricator-drag-and-drop-file-upload' => '07de8873',
@@ -763,27 +763,27 @@ return array(
     'phriction-document-css' => 'd1861e06',
     'phui-action-panel-css' => '3ee9afd5',
     'phui-box-css' => 'a5bb366d',
-    'phui-button-css' => '5ccb5ce4',
+    'phui-button-css' => 'f4d9c140',
     'phui-calendar-css' => 'ccabe893',
     'phui-calendar-day-css' => 'd1cf6f93',
     'phui-calendar-list-css' => 'c1c7f338',
     'phui-calendar-month-css' => '476be7e0',
     'phui-crumbs-view-css' => 'ce840ec2',
-    'phui-document-view-css' => '7f67a837',
-    'phui-feed-story-css' => '153a2ebf',
+    'phui-document-view-css' => 'bc45d313',
+    'phui-feed-story-css' => '25913b7b',
     'phui-font-icon-base-css' => '3dad2ae3',
-    'phui-fontkit-css' => 'ce1ce3ca',
-    'phui-form-css' => '1ecbc461',
+    'phui-fontkit-css' => '28739edc',
+    'phui-form-css' => '17ce37a9',
     'phui-form-view-css' => 'a0e8f168',
-    'phui-header-view-css' => '44fc449c',
+    'phui-header-view-css' => '0524711d',
     'phui-icon-view-css' => '88ba9081',
     'phui-image-mask-css' => '5a8b09c8',
     'phui-info-panel-css' => '27ea50a1',
     'phui-info-view-css' => '33e54618',
-    'phui-inline-comment-view-css' => 'e60ad106',
-    'phui-list-view-css' => 'e448b6ba',
-    'phui-object-box-css' => '4fd75233',
-    'phui-object-item-list-view-css' => 'bf7463f7',
+    'phui-inline-comment-view-css' => 'fa5b8d1f',
+    'phui-list-view-css' => '02ab3534',
+    'phui-object-box-css' => '3db9f358',
+    'phui-object-item-list-view-css' => 'a7d38075',
     'phui-pager-css' => 'bea33d23',
     'phui-pinboard-view-css' => '2495140e',
     'phui-property-list-view-css' => '1baf23eb',
@@ -1373,9 +1373,6 @@ return array(
       'javelin-behavior',
       'javelin-dom',
     ),
-    '73712bee' => array(
-      'phui-inline-comment-view-css',
-    ),
     '73d09eef' => array(
       'javelin-behavior',
       'javelin-vector',
@@ -1575,6 +1572,9 @@ return array(
       'javelin-dom',
       'javelin-reactor-dom',
     ),
+    '9b8e8bb7' => array(
+      'phui-inline-comment-view-css',
+    ),
     '9f36c42d' => array(
       'javelin-behavior',
       'javelin-stratcom',
diff --git a/src/applications/celerity/CelerityResourceTransformer.php b/src/applications/celerity/CelerityResourceTransformer.php
index a278400021..f93817d384 100644
--- a/src/applications/celerity/CelerityResourceTransformer.php
+++ b/src/applications/celerity/CelerityResourceTransformer.php
@@ -172,11 +172,13 @@ final class CelerityResourceTransformer extends Phobject {
   public static function getCSSVariableMap() {
     return array(
       // Fonts
-      'basefont' => "13px/1.231 'Lato', 'Segoe UI', 'Segoe UI Web Regular', ".
-        "'Segoe UI Symbol', 'Helvetica Neue', Helvetica, Arial, sans-serif",
+      'basefont' => "13px 'Segoe UI', 'Segoe UI Web Regular', ".
+        "'Segoe UI Symbol', 'Lato', 'Helvetica Neue', Helvetica, ".
+        "Arial, sans-serif",
 
-      'fontfamily' => "'Lato', 'Segoe UI', 'Segoe UI Web Regular', ".
-        "'Segoe UI Symbol', 'Helvetica Neue', Helvetica, Arial, sans-serif",
+      'fontfamily' => "'Segoe UI', 'Segoe UI Web Regular', ".
+        "'Segoe UI Symbol', 'Lato', 'Helvetica Neue', Helvetica, ".
+        "Arial, sans-serif",
 
       // Drop Shadow
       'dropshadow' => '0 1px 6px rgba(0, 0, 0, .25)',
diff --git a/src/applications/meta/query/PhabricatorAppSearchEngine.php b/src/applications/meta/query/PhabricatorAppSearchEngine.php
index a9244430ae..32422ee93e 100644
--- a/src/applications/meta/query/PhabricatorAppSearchEngine.php
+++ b/src/applications/meta/query/PhabricatorAppSearchEngine.php
@@ -201,7 +201,7 @@ final class PhabricatorAppSearchEngine
         $results[] = phutil_tag(
           'h1',
           array(
-            'class' => 'launcher-header',
+            'class' => 'phui-object-item-list-header',
           ),
           idx($group_names, $group, $group));
       }
diff --git a/src/view/phui/PHUIHeaderView.php b/src/view/phui/PHUIHeaderView.php
index 9859d56454..2dec5f7689 100644
--- a/src/view/phui/PHUIHeaderView.php
+++ b/src/view/phui/PHUIHeaderView.php
@@ -264,16 +264,6 @@ final class PHUIHeaderView extends AphrontTagView {
       ),
       $this->header);
 
-    if ($this->tags) {
-      $left[] = ' ';
-      $left[] = phutil_tag(
-        'span',
-        array(
-          'class' => 'phui-header-tags',
-        ),
-        array_interleave(' ', $this->tags));
-    }
-
     if ($this->subheader) {
       $left[] = phutil_tag(
         'div',
diff --git a/webroot/rsrc/css/diviner/diviner-shared.css b/webroot/rsrc/css/diviner/diviner-shared.css
index 7057c51c5a..a0a23b5f18 100644
--- a/webroot/rsrc/css/diviner/diviner-shared.css
+++ b/webroot/rsrc/css/diviner/diviner-shared.css
@@ -65,10 +65,16 @@
   padding: 0 8px 16px 0;
 }
 
-body .diviner-document-section .phui-header-view {
+body .diviner-document-section .phui-header-header {
   width: 100%;
   font-size: 20px;
-  font-weight: 400;
+  font-weight: bold;
+  margin: 0;
+  padding: 0;
+}
+
+body .diviner-document-section .phui-header-shell.phui-bleed-header {
+  padding: 0;
 }
 
 .phui-property-list-view + .diviner-document-section {
@@ -150,8 +156,8 @@ body .diviner-document-section .phui-header-view {
 
 .diviner-book-item-title {
   font-weight: 700;
-  font-size: 16px;
-  color: {$darkbluetext};
+  font-size: 15px;
+  color: {$bluetext};
 }
 
 .diviner-book-item-type {
diff --git a/webroot/rsrc/css/phui/phui-document.css b/webroot/rsrc/css/phui/phui-document.css
index 90f57993f3..dd19a4071a 100644
--- a/webroot/rsrc/css/phui/phui-document.css
+++ b/webroot/rsrc/css/phui/phui-document.css
@@ -166,3 +166,7 @@
 .device-phone .phui-document-view .remarkup-has-toc .phabricator-remarkup-toc {
   display: none;
 }
+
+body .phui-document-view .phui-header-shell.phui-bleed-header {
+  padding: 0;
+}
diff --git a/webroot/rsrc/css/phui/phui-feed-story.css b/webroot/rsrc/css/phui/phui-feed-story.css
index ce26558528..df932b21ac 100644
--- a/webroot/rsrc/css/phui/phui-feed-story.css
+++ b/webroot/rsrc/css/phui/phui-feed-story.css
@@ -34,11 +34,6 @@
   word-break: break-word;
   max-height: 300px;
   overflow: hidden;
-  line-height: 18px;
-}
-
-.phui-feed-story-body.phabricator-remarkup {
-  line-height: inherit;
 }
 
 .phui-feed-story-foot {
diff --git a/webroot/rsrc/css/phui/phui-fontkit.css b/webroot/rsrc/css/phui/phui-fontkit.css
index fbe8a133ce..8f10f00dda 100644
--- a/webroot/rsrc/css/phui/phui-fontkit.css
+++ b/webroot/rsrc/css/phui/phui-fontkit.css
@@ -8,15 +8,17 @@
 
 */
 
-.phui-object-box :first-child .phui-header-header,
 .phui-document-view .phui-header-tall .phui-header-header,
-.aphront-dialog-head .phui-header-header {
-  font-family: 'Slabo', {$fontfamily};
-}
-
-.phui-document-view .phui-header-header {
+.diviner-document-section .phui-header-header {
   font-family: 'Slabo', {$fontfamily};
   color: {$darkbluetext};
+  font-size: 22px;
+}
+
+.diviner-document-section .phui-header-header {
+  font-family: 'Slabo', {$fontfamily};
+  color: {$darkbluetext};
+  font-size: 20px;
 }
 
 .phui-document-view .phabricator-remarkup h1.remarkup-header,
diff --git a/webroot/rsrc/css/phui/phui-header-view.css b/webroot/rsrc/css/phui/phui-header-view.css
index 0ff2bce7c3..7950499b5d 100644
--- a/webroot/rsrc/css/phui/phui-header-view.css
+++ b/webroot/rsrc/css/phui/phui-header-view.css
@@ -69,15 +69,14 @@ body .phui-header-shell.phui-bleed-header
 }
 
 .phui-header-header {
-  font-size: 18px;
-  font-weight: bold;
+  font-size: 16px;
   line-height: 24px;
   color: {$darkbluetext};
 }
 
 .phui-object-box .phui-header-tall .phui-header-header,
 .phui-document-view .phui-header-tall .phui-header-header {
-  font-size: 20px;
+  font-size: 18px;
 }
 
 .phui-header-view .phui-header-header a {
diff --git a/webroot/rsrc/css/phui/phui-list.css b/webroot/rsrc/css/phui/phui-list.css
index 6a8ecb8de9..8de292c24e 100644
--- a/webroot/rsrc/css/phui/phui-list.css
+++ b/webroot/rsrc/css/phui/phui-list.css
@@ -175,3 +175,10 @@
   border-right: 1px solid {$lightblueborder};
   border-bottom: 1px solid {$thinblueborder};
 }
+
+/* - Info Stack ------------------------------------------------------------ */
+
+.phui-info-view + .phui-list-view {
+  margin-top: 16px;
+  border-top: 1px solid {$thinblueborder};
+}
diff --git a/webroot/rsrc/css/phui/phui-object-item-list-view.css b/webroot/rsrc/css/phui/phui-object-item-list-view.css
index 64d066eae8..ce0e2973f2 100644
--- a/webroot/rsrc/css/phui/phui-object-item-list-view.css
+++ b/webroot/rsrc/css/phui/phui-object-item-list-view.css
@@ -613,14 +613,15 @@ ul.phui-object-item-list-view .phui-object-item-selected
   border-top: 1px solid {$thinblueborder};
   border-bottom: 1px solid {$thinblueborder};
   padding: 8px;
-  font-weight: 500;
   background-color: {$lightgreybackground};
 }
 
 .phui-object-box .phui-header-shell + .phui-object-item-list-view
  .phui-object-item-list-header,
 .phui-object-box .phui-object-box-hidden-content + .phui-object-item-list-view
- .phui-object-item-list-header {
+ .phui-object-item-list-header,
+.phui-object-box .phui-object-box-hidden-content +
+  .phui-object-item-list-header {
    border-top: none;
  }
 
@@ -637,19 +638,6 @@ ul.phui-object-item-list-view .phui-object-item-selected
 
 /* - Launcher List ---------------------------------------------------------- */
 
-.launcher-header {
-  padding: 8px 4px;
-  font-weight: 500;
-  color: {$blue};
-  font-size: 13px;
-  border-top: 1px solid {$thinblueborder};
-  border-bottom: 1px solid {$thinblueborder};
-}
-
-.phui-header-shell + .launcher-header {
-  border-top: none;
-}
-
 .phui-object-item-image-icon {
   background: none;
   width: 30px;