Page MenuHomePhabricator
Files F13966539

D16098.id38729.diff
No OneTemporary
Actions

D16098.id38729.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@
'core.pkg.css' => '6913fe66',
'core.pkg.js' => '10275c16',
'darkconsole.pkg.js' => 'e7393ebb',
- 'differential.pkg.css' => 'f3fb8324',
+ 'differential.pkg.css' => 'b3eea3f5',
'differential.pkg.js' => '4b7d8f19',
'diffusion.pkg.css' => '91c5d3a6',
'diffusion.pkg.js' => '3a9a8bfa',
@@ -57,7 +57,7 @@
'rsrc/css/application/dashboard/dashboard.css' => 'bc6f2127',
'rsrc/css/application/diff/inline-comment-summary.css' => '51efda3a',
'rsrc/css/application/differential/add-comment.css' => 'c47f8c40',
- 'rsrc/css/application/differential/changeset-view.css' => '805f1141',
+ 'rsrc/css/application/differential/changeset-view.css' => 'ccfbc869',
'rsrc/css/application/differential/core.css' => '5b7b8ff4',
'rsrc/css/application/differential/phui-inline-comment.css' => '5953c28e',
'rsrc/css/application/differential/revision-comment.css' => '14b8565a',
@@ -553,7 +553,7 @@
'conpherence-update-css' => 'faf6be09',
'conpherence-widget-pane-css' => '775eaaba',
'd3' => 'a11a5ff2',
- 'differential-changeset-view-css' => '805f1141',
+ 'differential-changeset-view-css' => 'ccfbc869',
'differential-core-view-css' => '5b7b8ff4',
'differential-inline-comment-editor' => '64a5550f',
'differential-revision-add-comment-css' => 'c47f8c40',
@@ -1528,9 +1528,6 @@
'javelin-vector',
'javelin-stratcom',
),
- '805f1141' => array(
- 'phui-inline-comment-view-css',
- ),
'834a1173' => array(
'javelin-behavior',
'javelin-scrollbar',
@@ -1926,6 +1923,9 @@
'javelin-util',
'phabricator-notification-css',
),
+ 'ccfbc869' => array(
+ 'phui-inline-comment-view-css',
+ ),
'cf86d16a' => array(
'javelin-behavior',
'javelin-dom',
diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionTextDiffDetailView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionTextDiffDetailView.php
--- a/src/applications/transactions/view/PhabricatorApplicationTransactionTextDiffDetailView.php
+++ b/src/applications/transactions/view/PhabricatorApplicationTransactionTextDiffDetailView.php
@@ -33,11 +33,24 @@
);
$new_styles = implode(' ', $new_styles);
+ $omit_styles = array(
+ 'padding: 8px 0;',
+ );
+ $omit_styles = implode(' ', $omit_styles);
+
$result = array();
- foreach ($diff->getParts() as $part) {
+ foreach ($diff->getSummaryParts() as $part) {
$type = $part['type'];
$text = $part['text'];
switch ($type) {
+ case '.':
+ $result[] = phutil_tag(
+ 'div',
+ array(
+ 'style' => $omit_styles,
+ ),
+ pht('...'));
+ break;
case '-':
$result[] = phutil_tag(
'span',
@@ -62,8 +75,13 @@
$styles = array(
'white-space: pre-wrap;',
+ 'color: #74777D;',
);
+ // Beyond applying "pre-wrap", convert newlines to "<br />" explicitly
+ // to improve behavior in clients like Airmail.
+ $result = phutil_escape_html_newlines($result);
+
return phutil_tag(
'div',
array(
diff --git a/webroot/rsrc/css/application/differential/changeset-view.css b/webroot/rsrc/css/application/differential/changeset-view.css
--- a/webroot/rsrc/css/application/differential/changeset-view.css
+++ b/webroot/rsrc/css/application/differential/changeset-view.css
@@ -95,6 +95,7 @@
.prose-diff {
white-space: pre-wrap;
+ color: {$greytext};
}
.prose-diff-frame {

File Metadata

Mime Type
text/plain
Expires
Oct 17 2024, 8:26 AM (4 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6717274
Default Alt Text
D16098.id38729.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility