From a58c5e10b8c3d9041d0645148064397cfb0babcb Mon Sep 17 00:00:00 2001
From: Chad Little <chad@chadsdomain.com>
Date: Mon, 23 Nov 2015 09:06:30 -0800
Subject: [PATCH] Remove margin on blockquote paragraphs in Remarkup

Summary: This paragraph shouldn't get extra margin when inside a blockquote.

Test Plan: Quote some text, see less margin.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D14549
---
 resources/celerity/map.php         | 6 +++---
 webroot/rsrc/css/core/remarkup.css | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index c68dda640c..d746796b00 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
  */
 return array(
   'names' => array(
-    'core.pkg.css' => '3f4a6760',
+    'core.pkg.css' => '5e982028',
     'core.pkg.js' => '47dc9ebb',
     'darkconsole.pkg.js' => 'e7393ebb',
     'differential.pkg.css' => '2de124c9',
@@ -104,7 +104,7 @@ return array(
     'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
     'rsrc/css/application/uiexample/example.css' => '528b19de',
     'rsrc/css/core/core.css' => '78e8d7ea',
-    'rsrc/css/core/remarkup.css' => '306fb6dc',
+    'rsrc/css/core/remarkup.css' => '88e1ebb6',
     'rsrc/css/core/syntax.css' => '9fd11da8',
     'rsrc/css/core/z-index.css' => '57ddcaa2',
     'rsrc/css/diviner/diviner-shared.css' => 'aa3656aa',
@@ -749,7 +749,7 @@ return array(
     'phabricator-object-selector-css' => '85ee8ce6',
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => '6920d200',
-    'phabricator-remarkup-css' => '306fb6dc',
+    'phabricator-remarkup-css' => '88e1ebb6',
     'phabricator-search-results-css' => '7dea472c',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-side-menu-view-css' => 'bec2458e',
diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css
index da7b0a1dcc..f7b2c22364 100644
--- a/webroot/rsrc/css/core/remarkup.css
+++ b/webroot/rsrc/css/core/remarkup.css
@@ -171,6 +171,10 @@
   background-color: {$lightbluebackground};
 }
 
+.phabricator-remarkup blockquote p {
+  margin: 0;
+}
+
 .phabricator-remarkup blockquote blockquote {
   background-color: rgba(175,175,175, .1);
 }