@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
Update Conpherence CSS to handle multiple edits better
Summary: Fixes T7655. We'll set tighter spacing around edit clusters. Also darkened up the date marker and remove unused `phabricator-transaction-view` CSS that was still scattered around the site.
Test Plan: Test a full and column multi-edit spam. Visited Ponder and Diffusion, noticed no issues using those apps. Grepped for other users of `phabricator-transaction-view`
Reviewers: epriestley, btrahan
Reviewed By: btrahan
Subscribers: Korvin, epriestley
Maniphest Tasks: T7655
Differential Revision: https://secure.phabricator.com/D12148
+41
-107
+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' => '02ae106f',
10
+
'core.pkg.css' => 'eca3f2e7',
11
11
'core.pkg.js' => '75599122',
12
12
'darkconsole.pkg.js' => '8ab24e01',
13
-
'differential.pkg.css' => '217276e8',
13
+
'differential.pkg.css' => '5a0b221c',
14
14
'differential.pkg.js' => 'e324301d',
15
15
'diffusion.pkg.css' => '591664fa',
16
16
'diffusion.pkg.js' => 'bfc0737b',
···
29
29
'rsrc/css/aphront/table-view.css' => 'b22b7216',
30
30
'rsrc/css/aphront/tokenizer.css' => '82ce2142',
31
31
'rsrc/css/aphront/tooltip.css' => '4099b97e',
32
-
'rsrc/css/aphront/transaction.css' => '5d0cae25',
32
+
'rsrc/css/aphront/transaction.css' => '042fc4bb',
33
33
'rsrc/css/aphront/two-column.css' => '16ab3ad2',
34
34
'rsrc/css/aphront/typeahead.css' => '0e403212',
35
35
'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af',
···
44
44
'rsrc/css/application/config/config-welcome.css' => '6abd79be',
45
45
'rsrc/css/application/config/setup-issue.css' => '22270af2',
46
46
'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2',
47
-
'rsrc/css/application/conpherence/durable-column.css' => 'a27580c5',
47
+
'rsrc/css/application/conpherence/durable-column.css' => 'e5a70c22',
48
48
'rsrc/css/application/conpherence/menu.css' => '9b37a261',
49
-
'rsrc/css/application/conpherence/message-pane.css' => 'e78e9d3c',
49
+
'rsrc/css/application/conpherence/message-pane.css' => '0c4dfb6f',
50
50
'rsrc/css/application/conpherence/notification.css' => '04a6e10a',
51
51
'rsrc/css/application/conpherence/update.css' => '1099a660',
52
52
'rsrc/css/application/conpherence/widget-pane.css' => '1979ee8c',
···
58
58
'rsrc/css/application/differential/changeset-view.css' => 'c5d1e738',
59
59
'rsrc/css/application/differential/core.css' => '7ac3cabc',
60
60
'rsrc/css/application/differential/results-table.css' => '181aa9d9',
61
-
'rsrc/css/application/differential/revision-comment.css' => '48186045',
61
+
'rsrc/css/application/differential/revision-comment.css' => '64603753',
62
62
'rsrc/css/application/differential/revision-history.css' => '0e8eb855',
63
63
'rsrc/css/application/differential/revision-list.css' => 'f3c47d33',
64
64
'rsrc/css/application/differential/table-of-contents.css' => '63f3ef4a',
···
92
92
'rsrc/css/application/policy/policy.css' => '957ea14c',
93
93
'rsrc/css/application/ponder/comments.css' => '6cdccea7',
94
94
'rsrc/css/application/ponder/feed.css' => 'e62615b6',
95
-
'rsrc/css/application/ponder/post.css' => 'ebab8a70',
95
+
'rsrc/css/application/ponder/post.css' => '9d415218',
96
96
'rsrc/css/application/ponder/vote.css' => '8ed6ed8b',
97
97
'rsrc/css/application/profile/profile-view.css' => '1a20dcbf',
98
98
'rsrc/css/application/projects/project-icon.css' => 'c2ecb7f1',
···
513
513
'changeset-view-manager' => '58562350',
514
514
'config-options-css' => '7fedf08b',
515
515
'config-welcome-css' => '6abd79be',
516
-
'conpherence-durable-column-view' => 'a27580c5',
516
+
'conpherence-durable-column-view' => 'e5a70c22',
517
517
'conpherence-menu-css' => '9b37a261',
518
-
'conpherence-message-pane-css' => 'e78e9d3c',
518
+
'conpherence-message-pane-css' => '0c4dfb6f',
519
519
'conpherence-notification-css' => '04a6e10a',
520
520
'conpherence-thread-manager' => 'bb928342',
521
521
'conpherence-update-css' => '1099a660',
···
525
525
'differential-inline-comment-editor' => 'b3412377',
526
526
'differential-results-table-css' => '181aa9d9',
527
527
'differential-revision-add-comment-css' => 'c478bcaa',
528
-
'differential-revision-comment-css' => '48186045',
528
+
'differential-revision-comment-css' => '64603753',
529
529
'differential-revision-history-css' => '0e8eb855',
530
530
'differential-revision-list-css' => 'f3c47d33',
531
531
'differential-table-of-contents-css' => '63f3ef4a',
···
747
747
'phabricator-textareautils' => '5c93c52c',
748
748
'phabricator-title' => '5c1c758c',
749
749
'phabricator-tooltip' => '1d298e3a',
750
-
'phabricator-transaction-view-css' => '5d0cae25',
750
+
'phabricator-transaction-view-css' => '042fc4bb',
751
751
'phabricator-ui-example-css' => '528b19de',
752
752
'phabricator-uiexample-javelin-view' => 'd4a14807',
753
753
'phabricator-uiexample-reactor-button' => 'd19198c8',
···
810
810
'policy-transaction-detail-css' => '82100a43',
811
811
'ponder-comment-table-css' => '6cdccea7',
812
812
'ponder-feed-view-css' => 'e62615b6',
813
-
'ponder-post-css' => 'ebab8a70',
813
+
'ponder-post-css' => '9d415218',
814
814
'ponder-vote-css' => '8ed6ed8b',
815
815
'project-icon-css' => 'c2ecb7f1',
816
816
'raphael-core' => '51ee6b43',
+1
-1
src/applications/conpherence/view/ConpherenceTransactionView.php
+1
-1
src/applications/conpherence/view/ConpherenceTransactionView.php
···
99
99
case PhabricatorTransactions::TYPE_JOIN_POLICY:
100
100
$content = $transaction->getTitle();
101
101
$transaction_view->addClass('conpherence-edited');
102
-
$transaction_view->addClass('grouped');
103
102
break;
104
103
case PhabricatorTransactions::TYPE_COMMENT:
104
+
$transaction_view->addClass('conpherence-comment');
105
105
$comment = $transaction->getComment();
106
106
$content = $this->markupEngine->getOutput(
107
107
$comment,
-2
src/applications/diffusion/controller/DiffusionCommitController.php
-2
src/applications/diffusion/controller/DiffusionCommitController.php
···
720
720
$header->setHeader(
721
721
$is_serious ? pht('Audit Commit') : pht('Creative Accounting'));
722
722
723
-
require_celerity_resource('phabricator-transaction-view-css');
724
-
725
723
$mailable_source = new PhabricatorMetaMTAMailableDatasource();
726
724
$auditor_source = new DiffusionAuditorDatasource();
727
725
+2
-2
src/view/layout/PhabricatorTransactionView.php
+2
-2
src/view/layout/PhabricatorTransactionView.php
···
75
75
return phutil_tag(
76
76
'div',
77
77
array(
78
-
'class' => 'phabricator-transaction-view',
78
+
'class' => 'phabricator-transaction-view '.$classes,
79
79
'id' => $transaction_id,
80
80
'style' => $style,
81
81
),
82
82
phutil_tag_div(
83
-
'phabricator-transaction-detail '.$classes,
83
+
'phabricator-transaction-detail grouped',
84
84
array($header, $content)));
85
85
86
86
}
+1
-7
webroot/rsrc/css/aphront/transaction.css
+1
-7
webroot/rsrc/css/aphront/transaction.css
···
13
13
margin: 10px 0;
14
14
}
15
15
16
-
.phabricator-transaction-detail {
17
-
border-color: #dddddd;
18
-
border-width: 1px 4px;
19
-
border-style: solid;
20
-
margin-left: 60px;
21
-
}
22
-
23
16
.device-phone .phabricator-transaction-detail {
24
17
margin: 0;
25
18
min-height: 50px;
···
33
26
34
27
.phabricator-transaction-header a {
35
28
font-weight: bold;
29
+
color: {$darkbluetext};
36
30
}
37
31
38
32
.phabricator-transaction-info {
+8
-6
webroot/rsrc/css/application/conpherence/durable-column.css
+8
-6
webroot/rsrc/css/application/conpherence/durable-column.css
···
128
128
padding: 8px 12px 0;
129
129
}
130
130
131
-
.conpherence-durable-column-transactions .conpherence-edited {
132
-
color: {$lightgreytext};
133
-
font-size: 12px;
134
-
margin: 0;
131
+
.conpherence-durable-column-transactions
132
+
.phabricator-transaction-view.conpherence-edited {
133
+
color: {$lightgreytext};
134
+
font-size: 12px;
135
+
margin: 0;
136
+
padding: 0;
135
137
}
136
138
137
139
.conpherence-durable-column-transactions .conpherence-edited
···
173
175
top: -11px;
174
176
left: 0;
175
177
background-color: #fff;
176
-
color: {$lightbluetext};
178
+
color: {$darkbluetext};
179
+
font-weight: bold;
177
180
font-size: 12px;
178
181
padding: 0 6px 0 0;
179
182
}
···
187
190
188
191
.conpherence-durable-column-transactions .phabricator-transaction-detail
189
192
.phabricator-transaction-header .phui-link-person {
190
-
color: {$darkbluetext};
191
193
margin: 0 8px 0 0;
192
194
}
193
195
+16
-10
webroot/rsrc/css/application/conpherence/message-pane.css
+16
-10
webroot/rsrc/css/application/conpherence/message-pane.css
···
149
149
margin: 12px 12px 4px;
150
150
min-height: auto;
151
151
}
152
+
152
153
.device-phone .conpherence-message-pane .date-marker {
153
154
margin: 5px 0;
154
155
}
156
+
155
157
.conpherence-message-pane .date-marker .date {
156
158
position: relative;
157
159
top: -11px;
158
160
left: 40px;
159
161
background-color: #FFF;
160
-
color: {$bluetext};
161
-
font-size: 12px;
162
+
color: {$darkbluetext};
163
+
font-size: 13px;
162
164
padding: 0px 5px;
165
+
font-weight: bold;
163
166
}
164
167
165
168
.device-phone .conpherence-message-pane .phabricator-transaction-detail {
···
174
177
float: left;
175
178
}
176
179
177
-
.conpherence-message-pane .conpherence-edited .phabricator-transaction-header {
178
-
float: right;
180
+
.conpherence-message-pane .conpherence-edited {
181
+
padding: 0;
182
+
margin-top: 0;
183
+
margin-bottom: 0;
184
+
min-height: inherit;
185
+
}
186
+
187
+
.conpherence-message-pane .conpherence-edited + .conpherence-comment {
188
+
margin-top: 20px;
179
189
}
180
190
181
-
.conpherence-message-pane .conpherence-edited {
182
-
padding-top: 12px;
191
+
.conpherence-message-pane .conpherence-edited .phabricator-transaction-header {
192
+
float: right;
183
193
}
184
194
185
195
.device-phone .conpherence-message-pane .conpherence-edited {
···
209
219
.conpherence-message-pane .phabricator-transaction-content {
210
220
background: none;
211
221
padding: 0;
212
-
}
213
-
214
-
.conpherence-message-pane .phabricator-transaction-header a {
215
-
color: {$darkbluetext};
216
222
}
217
223
218
224
.conpherence-message-pane .phabricator-transaction-content {
-48
webroot/rsrc/css/application/differential/revision-comment.css
-48
webroot/rsrc/css/application/differential/revision-comment.css
···
6
6
margin: 0 16px;
7
7
}
8
8
9
-
.differential-comment-list .phabricator-transaction-content {
10
-
background: #ffffff;
11
-
}
12
-
13
9
/* Spooky haunted panel which floats on the bottom of the screen.
14
10
Haunt modes are:
15
11
···
64
60
.differential-inline-comment-content {
65
61
overflow: auto;
66
62
}
67
-
68
-
.phabricator-transaction-view .differential-comment-action-testplan {
69
-
border-color: #660099;
70
-
}
71
-
72
-
.phabricator-transaction-view .differential-comment-action-abandon {
73
-
border-color: #222222;
74
-
}
75
-
76
-
.phabricator-transaction-view .differential-comment-action-accept {
77
-
border-color: #009966;
78
-
}
79
-
80
-
.phabricator-transaction-view .differential-comment-action-reject {
81
-
border-color: #aa0000;
82
-
}
83
-
84
-
.phabricator-transaction-view .differential-comment-action-rethink {
85
-
border-color: #aa0000;
86
-
}
87
-
88
-
.phabricator-transaction-view .differential-comment-action-commit {
89
-
border-color: #006699;
90
-
}
91
-
92
-
.phabricator-transaction-view .differential-comment-action-reclaim {
93
-
border-color: #0099aa;
94
-
}
95
-
96
-
.phabricator-transaction-view .differential-comment-action-update {
97
-
border-color: #6699cc;
98
-
}
99
-
100
-
.phabricator-transaction-view .differential-comment-action-add_reviewers {
101
-
border-color: #aa99cc;
102
-
}
103
-
104
-
.phabricator-transaction-view .differential-comment-action-request_review {
105
-
border-color: #cc9966;
106
-
}
107
-
108
-
.phabricator-transaction-view .differential-comment-action-claim {
109
-
border-color: #ffdd33;
110
-
}
+1
-19
webroot/rsrc/css/application/ponder/post.css
+1
-19
webroot/rsrc/css/application/ponder/post.css
···
21
21
}
22
22
23
23
.ponder-question {
24
-
background : white;
25
-
}
26
-
27
-
.phabricator-transaction-view .ponder-question {
28
-
background : white;
29
-
}
30
-
31
-
.phabricator-transaction-detail .ponder-question {
32
-
border : none;
33
-
}
34
-
35
-
36
-
.phabricator-transaction-view .ponder-answer {
37
-
background : white;
38
-
margin-bottom : 0;
39
-
}
40
-
41
-
.phabricator-transaction-content {
42
-
background : white;
24
+
background: white;
43
25
}