Page MenuHomePhabricator
Files F15502779

D20251.id48343.diff
No OneTemporary
Actions

D20251.id48343.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
@@ -11,7 +11,7 @@
'conpherence.pkg.js' => '020aebcf',
'core.pkg.css' => '34ce1741',
'core.pkg.js' => '2cda17a4',
- 'differential.pkg.css' => 'ab23bd75',
+ 'differential.pkg.css' => '1755a478',
'differential.pkg.js' => '67e02996',
'diffusion.pkg.css' => '42c75c37',
'diffusion.pkg.js' => '91192d85',
@@ -61,7 +61,7 @@
'rsrc/css/application/dashboard/dashboard.css' => '4267d6c6',
'rsrc/css/application/diff/inline-comment-summary.css' => '81eb368d',
'rsrc/css/application/differential/add-comment.css' => '7e5900d9',
- 'rsrc/css/application/differential/changeset-view.css' => 'd92bed0d',
+ 'rsrc/css/application/differential/changeset-view.css' => '4193eeff',
'rsrc/css/application/differential/core.css' => '7300a73e',
'rsrc/css/application/differential/phui-inline-comment.css' => '48acce5b',
'rsrc/css/application/differential/revision-comment.css' => '7dbc8d1d',
@@ -540,7 +540,7 @@
'conpherence-thread-manager' => 'aec8e38c',
'conpherence-transaction-css' => '3a3f5e7e',
'd3' => 'd67475f5',
- 'differential-changeset-view-css' => 'd92bed0d',
+ 'differential-changeset-view-css' => '4193eeff',
'differential-core-view-css' => '7300a73e',
'differential-revision-add-comment-css' => '7e5900d9',
'differential-revision-comment-css' => '7dbc8d1d',
@@ -1220,6 +1220,9 @@
'javelin-behavior',
'javelin-uri',
),
+ '4193eeff' => array(
+ 'phui-inline-comment-view-css',
+ ),
'4234f572' => array(
'syntax-default-css',
),
@@ -1997,9 +2000,6 @@
'javelin-util',
'phabricator-shaped-request',
),
- 'd92bed0d' => array(
- 'phui-inline-comment-view-css',
- ),
'da15d3dc' => array(
'phui-oi-list-view-css',
),
diff --git a/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php b/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php
--- a/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php
+++ b/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php
@@ -162,7 +162,20 @@
} else if (empty($new_lines[$ii])) {
$o_class = 'old old-full';
} else {
- $o_class = 'old';
+ if (isset($depth_only[$ii])) {
+ if ($depth_only[$ii] == '>') {
+ // When a line has depth-only change, we only highlight the
+ // left side of the diff if the depth is decreasing. When the
+ // depth is increasing, the ">>" marker on the right hand side
+ // of the diff generally provides enough visibility on its own.
+
+ $o_class = '';
+ } else {
+ $o_class = 'old';
+ }
+ } else {
+ $o_class = 'old';
+ }
}
$o_classes = $o_class;
}
@@ -200,13 +213,10 @@
} else if (empty($old_lines[$ii])) {
$n_class = 'new new-full';
} else {
-
- // NOTE: At least for the moment, I'm intentionally clearing the
- // line highlighting only on the right side of the diff when a
- // line has only depth changes. When a block depth is decreased,
- // this gives us a large color block on the left (to make it easy
- // to see the depth change) but a clean diff on the right (to make
- // it easy to pick out actual code changes).
+ // When a line has a depth-only change, never highlight it on
+ // the right side. The ">>" marker generally provides enough
+ // visibility on its own for indent depth increases, and the left
+ // side is still highlighted for indent depth decreases.
if (isset($depth_only[$ii])) {
$n_class = '';
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
@@ -126,6 +126,9 @@
background-size: 12px 12px;
background-repeat: no-repeat;
background-position: left center;
+ position: relative;
+ left: -8px;
+ opacity: 0.5;
}
.differential-diff td span.depth-out {

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 15, 4:15 AM (1 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7621114
Default Alt Text
D20251.id48343.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility