@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
Tweak some display behaviors for indent indicators
Summary:
Ref T13161.
- Don't show ">>" when the line indentation changed but the text also changed, this is just "the line changed".
- The indicator seems a little cleaner if we just reuse the existing "bright" colors, which already have colorblind colors anyway.
Test Plan: Got slightly better rendering for some diffs locally.
Reviewers: amckinley
Reviewed By: amckinley
Maniphest Tasks: T13161
Differential Revision: https://secure.phabricator.com/D20195
+10
-12
+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' => '249b542d',
14
+
'differential.pkg.css' => '9f215e54',
15
15
'differential.pkg.js' => '53f8d00c',
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' => 'cc3fd795',
64
+
'rsrc/css/application/differential/changeset-view.css' => 'de570228',
65
65
'rsrc/css/application/differential/core.css' => 'bdb93065',
66
66
'rsrc/css/application/differential/phui-inline-comment.css' => '48acce5b',
67
67
'rsrc/css/application/differential/revision-comment.css' => '7dbc8d1d',
···
541
541
'conpherence-thread-manager' => 'aec8e38c',
542
542
'conpherence-transaction-css' => '3a3f5e7e',
543
543
'd3' => 'd67475f5',
544
-
'differential-changeset-view-css' => 'cc3fd795',
544
+
'differential-changeset-view-css' => 'de570228',
545
545
'differential-core-view-css' => 'bdb93065',
546
546
'differential-revision-add-comment-css' => '7e5900d9',
547
547
'differential-revision-comment-css' => '7dbc8d1d',
···
1961
1961
'javelin-util',
1962
1962
'phabricator-keyboard-shortcut-manager',
1963
1963
),
1964
-
'cc3fd795' => array(
1965
-
'phui-inline-comment-view-css',
1966
-
),
1967
1964
'cf32921f' => array(
1968
1965
'javelin-behavior',
1969
1966
'javelin-dom',
···
2009
2006
'javelin-behavior',
2010
2007
'javelin-uri',
2011
2008
'phabricator-notification',
2009
+
),
2010
+
'de570228' => array(
2011
+
'phui-inline-comment-view-css',
2012
2012
),
2013
2013
'dfa1d313' => array(
2014
2014
'javelin-behavior',
-2
src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php
-2
src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php
···
199
199
'diff.background' => '#fff',
200
200
'new-background' => 'rgba(151, 234, 151, .3)',
201
201
'new-bright' => 'rgba(151, 234, 151, .6)',
202
-
'new-background-strong' => 'rgba(151, 234, 151, 1)',
203
202
'old-background' => 'rgba(251, 175, 175, .3)',
204
203
'old-bright' => 'rgba(251, 175, 175, .7)',
205
-
'old-background-strong' => 'rgba(251, 175, 175, 1)',
206
204
'move-background' => '#fdf5d4',
207
205
'copy-background' => '#f1c40f',
208
206
+1
-1
src/applications/differential/parser/DifferentialHunkParser.php
+1
-1
src/applications/differential/parser/DifferentialHunkParser.php
···
288
288
$o_text = $o['text'];
289
289
$n_text = $n['text'];
290
290
291
-
if ($o_text !== $n_text) {
291
+
if ($o_text !== $n_text && (ltrim($o_text) === ltrim($n_text))) {
292
292
$o_depth = $this->getIndentDepth($o_text, $tab_width);
293
293
$n_depth = $this->getIndentDepth($n_text, $tab_width);
294
294
+3
-3
webroot/rsrc/css/application/differential/changeset-view.css
+3
-3
webroot/rsrc/css/application/differential/changeset-view.css
···
130
130
131
131
.differential-diff td span.depth-out {
132
132
background-image: url(/rsrc/image/chevron-out.png);
133
-
background-color: {$old-background-strong};
133
+
background-color: {$old-bright};
134
134
}
135
135
136
136
.differential-diff td span.depth-in {
137
-
background-position: 2px center;
137
+
background-position: 1px center;
138
138
background-image: url(/rsrc/image/chevron-in.png);
139
-
background-color: {$new-background-strong};
139
+
background-color: {$new-bright};
140
140
}
141
141
142
142