From d0f477f17018fa483560a5b231ad567e5f614124 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@chadsdomain.com>
Date: Tue, 11 Nov 2014 08:26:49 -0800
Subject: [PATCH] Clean up line-height on feed stories

Summary: Resets line-height, removes unused CSS.

Test Plan: Test long paragraphs in feed stories.

Reviewers: btrahan, epriestley

Reviewed By: epriestley

Subscribers: Korvin, epriestley

Differential Revision: https://secure.phabricator.com/D10828
---
 resources/celerity/map.php                |  4 ++--
 webroot/rsrc/css/phui/phui-feed-story.css | 24 +++++------------------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index ead164bbeb..6dbecaccf4 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -124,7 +124,7 @@ return array(
     'rsrc/css/phui/phui-box.css' => '7b3a2eed',
     'rsrc/css/phui/phui-button.css' => 'c7412aa1',
     'rsrc/css/phui/phui-document.css' => 'a5615198',
-    'rsrc/css/phui/phui-feed-story.css' => '55dc7732',
+    'rsrc/css/phui/phui-feed-story.css' => 'dd3c5ff5',
     'rsrc/css/phui/phui-fontkit.css' => '9c3d2dce',
     'rsrc/css/phui/phui-form-view.css' => 'a3efd18c',
     'rsrc/css/phui/phui-form.css' => 'b78ec020',
@@ -772,7 +772,7 @@ return array(
     'phui-calendar-list-css' => 'c1d0ca59',
     'phui-calendar-month-css' => 'a92e47d2',
     'phui-document-view-css' => 'a5615198',
-    'phui-feed-story-css' => '55dc7732',
+    'phui-feed-story-css' => 'dd3c5ff5',
     'phui-font-icon-base-css' => '3dad2ae3',
     'phui-fontkit-css' => '9c3d2dce',
     'phui-form-css' => 'b78ec020',
diff --git a/webroot/rsrc/css/phui/phui-feed-story.css b/webroot/rsrc/css/phui/phui-feed-story.css
index f53a2dcbf9..11cdde9de8 100644
--- a/webroot/rsrc/css/phui/phui-feed-story.css
+++ b/webroot/rsrc/css/phui/phui-feed-story.css
@@ -35,6 +35,10 @@
   overflow: hidden;
 }
 
+.phui-feed-story-body.phabricator-remarkup {
+  line-height: inherit;
+}
+
 .phui-feed-story-foot {
   font-size: 11px;
   background: {$lightgreybackground};
@@ -47,8 +51,7 @@
   color: {$greytext};
 }
 
-.phui-feed-story-foot .phui-icon-view,
-.phui-feed-story-oneline-foot .phui-icon-view {
+.phui-feed-story-foot .phui-icon-view {
   float: left;
   display: inline-block;
   margin-right: 5px;
@@ -94,20 +97,3 @@
 .phui-feed-story-action-list .phui-icon-view {
   display: block;
 }
-
-.phui-feed-story-oneline .phui-feed-story-head {
-  padding: 8px;
-}
-
-.phui-feed-story-oneline .phui-feed-story-body {
-  padding: 0;
-}
-
-.phui-feed-story-oneline-foot,
-.phui-feed-story-oneline-foot a {
-  font-size: 11px;
-  color: {$lightgreytext};
-  margin-top: 2px;
-  line-height: 14px;
-  font-weight: normal;
-}