diff --git a/src/applications/differential/mail/DifferentialInlineCommentMailView.php b/src/applications/differential/mail/DifferentialInlineCommentMailView.php --- a/src/applications/differential/mail/DifferentialInlineCommentMailView.php +++ b/src/applications/differential/mail/DifferentialInlineCommentMailView.php @@ -181,23 +181,24 @@ $content = $this->renderRemarkupContent($content, $is_html); if ($is_quote) { - if ($is_html) { - $style = array( - 'padding: 4px 0;', - ); - - $content = phutil_tag( - 'div', - array( - 'style' => implode(' ', $style), - ), - $content); - } $header = $this->renderHeader($comment, $is_html, true); } else { $header = null; } + if ($is_html) { + $style = array( + 'padding: 4px 8px;', + ); + + $content = phutil_tag( + 'div', + array( + 'style' => implode(' ', $style), + ), + $content); + } + $parts = array( $header, "\n", @@ -230,9 +231,14 @@ $mode = PhutilRemarkupEngine::MODE_TEXT; } + $attributes = array( + 'style' => 'padding: 0; margin: 0;', + ); + $engine = PhabricatorMarkupEngine::newMarkupEngine(array()) ->setConfig('viewer', $viewer) ->setConfig('uri.base', $production_uri) + ->setConfig('default.p.attributes', $attributes) ->setMode($mode); try { @@ -264,9 +270,8 @@ private function quoteHTML($block) { $styles = array( - 'padding: 4px 8px;', - 'background: #F8F9FC;', - 'border-left: 3px solid #a7b5bf;', + 'padding: 0;', + 'border: 1px solid #f1f2f4;', 'margin: 4px 0 0;', ); @@ -402,7 +407,7 @@ $header = phutil_tag( 'span', array( - 'style' => 'color: #000000', + 'style' => 'color: #4b4d51; font-weight: bold;', ), $header); } @@ -420,21 +425,25 @@ $byline = phutil_tag( 'span', array( - 'style' => 'color: #000000', + 'style' => 'color: #4b4d51; font-weight: bold;', ), $byline); } $header = pht('%s wrote in %s', $byline, $header); - } else { - $header = pht('In %s', $header); } if ($is_html) { + $style = array( + 'color: #74777d;', + 'background: #eff2f4;', + 'padding: 4px 8px;', + ); + $header = phutil_tag( 'div', array( - 'style' => 'font-style: italic; color: #74777d', + 'style' => implode(' ', $style), ), $header); } diff --git a/src/applications/differential/render/DifferentialChangesetOneUpMailRenderer.php b/src/applications/differential/render/DifferentialChangesetOneUpMailRenderer.php --- a/src/applications/differential/render/DifferentialChangesetOneUpMailRenderer.php +++ b/src/applications/differential/render/DifferentialChangesetOneUpMailRenderer.php @@ -73,7 +73,7 @@ } } - $style = "padding: 0 2px; {$style}"; + $style = "padding: 0 8px; margin: 0 4px; {$style}"; $out[] = phutil_tag( 'div',