@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
Minor tweaks to inline comments
Summary: Ref T7447, Ref T1460. Moves "done" state to left, and no longer is a button (simpler CSS). Also feels a little nicer. Clean up some spacing issue with Ghosties.
Test Plan:
Test new and old comments, as author and reviewer.
{F389986}
{F389987}
{F389988}
Reviewers: btrahan, epriestley
Reviewed By: epriestley
Subscribers: aik099, Korvin, epriestley
Maniphest Tasks: T1460, T7447
Differential Revision: https://secure.phabricator.com/D12641
+74
-84
+32
-32
resources/celerity/map.php
+32
-32
resources/celerity/map.php
···
46
46
'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2',
47
47
'rsrc/css/application/conpherence/durable-column.css' => '2e68a92f',
48
48
'rsrc/css/application/conpherence/menu.css' => 'f389e048',
49
-
'rsrc/css/application/conpherence/message-pane.css' => 'e7c09fda',
49
+
'rsrc/css/application/conpherence/message-pane.css' => '3150e2a2',
50
50
'rsrc/css/application/conpherence/notification.css' => 'd208f806',
51
51
'rsrc/css/application/conpherence/transaction.css' => '25138b7f',
52
52
'rsrc/css/application/conpherence/update.css' => '1099a660',
···
58
58
'rsrc/css/application/differential/add-comment.css' => 'c47f8c40',
59
59
'rsrc/css/application/differential/changeset-view.css' => 'e19cfd6e',
60
60
'rsrc/css/application/differential/core.css' => '7ac3cabc',
61
-
'rsrc/css/application/differential/phui-inline-comment.css' => '03bb3528',
61
+
'rsrc/css/application/differential/phui-inline-comment.css' => 'ebe46529',
62
62
'rsrc/css/application/differential/results-table.css' => '181aa9d9',
63
63
'rsrc/css/application/differential/revision-comment.css' => '024dda6b',
64
64
'rsrc/css/application/differential/revision-history.css' => '0e8eb855',
···
355
355
'rsrc/js/application/aphlict/behavior-aphlict-status.js' => 'ea681761',
356
356
'rsrc/js/application/auth/behavior-persona-login.js' => '9414ff18',
357
357
'rsrc/js/application/config/behavior-reorder-fields.js' => '14a827de',
358
-
'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '0a5192c4',
358
+
'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '6709c934',
359
359
'rsrc/js/application/conpherence/behavior-durable-column.js' => '657c2b50',
360
-
'rsrc/js/application/conpherence/behavior-menu.js' => '077a1dab',
360
+
'rsrc/js/application/conpherence/behavior-menu.js' => '804b0773',
361
361
'rsrc/js/application/conpherence/behavior-pontificate.js' => '21ba5861',
362
362
'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3',
363
363
'rsrc/js/application/conpherence/behavior-widget-pane.js' => '93568464',
···
519
519
'config-welcome-css' => '6abd79be',
520
520
'conpherence-durable-column-view' => '2e68a92f',
521
521
'conpherence-menu-css' => 'f389e048',
522
-
'conpherence-message-pane-css' => 'e7c09fda',
522
+
'conpherence-message-pane-css' => '3150e2a2',
523
523
'conpherence-notification-css' => 'd208f806',
524
-
'conpherence-thread-manager' => '0a5192c4',
524
+
'conpherence-thread-manager' => '6709c934',
525
525
'conpherence-transaction-css' => '25138b7f',
526
526
'conpherence-update-css' => '1099a660',
527
527
'conpherence-widget-pane-css' => '2af42ebe',
···
561
561
'javelin-behavior-audit-preview' => 'd835b03a',
562
562
'javelin-behavior-choose-control' => '6153c708',
563
563
'javelin-behavior-config-reorder-fields' => '14a827de',
564
-
'javelin-behavior-conpherence-menu' => '077a1dab',
564
+
'javelin-behavior-conpherence-menu' => '804b0773',
565
565
'javelin-behavior-conpherence-pontificate' => '21ba5861',
566
566
'javelin-behavior-conpherence-widget-pane' => '93568464',
567
567
'javelin-behavior-countdown-timer' => 'e4cc26b3',
···
795
795
'phui-image-mask-css' => '5a8b09c8',
796
796
'phui-info-panel-css' => '27ea50a1',
797
797
'phui-info-view-css' => 'c6f0aef8',
798
-
'phui-inline-comment-view-css' => '03bb3528',
798
+
'phui-inline-comment-view-css' => 'ebe46529',
799
799
'phui-list-view-css' => '2e25ebfb',
800
800
'phui-object-box-css' => '7d160002',
801
801
'phui-object-item-list-view-css' => '9db65899',
···
873
873
'javelin-stratcom',
874
874
'javelin-workflow',
875
875
),
876
-
'077a1dab' => array(
877
-
'javelin-behavior',
878
-
'javelin-dom',
879
-
'javelin-util',
880
-
'javelin-stratcom',
881
-
'javelin-workflow',
882
-
'javelin-behavior-device',
883
-
'javelin-history',
884
-
'javelin-vector',
885
-
'javelin-scrollbar',
886
-
'phabricator-title',
887
-
'phabricator-shaped-request',
888
-
'conpherence-thread-manager',
889
-
),
890
876
'07de8873' => array(
891
877
'javelin-install',
892
878
'javelin-util',
···
902
888
'javelin-dom',
903
889
'javelin-router',
904
890
),
905
-
'0a5192c4' => array(
906
-
'javelin-dom',
907
-
'javelin-util',
908
-
'javelin-stratcom',
909
-
'javelin-install',
910
-
'javelin-workflow',
911
-
'javelin-router',
912
-
'javelin-behavior-device',
913
-
'javelin-vector',
914
-
),
915
891
'0c6946e7' => array(
916
892
'javelin-install',
917
893
'javelin-dom',
···
1311
1287
'phabricator-keyboard-shortcut',
1312
1288
'conpherence-thread-manager',
1313
1289
),
1290
+
'6709c934' => array(
1291
+
'javelin-dom',
1292
+
'javelin-util',
1293
+
'javelin-stratcom',
1294
+
'javelin-install',
1295
+
'javelin-workflow',
1296
+
'javelin-router',
1297
+
'javelin-behavior-device',
1298
+
'javelin-vector',
1299
+
),
1314
1300
'6882e80a' => array(
1315
1301
'javelin-dom',
1316
1302
),
···
1439
1425
'7ee2b591' => array(
1440
1426
'javelin-behavior',
1441
1427
'javelin-history',
1428
+
),
1429
+
'804b0773' => array(
1430
+
'javelin-behavior',
1431
+
'javelin-dom',
1432
+
'javelin-util',
1433
+
'javelin-stratcom',
1434
+
'javelin-workflow',
1435
+
'javelin-behavior-device',
1436
+
'javelin-history',
1437
+
'javelin-vector',
1438
+
'javelin-scrollbar',
1439
+
'phabricator-title',
1440
+
'phabricator-shaped-request',
1441
+
'conpherence-thread-manager',
1442
1442
),
1443
1443
82439934 => array(
1444
1444
'javelin-behavior',
+20
-14
src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
+20
-14
src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
···
128
128
if ($ghost) {
129
129
if ($ghost['new']) {
130
130
$ghosticon = 'fa-fast-forward';
131
-
$reason = pht('Click to view forward comment.');
131
+
$reason = pht('View forward comment');
132
132
} else {
133
133
$ghosticon = 'fa-fast-backward';
134
-
$reason = pht('Click to view previous comment.');
134
+
$reason = pht('View previous comment');
135
135
}
136
136
$ghost_id = celerity_generate_unique_node_id();
137
137
···
248
248
$links[] = javelin_tag(
249
249
'a',
250
250
array(
251
-
'class' => 'button simple',
251
+
'class' => 'button simple msl',
252
252
'meta' => array(
253
253
'anchor' => $anchor_name,
254
254
),
···
323
323
pht('Done'),
324
324
));
325
325
} else {
326
-
$done_button = id(new PHUIButtonView())
327
-
->setTag('a')
328
-
->setColor(PHUIButtonView::SIMPLE)
329
-
->addClass('mml');
330
326
if ($is_done) {
331
-
$done_button->setIconFont('fa-check');
332
-
$done_button->setText(pht('Done'));
333
-
$done_button->addClass('button-done');
327
+
$icon = id(new PHUIIconView())->setIconFont('fa-check sky msr');
328
+
$label = pht('Done');
329
+
$class = 'button-done';
334
330
} else {
335
-
$done_button->addClass('button-not-done');
336
-
$done_button->setText(pht('Not Done'));
331
+
$icon = null;
332
+
$label = pht('Not Done');
333
+
$class = 'button-not-done';
337
334
}
335
+
$done_button = phutil_tag(
336
+
'div',
337
+
array(
338
+
'class' => 'done-label '.$class,
339
+
),
340
+
array(
341
+
$icon,
342
+
$label,
343
+
));
338
344
}
339
345
}
340
346
···
397
403
),
398
404
array(
399
405
$anchor,
406
+
$done_button,
400
407
$links,
401
-
$nextprev,
402
408
$action_buttons,
403
-
$done_button,
409
+
$nextprev,
404
410
));
405
411
406
412
$markup = javelin_tag(
+22
-38
webroot/rsrc/css/application/differential/phui-inline-comment.css
+22
-38
webroot/rsrc/css/application/differential/phui-inline-comment.css
···
150
150
}
151
151
152
152
.differential-inline-comment.inline-comment-ghost
153
-
.button.simple {
154
-
border-color: {$lightgreyborder};
153
+
.button.simple .phui-icon-view {
154
+
color: {$lightgreytext};
155
155
}
156
156
157
-
.differential-inline-comment.inline-comment-ghost
158
-
.button.simple .phui-icon-view {
157
+
/* - New/Edit Inline Comment --------------------------------------------------
158
+
159
+
Styles for when you are creating or editing an inline comment.
160
+
161
+
*/
162
+
163
+
.differential-inline-comment .done-label {
164
+
display: inline-block;
165
+
color: {$sh-yellowicon};
166
+
padding: 4px;
167
+
}
168
+
169
+
.differential-inline-comment.inline-state-is-draft .done-label,
170
+
.differential-inline-comment.inline-comment-ghost .done-label {
159
171
color: {$lightgreytext};
160
172
}
161
173
···
239
251
.differential-inline-comment.inline-state-is-draft
240
252
.differential-inline-done-label,
241
253
.differential-inline-comment.inline-state-is-draft
254
+
.button.simple,
255
+
.differential-inline-comment.inline-comment-ghost
242
256
.button.simple {
243
257
border-color: {$lightgreyborder};
244
258
color: {$lightgreytext};
···
264
278
border: 1px solid {$sh-yellowborder};
265
279
border-radius: 3px;
266
280
display: inline-block;
267
-
overflow: hidden;
268
-
margin-left: 8px;
269
281
padding: 3px 8px 4px;
270
282
cursor: pointer;
271
283
}
···
299
311
color: {$sky};
300
312
}
301
313
302
-
.device-desktop .differential-inline-comment.inline-state-is-draft
303
-
.differential-inline-comment-head .button.simple.button-not-done:hover {
304
-
color: {$lightgreytext};
305
-
background-color: transparent;
306
-
border-color: {$lightgreyborder};
307
-
cursor: auto;
308
-
}
309
-
310
-
.device-desktop .differential-inline-comment .differential-inline-comment-head
311
-
.simple.button.button-not-done:hover {
312
-
color: {$sh-yellowicon};
313
-
background-color: transparent;
314
-
border-color: {$sh-yellowborder};
315
-
cursor: auto;
316
-
}
317
-
318
314
.differential-inline-comment.inline-is-done .differential-inline-comment-head
319
-
.button.simple.button-done {
320
-
background-color: #fff;
321
-
color: {$sky};
322
-
border-color: {$sky};
323
-
cursor: auto;
324
-
}
325
-
326
-
.differential-inline-comment.inline-is-done .differential-inline-comment-head
327
-
.button.simple.button-done .phui-icon-view {
315
+
.button-done {
328
316
color: {$sky};
329
317
}
330
318
···
414
402
415
403
.inline-comment-ghost .differential-inline-comment-head {
416
404
padding-left: 40px;
417
-
padding-bottom: 0;
418
-
}
419
-
420
-
.inline-comment-ghost .inline-head-left {
421
-
padding: 4px 0;
422
405
}
423
406
424
407
.ghost-icon {
425
408
background: {$darkgreybackground};
426
409
float: left;
427
410
margin-right: 8px;
428
-
padding: 2px 4px 1px 2px;
411
+
padding: 2px 4px 2px 2px;
429
412
position: absolute;
430
413
top: 0;
431
414
left: 0;
···
462
445
}
463
446
464
447
.differential-inline-comment.inline-comment-ghost
465
-
.differential-inline-done-label {
448
+
.differential-inline-done-label,
449
+
.differential-inline-comment.inline-comment-ghost {
466
450
border-color: {$lightgreyborder};
467
451
color: {$lightgreytext};
468
452
}