@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
Remove hard-coding of diff line height
Summary: Fixes T10959. This is the smallest/simplest fix that I could come up with, and I wasn't able to break it. Basically, I removed "line-height" and then adjusted other rules until the defaults looked reasonable again.
Test Plan:
Here's `24px / 48px impact` or something like it:
{F1310445}
{F1310446}
Here's normal stuff working properly without weird artifacts on the highlighting:
{F1310447}
Also tested Firefox and Chrome and got similar results.
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: wxm20073527, Korvin
Maniphest Tasks: T10959
Differential Revision: https://secure.phabricator.com/D15905
+22
-28
+12
-12
resources/celerity/map.php
+12
-12
resources/celerity/map.php
···
7
7
*/
8
8
return array(
9
9
'names' => array(
10
-
'core.pkg.css' => 'b7b8d101',
10
+
'core.pkg.css' => '204cabae',
11
11
'core.pkg.js' => '6972d365',
12
12
'darkconsole.pkg.js' => 'e7393ebb',
13
-
'differential.pkg.css' => '7ba78475',
13
+
'differential.pkg.css' => '33da0633',
14
14
'differential.pkg.js' => 'd0cd0df6',
15
15
'diffusion.pkg.css' => '91c5d3a6',
16
16
'diffusion.pkg.js' => '3a9a8bfa',
···
57
57
'rsrc/css/application/dashboard/dashboard.css' => 'bc6f2127',
58
58
'rsrc/css/application/diff/inline-comment-summary.css' => '51efda3a',
59
59
'rsrc/css/application/differential/add-comment.css' => 'c47f8c40',
60
-
'rsrc/css/application/differential/changeset-view.css' => '3e3b0b76',
60
+
'rsrc/css/application/differential/changeset-view.css' => '7bcbe615',
61
61
'rsrc/css/application/differential/core.css' => '5b7b8ff4',
62
62
'rsrc/css/application/differential/phui-inline-comment.css' => '5953c28e',
63
63
'rsrc/css/application/differential/revision-comment.css' => '14b8565a',
···
105
105
'rsrc/css/application/uiexample/example.css' => '528b19de',
106
106
'rsrc/css/core/core.css' => 'd0801452',
107
107
'rsrc/css/core/remarkup.css' => '787105d6',
108
-
'rsrc/css/core/syntax.css' => '5101175d',
108
+
'rsrc/css/core/syntax.css' => '9fc496d5',
109
109
'rsrc/css/core/z-index.css' => '5b6fcf3f',
110
110
'rsrc/css/diviner/diviner-shared.css' => 'aa3656aa',
111
111
'rsrc/css/font/font-aleo.css' => '8bdb2835',
···
550
550
'conpherence-update-css' => 'faf6be09',
551
551
'conpherence-widget-pane-css' => '775eaaba',
552
552
'd3' => 'a11a5ff2',
553
-
'differential-changeset-view-css' => '3e3b0b76',
553
+
'differential-changeset-view-css' => '7bcbe615',
554
554
'differential-core-view-css' => '5b7b8ff4',
555
555
'differential-inline-comment-editor' => '64a5550f',
556
556
'differential-revision-add-comment-css' => 'c47f8c40',
···
881
881
'sprite-menu-css' => '9dd65b92',
882
882
'sprite-tokens-css' => '4f399012',
883
883
'syntax-default-css' => '9923583c',
884
-
'syntax-highlighting-css' => '5101175d',
884
+
'syntax-highlighting-css' => '9fc496d5',
885
885
'tokens-css' => '3d0f239e',
886
886
'typeahead-browse-css' => 'd8581d2c',
887
887
'unhandled-exception-css' => '4c96257a',
···
1148
1148
'javelin-util',
1149
1149
'javelin-uri',
1150
1150
),
1151
-
'3e3b0b76' => array(
1152
-
'phui-inline-comment-view-css',
1153
-
),
1154
1151
'3f5d6dbf' => array(
1155
1152
'javelin-behavior',
1156
1153
'javelin-dom',
···
1242
1239
'javelin-install',
1243
1240
'javelin-typeahead-source',
1244
1241
'javelin-util',
1245
-
),
1246
-
'5101175d' => array(
1247
-
'syntax-default-css',
1248
1242
),
1249
1243
'519705ea' => array(
1250
1244
'javelin-install',
···
1495
1489
'javelin-stratcom',
1496
1490
'javelin-util',
1497
1491
),
1492
+
'7bcbe615' => array(
1493
+
'phui-inline-comment-view-css',
1494
+
),
1498
1495
'7cbe244b' => array(
1499
1496
'javelin-install',
1500
1497
'javelin-util',
···
1659
1656
'javelin-stratcom',
1660
1657
'javelin-dom',
1661
1658
'javelin-vector',
1659
+
),
1660
+
'9fc496d5' => array(
1661
+
'syntax-default-css',
1662
1662
),
1663
1663
'a0b57eb8' => array(
1664
1664
'javelin-behavior',
+7
-8
webroot/rsrc/css/application/differential/changeset-view.css
+7
-8
webroot/rsrc/css/application/differential/changeset-view.css
···
60
60
vertical-align: top;
61
61
white-space: pre-wrap;
62
62
word-wrap: break-word;
63
-
padding: 0 8px 1px;
64
-
line-height: 16px;
63
+
padding: 1px 8px;
65
64
}
66
65
67
66
.device .differential-diff td {
68
-
padding: 0 4px 1px;
67
+
padding: 1px 4px;
69
68
}
70
69
71
70
.device .differential-diff .inline td {
···
79
78
80
79
.differential-diff th {
81
80
text-align: right;
82
-
padding: 2px 6px 0px 0px;
81
+
padding: 1px 6px 1px 0;
83
82
vertical-align: top;
84
83
background: {$lightbluebackground};
85
84
color: {$bluetext};
···
103
102
}
104
103
105
104
.differential-diff td.old {
106
-
background: #ffd0d0;
105
+
background: rgba(251, 175, 175, 0.3);
107
106
}
108
107
109
108
.differential-diff td.new {
110
-
background: #d0ffd0;
109
+
background: rgba(151, 234, 151, .3);
111
110
}
112
111
113
112
.differential-diff td.old-rebase {
···
120
119
121
120
.differential-diff td.old-full,
122
121
.differential-diff td.old span.bright {
123
-
background: #ffaaaa;
122
+
background: rgba(251, 175, 175, 0.8);
124
123
}
125
124
126
125
.differential-diff td.new-full,
127
126
.differential-diff td.new span.bright {
128
-
background: #aaffaa;
127
+
background: rgba(151, 234, 151, .8);
129
128
}
130
129
131
130
.differential-diff td.copy {
+3
-8
webroot/rsrc/css/core/syntax.css
+3
-8
webroot/rsrc/css/core/syntax.css
···
7
7
}
8
8
9
9
.remarkup-code .over-the-line {
10
-
color: #aa0066;
10
+
color: #aa0066;
11
11
margin-right: 1px;
12
12
}
13
13
14
-
.remarkup-code td > span,
15
-
.remarkup-code td > span > span {
16
-
padding: 1px 0 3px;
17
-
}
18
-
19
-
.remarkup-code span.bright {
20
-
border-bottom: 1px solid transparent;
14
+
.remarkup-code td span {
15
+
display: inline-block;
21
16
}
22
17
23
18
.remarkup-code .rbw_r { color: red; }