@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
In Differential, give the "moved/copied from" gutter a more clear visual look
Summary:
Depends on D20196. See PHI985. When empty, the "moved/copied" gutter currently renders with the same background color as the rest of the line. This can be misleading because it makes code look more indented than it is, especially if you're unfamiliar with the tool:
{F6225179}
If we remove this misleading coloration, we get a white gap. This is more clear, but looks a little odd:
{F6225181}
Instead, give this gutter a subtle background fill in all casses, to make it more clear that it's a separate gutter region, not a part of the text diff:
{F6225183}
Test Plan: See screenshots. Copied text from a diff, added/removed inlines, etc.
Reviewers: amckinley
Reviewed By: amckinley
Differential Revision: https://secure.phabricator.com/D20197
+25
-17
+6
-6
resources/celerity/map.php
+6
-6
resources/celerity/map.php
···
11
11
'conpherence.pkg.js' => '020aebcf',
12
12
'core.pkg.css' => 'e3c1a8f2',
13
13
'core.pkg.js' => '2cda17a4',
14
-
'differential.pkg.css' => '97e13037',
14
+
'differential.pkg.css' => 'ab23bd75',
15
15
'differential.pkg.js' => '67e02996',
16
16
'diffusion.pkg.css' => '42c75c37',
17
17
'diffusion.pkg.js' => '91192d85',
···
61
61
'rsrc/css/application/dashboard/dashboard.css' => '4267d6c6',
62
62
'rsrc/css/application/diff/inline-comment-summary.css' => '81eb368d',
63
63
'rsrc/css/application/differential/add-comment.css' => '7e5900d9',
64
-
'rsrc/css/application/differential/changeset-view.css' => 'de570228',
64
+
'rsrc/css/application/differential/changeset-view.css' => 'd92bed0d',
65
65
'rsrc/css/application/differential/core.css' => '7300a73e',
66
66
'rsrc/css/application/differential/phui-inline-comment.css' => '48acce5b',
67
67
'rsrc/css/application/differential/revision-comment.css' => '7dbc8d1d',
···
540
540
'conpherence-thread-manager' => 'aec8e38c',
541
541
'conpherence-transaction-css' => '3a3f5e7e',
542
542
'd3' => 'd67475f5',
543
-
'differential-changeset-view-css' => 'de570228',
543
+
'differential-changeset-view-css' => 'd92bed0d',
544
544
'differential-core-view-css' => '7300a73e',
545
545
'differential-revision-add-comment-css' => '7e5900d9',
546
546
'differential-revision-comment-css' => '7dbc8d1d',
···
1997
1997
'javelin-util',
1998
1998
'phabricator-shaped-request',
1999
1999
),
2000
+
'd92bed0d' => array(
2001
+
'phui-inline-comment-view-css',
2002
+
),
2000
2003
'da15d3dc' => array(
2001
2004
'phui-oi-list-view-css',
2002
2005
),
···
2004
2007
'javelin-behavior',
2005
2008
'javelin-uri',
2006
2009
'phabricator-notification',
2007
-
),
2008
-
'de570228' => array(
2009
-
'phui-inline-comment-view-css',
2010
2010
),
2011
2011
'dfa1d313' => array(
2012
2012
'javelin-behavior',
+2
-3
src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php
+2
-3
src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php
···
223
223
($new_lines[$ii]['type'] == '\\');
224
224
225
225
if ($not_copied) {
226
-
$n_copy = phutil_tag('td', array('class' => "copy {$n_class}"));
226
+
$n_copy = phutil_tag('td', array('class' => 'copy'));
227
227
} else {
228
228
list($orig_file, $orig_line, $orig_type) = $copy_lines[$n_num];
229
229
$title = ($orig_type == '-' ? 'Moved' : 'Copied').' from ';
···
243
243
'msg' => $title,
244
244
),
245
245
'class' => 'copy '.$class,
246
-
),
247
-
'');
246
+
));
248
247
}
249
248
}
250
249
}
-1
src/infrastructure/diff/view/PHUIDiffOneUpInlineCommentRowScaffold.php
-1
src/infrastructure/diff/view/PHUIDiffOneUpInlineCommentRowScaffold.php
+2
-2
src/infrastructure/diff/view/PHUIDiffTwoUpInlineCommentRowScaffold.php
+2
-2
src/infrastructure/diff/view/PHUIDiffTwoUpInlineCommentRowScaffold.php
···
65
65
);
66
66
67
67
$right_attrs = array(
68
-
'colspan' => 3,
69
-
'class' => 'right3',
68
+
'colspan' => 2,
70
69
'id' => ($right_side ? $right_side->getScaffoldCellID() : null),
71
70
);
72
71
···
74
73
phutil_tag('td', array('class' => 'n'), $left_hidden),
75
74
phutil_tag('td', $left_attrs, $left_side),
76
75
phutil_tag('td', array('class' => 'n'), $right_hidden),
76
+
phutil_tag('td', array('class' => 'copy')),
77
77
phutil_tag('td', $right_attrs, $right_side),
78
78
);
79
79
+15
-5
webroot/rsrc/css/application/differential/changeset-view.css
+15
-5
webroot/rsrc/css/application/differential/changeset-view.css
···
144
144
min-width: 0.5%;
145
145
width: 0.5%;
146
146
padding: 0;
147
+
background: {$lightbluebackground};
147
148
}
148
149
149
150
.differential-diff td.new-copy,
···
176
177
cursor: pointer;
177
178
border-right: 1px solid {$thinblueborder};
178
179
overflow: hidden;
180
+
}
181
+
182
+
.differential-diff td + td.n {
183
+
border-left: 1px solid {$thinblueborder};
179
184
}
180
185
181
186
.differential-diff td.n::before {
···
443
448
-ms-user-select: none;
444
449
-webkit-user-select: none;
445
450
user-select: none;
446
-
}
447
-
448
-
.differential-diff.copy-l > tbody > tr > td,
449
-
.differential-diff.copy-r > tbody > tr > td {
450
451
opacity: 0.5;
451
452
}
452
453
···
463
464
-ms-user-select: none;
464
465
-webkit-user-select: none;
465
466
user-select: none;
466
-
opacity: 0.25;
467
+
opacity: 0.5;
467
468
}
468
469
469
470
.differential-diff.copy-r > tbody > tr > td:nth-child(5) {
···
473
474
user-select: auto;
474
475
opacity: 1;
475
476
}
477
+
478
+
.differential-diff.copy-l > tbody > tr.inline > td,
479
+
.differential-diff.copy-r > tbody > tr.inline > td {
480
+
-moz-user-select: none;
481
+
-ms-user-select: none;
482
+
-webkit-user-select: none;
483
+
user-select: none;
484
+
opacity: 0.5;
485
+
}