@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
Visual update to Conpherence Durable Column
Summary: Numerous visual updates to the Durable Column, mostly to emulate current Conpherence look and feel.
Test Plan: Lots of little pixel chasing. Also Chrome, Firefox.
Reviewers: epriestley, btrahan
Reviewed By: btrahan
Subscribers: Korvin, epriestley
Differential Revision: https://secure.phabricator.com/D12041
+68
-285
+24
-25
resources/celerity/map.php
+24
-25
resources/celerity/map.php
···
7
7
*/
8
8
return array(
9
9
'names' => array(
10
-
'core.pkg.css' => '70320e8a',
11
-
'core.pkg.js' => '28ef0e70',
10
+
'core.pkg.css' => '856b962f',
11
+
'core.pkg.js' => '5f50c01b',
12
12
'darkconsole.pkg.js' => '8ab24e01',
13
13
'differential.pkg.css' => '1940be3f',
14
14
'differential.pkg.js' => '53c1ccc2',
···
34
34
'rsrc/css/aphront/typeahead.css' => '0e403212',
35
35
'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af',
36
36
'rsrc/css/application/auth/auth.css' => '1e655982',
37
-
'rsrc/css/application/base/main-menu-view.css' => 'f9f5cd1b',
37
+
'rsrc/css/application/base/main-menu-view.css' => '58db7ad2',
38
38
'rsrc/css/application/base/notification-menu.css' => '6aa0a74b',
39
39
'rsrc/css/application/base/phabricator-application-launch-view.css' => '16ca323f',
40
40
'rsrc/css/application/base/standard-page-view.css' => 'df338a4b',
···
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' => '9207426d',
47
+
'rsrc/css/application/conpherence/durable-column.css' => '51235e34',
48
48
'rsrc/css/application/conpherence/menu.css' => 'c6ac5299',
49
49
'rsrc/css/application/conpherence/message-pane.css' => '5930260a',
50
50
'rsrc/css/application/conpherence/notification.css' => '04a6e10a',
···
110
110
'rsrc/css/core/z-index.css' => '2db67397',
111
111
'rsrc/css/diviner/diviner-shared.css' => '38813222',
112
112
'rsrc/css/font/font-awesome.css' => 'ae9a7b4d',
113
-
'rsrc/css/font/font-source-sans-pro.css' => '0d859f60',
113
+
'rsrc/css/font/font-source-sans-pro.css' => '4a2430d7',
114
114
'rsrc/css/font/phui-font-icon-base.css' => '3dad2ae3',
115
115
'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
116
116
'rsrc/css/layout/phabricator-hovercard-view.css' => '893f4783',
···
128
128
'rsrc/css/phui/phui-crumbs-view.css' => '594d719e',
129
129
'rsrc/css/phui/phui-document.css' => '0f83a7df',
130
130
'rsrc/css/phui/phui-feed-story.css' => 'c9f3a0b5',
131
-
'rsrc/css/phui/phui-fontkit.css' => 'd30f4fa3',
131
+
'rsrc/css/phui/phui-fontkit.css' => '1fa79503',
132
132
'rsrc/css/phui/phui-form-view.css' => '78d729fe',
133
133
'rsrc/css/phui/phui-form.css' => 'f535f938',
134
134
'rsrc/css/phui/phui-header-view.css' => '083669db',
···
353
353
'rsrc/js/application/auth/behavior-persona-login.js' => '9414ff18',
354
354
'rsrc/js/application/config/behavior-reorder-fields.js' => '14a827de',
355
355
'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => 'efef202b',
356
-
'rsrc/js/application/conpherence/behavior-durable-column.js' => '1eef9f26',
356
+
'rsrc/js/application/conpherence/behavior-durable-column.js' => 'aa3b6c22',
357
357
'rsrc/js/application/conpherence/behavior-menu.js' => 'e476c952',
358
358
'rsrc/js/application/conpherence/behavior-pontificate.js' => '21ba5861',
359
359
'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3',
···
514
514
'changeset-view-manager' => '88be0133',
515
515
'config-options-css' => '7fedf08b',
516
516
'config-welcome-css' => '6abd79be',
517
-
'conpherence-durable-column-view' => '9207426d',
517
+
'conpherence-durable-column-view' => '51235e34',
518
518
'conpherence-menu-css' => 'c6ac5299',
519
519
'conpherence-message-pane-css' => '5930260a',
520
520
'conpherence-notification-css' => '04a6e10a',
···
534
534
'diffusion-source-css' => '66fdf661',
535
535
'diviner-shared-css' => '38813222',
536
536
'font-fontawesome' => 'ae9a7b4d',
537
-
'font-source-sans-pro' => '0d859f60',
537
+
'font-source-sans-pro' => '4a2430d7',
538
538
'global-drag-and-drop-css' => '697324ad',
539
539
'harbormaster-css' => '49d64eb4',
540
540
'herald-css' => '826075fa',
···
585
585
'javelin-behavior-diffusion-locate-file' => '6d3e1947',
586
586
'javelin-behavior-diffusion-pull-lastmodified' => '2b228192',
587
587
'javelin-behavior-doorkeeper-tag' => 'e5822781',
588
-
'javelin-behavior-durable-column' => '1eef9f26',
588
+
'javelin-behavior-durable-column' => 'aa3b6c22',
589
589
'javelin-behavior-error-log' => '6882e80a',
590
590
'javelin-behavior-fancy-datepicker' => 'c51ae228',
591
591
'javelin-behavior-global-drag-and-drop' => '07f199d8',
···
730
730
'phabricator-hovercard-view-css' => '893f4783',
731
731
'phabricator-keyboard-shortcut' => '1ae869f2',
732
732
'phabricator-keyboard-shortcut-manager' => 'c1700f6f',
733
-
'phabricator-main-menu-view' => 'f9f5cd1b',
733
+
'phabricator-main-menu-view' => '58db7ad2',
734
734
'phabricator-nav-view-css' => '7aeaf435',
735
735
'phabricator-notification' => '0c6946e7',
736
736
'phabricator-notification-css' => '9c279160',
···
783
783
'phui-document-view-css' => '0f83a7df',
784
784
'phui-feed-story-css' => 'c9f3a0b5',
785
785
'phui-font-icon-base-css' => '3dad2ae3',
786
-
'phui-fontkit-css' => 'd30f4fa3',
786
+
'phui-fontkit-css' => '1fa79503',
787
787
'phui-form-css' => 'f535f938',
788
788
'phui-form-view-css' => '78d729fe',
789
789
'phui-header-view-css' => '083669db',
···
954
954
'javelin-dom',
955
955
'javelin-reactor-dom',
956
956
),
957
-
'1eef9f26' => array(
958
-
'javelin-behavior',
959
-
'javelin-dom',
960
-
'javelin-stratcom',
961
-
'javelin-scrollbar',
962
-
'javelin-quicksand',
963
-
'phabricator-keyboard-shortcut',
964
-
'conpherence-thread-manager',
965
-
),
966
957
'1feea462' => array(
967
958
'javelin-install',
968
959
'javelin-dom',
···
1150
1141
'javelin-request',
1151
1142
'javelin-util',
1152
1143
),
1144
+
'4a2430d7' => array(
1145
+
'phui-fontkit-css',
1146
+
),
1153
1147
'4d94d9c3' => array(
1154
1148
'javelin-behavior',
1155
1149
'javelin-stratcom',
···
1205
1199
'javelin-stratcom',
1206
1200
'javelin-vector',
1207
1201
'javelin-dom',
1208
-
),
1209
-
'5bc2cb21' => array(
1210
-
'javelin-behavior',
1211
-
'javelin-stratcom',
1212
1202
),
1213
1203
'5c1c758c' => array(
1214
1204
'javelin-install',
···
1663
1653
'javelin-dom',
1664
1654
'javelin-util',
1665
1655
'phabricator-prefab',
1656
+
),
1657
+
'aa3b6c22' => array(
1658
+
'javelin-behavior',
1659
+
'javelin-dom',
1660
+
'javelin-stratcom',
1661
+
'javelin-scrollbar',
1662
+
'javelin-quicksand',
1663
+
'phabricator-keyboard-shortcut',
1664
+
'conpherence-thread-manager',
1666
1665
),
1667
1666
'b1f0ccee' => array(
1668
1667
'javelin-install',
+3
src/applications/conpherence/view/ConpherenceDurableColumnView.php
+3
src/applications/conpherence/view/ConpherenceDurableColumnView.php
···
63
63
64
64
protected function getTagContent() {
65
65
$column_key = PhabricatorUserPreferences::PREFERENCE_CONPHERENCE_COLUMN;
66
+
require_celerity_resource('conpherence-durable-column-view');
67
+
require_celerity_resource('font-source-sans-pro');
66
68
67
69
Javelin::initBehavior(
68
70
'durable-column',
···
240
242
->addClass('core-menu-item')
241
243
->addSigil('conpherence-settings-menu')
242
244
->setID($bubble_id)
245
+
->setHref('#')
243
246
->setAural(pht('Settings'))
244
247
->setOrder(300);
245
248
$settings_button = id(new PHUIListView())
+1
-1
src/view/layout/PhabricatorTransactionView.php
+1
-1
src/view/layout/PhabricatorTransactionView.php
-1
src/view/page/PhabricatorStandardPageView.php
-1
src/view/page/PhabricatorStandardPageView.php
···
160
160
require_celerity_resource('phui-form-css');
161
161
require_celerity_resource('sprite-gradient-css');
162
162
require_celerity_resource('phabricator-standard-page-view');
163
-
require_celerity_resource('conpherence-durable-column-view');
164
163
165
164
Javelin::initBehavior('workflow', array());
166
165
+36
-256
webroot/rsrc/css/application/conpherence/durable-column.css
+36
-256
webroot/rsrc/css/application/conpherence/durable-column.css
···
17
17
18
18
.conpherence-durable-column .loading-mask {
19
19
position: absolute;
20
-
top: 0;
20
+
top: 90px;
21
21
bottom: 0;
22
-
right: 0;
23
-
width: 300px;
22
+
right: 1px;
23
+
width: 298px;
24
24
background: #fff;
25
25
display: none;
26
26
opacity: .6;
···
33
33
34
34
.conpherence-durable-column-header {
35
35
height: 44px;
36
-
border-left: 1px solid #000;
37
36
}
38
37
39
38
.conpherence-durable-column-header .conpherence-settings-dropdown {
···
48
47
width: 230px;
49
48
}
50
49
51
-
.conpherence-durable-column-header-text:hover {
52
-
color: #fff;
53
-
text-decoration: none;
54
-
}
55
-
56
50
.conpherence-durable-column-icon-bar {
57
-
height: 34px;
58
-
padding: 5px 12px;
59
-
border-bottom: 1px solid {$thinblueborder};
51
+
height: 38px;
52
+
padding: 4px 8px;
53
+
background-color: {$lightgreybackground};
60
54
}
61
55
62
56
.conpherence-durable-column-icon-bar .conpherence-durable-column-thread-icon {
63
57
float: left;
64
58
display: block;
65
-
width: 30px;
66
-
height: 30px;
67
-
margin: 0px 8px 0px 0px;
59
+
width: 34px;
60
+
height: 34px;
61
+
margin: 0 4px 0 0;
68
62
border: 2px solid transparent;
69
63
border-radius: 3px;
70
64
}
71
65
72
66
.conpherence-durable-column-icon-bar
73
67
.conpherence-durable-column-thread-icon.selected {
74
-
border-color: {$blueborder};
68
+
border-color: {$sky};
75
69
}
76
70
77
71
.conpherence-durable-column-icon-bar
78
72
.conpherence-durable-column-thread-icon span {
79
73
position: relative;
80
74
display: block;
81
-
width: 26px;
82
-
height: 26px;
75
+
width: 30px;
76
+
height: 30px;
83
77
top: 2px;
84
78
left: 2px;
85
-
background-size: 26px 26px;
79
+
background-size: 30px 30px;
86
80
}
87
81
88
82
.conpherence-durable-column-body {
···
96
90
97
91
.conpherence-durable-column-main {
98
92
position: absolute;
99
-
top: 44px;
100
-
bottom: 136px;
93
+
top: 46px;
94
+
bottom: 134px;
101
95
left: 0;
102
96
right: 0;
103
97
overflow-x: hidden;
104
98
overflow-y: auto;
99
+
border-top: 1px solid {$thinblueborder};
105
100
}
106
101
107
102
.conpherence-durable-column-transactions {
···
110
105
111
106
.conpherence-durable-column-transactions .phabricator-transaction-view {
112
107
background: none;
113
-
margin: 0 10px 0 0;
108
+
margin: 0;
114
109
padding: 4px 0;
115
110
min-height: 0;
116
111
}
···
131
126
background: none;
132
127
padding: 0;
133
128
}
129
+
130
+
.conpherence-durable-column-transactions .date-marker {
131
+
border-top: 1px solid {$thinblueborder};
132
+
margin: 20px 0px 4px;
133
+
}
134
+
135
+
.conpherence-durable-column-transactions .date-marker .date {
136
+
position: relative;
137
+
top: -11px;
138
+
left: 8px;
139
+
background-color: #fff;
140
+
color: {$lightgreytext};
141
+
font-size: 12px;
142
+
padding: 0 4px;
143
+
}
144
+
134
145
.conpherence-durable-column-transactions .phabricator-transaction-detail
135
146
.phabricator-transaction-header .phabricator-transaction-info {
136
147
margin: 3px 0px 0px 0px;
148
+
color: {$lightgreytext};
137
149
}
138
150
139
151
.conpherence-durable-column-transactions .phabricator-transaction-detail
···
145
157
position: absolute;
146
158
left: 0;
147
159
right: 0;
148
-
bottom: 36px;
160
+
bottom: 34px;
149
161
height: 100px;
150
162
margin: 0;
151
163
border-width: 1px 0;
···
164
176
box-shadow: none;
165
177
}
166
178
167
-
/* participants widget */
168
-
169
-
.conpherence-durable-column-body .person-entry {
170
-
padding: 8px 0 0 8px;
171
-
}
172
-
173
-
.conpherence-durable-column-body .person-entry a {
174
-
float: left;
175
-
font-weight: bold;
176
-
line-height: 20px;
177
-
}
178
-
179
-
.conpherence-durable-column-body .person-entry a img {
180
-
height: 35px;
181
-
width: 35px;
182
-
}
183
-
184
-
.conpherence-durable-column-body .person-entry .pic {
185
-
float: left;
186
-
margin: 0 8px 0 0;
187
-
width: 35px;
188
-
padding: 0;
189
-
}
190
-
191
-
.conpherence-durable-column-body .person-entry .remove {
192
-
float: right;
193
-
width: 20px;
194
-
font-size: 18px;
195
-
padding: 5px 0 8px 0;
196
-
}
197
-
198
-
.conpherence-durable-column-body .person-entry .remove:hover {
199
-
text-decoration: none;
200
-
}
201
-
202
-
.conpherence-durable-column-body .person-entry .remove .close-icon {
203
-
color: #bfbfbf;
204
-
}
205
-
206
-
.conpherence-durable-column-body .person-entry .remove:hover .close-icon {
207
-
color: #000;
208
-
}
209
-
210
-
/* files widget */
211
-
212
-
.conpherence-durable-column-body .no-files {
213
-
width: 100%;
214
-
padding: 20px 0px;
215
-
text-align: center;
216
-
color: #555;
217
-
}
218
-
219
-
.conpherence-durable-column-body .file-entry {
220
-
padding: 10px 0;
221
-
margin: 0 5px 0 10px;
222
-
border-bottom: 1px solid #e7e7e7;
223
-
}
224
-
.conpherence-durable-column-body .file-icon {
225
-
width: 32px;
226
-
height: 32px;
227
-
float: left;
228
-
font-size: 30px;
229
-
}
230
-
.conpherence-durable-column-body .file-title {
231
-
display: block;
232
-
position: relative;
233
-
top: -4px;
234
-
left: 2px;
235
-
overflow-x: hidden;
236
-
width: 180px;
237
-
font-weight: bold;
238
-
text-overflow: ellipsis;
239
-
white-space: nowrap;
240
-
}
241
-
.conpherence-durable-column-body .file-uploaded-by {
242
-
color: #a1a5a9;
243
-
position: relative;
244
-
top: 0px;
245
-
left: 2px;
246
-
width: 170px;
247
-
font-size: 11px;
248
-
}
249
-
250
-
/* calendar widget */
251
-
252
-
.conpherence-durable-column-body .aphront-multi-column-view {
253
-
width: 100%;
254
-
}
255
-
256
-
.conpherence-durable-column-body .aphront-multi-column-view
257
-
.aphront-multi-column-column {
258
-
background: white;
259
-
border-right: 1px solid #bfbfbf;
260
-
text-align: center;
261
-
}
262
-
263
-
.conpherence-durable-column-body .no-events {
264
-
color: {$lightgreytext};
265
-
}
266
-
267
-
.conpherence-durable-column-body .aphront-multi-column-view
268
-
.aphront-multi-column-column-last {
269
-
border-right: 0;
270
-
}
271
-
.conpherence-durable-column-body .aphront-multi-column-view
272
-
.aphront-multi-column-column .day-column,
273
-
.conpherence-durable-column-body .aphront-multi-column-view
274
-
.aphront-multi-column-column .day-column-active {
275
-
color: #bfbfbf;
276
-
background-color: white;
277
-
font-weight: bold;
278
-
padding: 0px 0px 10px 0px;
279
-
}
280
-
.conpherence-durable-column-body .aphront-multi-column-view
281
-
.aphront-multi-column-column .day-column-active {
282
-
color: black;
283
-
}
284
-
.conpherence-durable-column-body .aphront-multi-column-view
285
-
.aphront-multi-column-column .present ,
286
-
.conpherence-durable-column-body .aphront-multi-column-view
287
-
.aphront-multi-column-column .sporadic ,
288
-
.conpherence-durable-column-body .aphront-multi-column-view
289
-
.aphront-multi-column-column .away {
290
-
height: 10px;
291
-
margin: 5px 0px 5px 0px;
292
-
width: 100%;
293
-
}
294
-
.conpherence-durable-column-body .aphront-multi-column-view
295
-
.aphront-multi-column-column .present {
296
-
background-color: white;
297
-
}
298
-
.conpherence-durable-column-body .aphront-multi-column-view
299
-
.aphront-multi-column-column .sporadic {
300
-
background-color: rgb(222, 226, 232);
301
-
}
302
-
.conpherence-durable-column-body .aphront-multi-column-view
303
-
.aphront-multi-column-column .away {
304
-
background-color: rgb(102, 204, 255);
305
-
}
306
-
.conpherence-durable-column-body .aphront-multi-column-view
307
-
.day-name {
308
-
padding: 5px 0px 0px 0px;
309
-
font-size: 12px;
310
-
}
311
-
.conpherence-durable-column-body .aphront-multi-column-view
312
-
.day-number {
313
-
font-size: 16px;
314
-
padding: 0 0 5px 0;
315
-
}
316
-
317
-
.conpherence-durable-column-body .day-header {
318
-
overflow: hidden;
319
-
background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
320
-
background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
321
-
border-top: 1px solid #e7e7e7;
322
-
border-bottom: 1px solid #d7d7d7;
323
-
padding: 5px 10px 5px 10px;
324
-
}
325
-
326
-
.conpherence-durable-column-body .day-header.today {
327
-
background-image: linear-gradient(to bottom, #3b86c4, #2b628f);
328
-
background-image: -webkit-linear-gradient(top, #3b86c4, #2b628f);
329
-
border-top: none;
330
-
border-bottom: none;
331
-
}
332
-
333
-
.conpherence-durable-column-body .day-header.today .day-name,
334
-
.conpherence-durable-column-body .day-header.today .day-date {
335
-
color: #fff;
336
-
}
337
-
338
-
.conpherence-durable-column-body .day-header .day-name {
339
-
float: left;
340
-
color: #555759;
341
-
font-weight: bold;
342
-
text-transform: uppercase;
343
-
font-size: 11px;
344
-
}
345
-
346
-
.conpherence-durable-column-body .day-header .day-date {
347
-
float: right;
348
-
color: #555759;
349
-
font-size: 11px;
350
-
}
351
-
352
-
.conpherence-durable-column-body .top-border {
353
-
border-top: 1px solid #E7E7E7;
354
-
}
355
-
356
-
.conpherence-durable-column-body .user-status {
357
-
padding: 10px 0px 10px 0px;
358
-
margin: 0px 0px 0px 10px;
359
-
}
360
-
361
-
.conpherence-durable-column-body .user-status .icon {
362
-
border-radius: 8px;
363
-
height: 14px;
364
-
width: 14px;
365
-
margin-top: 7px;
366
-
float: left;
367
-
}
368
-
369
-
.conpherence-durable-column-body .sporadic .icon {
370
-
background-color: rgb(222, 226, 232);
371
-
}
372
-
373
-
.conpherence-durable-column-body .away .icon {
374
-
background-color: rgb(102, 204, 255);
375
-
}
376
-
377
-
.conpherence-durable-column-body .user-status .description {
378
-
width: 195px;
379
-
text-overflow: ellipsis;
380
-
margin: 0 0 0px 20px;
381
-
}
382
-
383
-
.conpherence-durable-column-body .user-status .participant {
384
-
font-size: 11px;
385
-
color: {$lightgreytext};
386
-
padding-top: 2px;
387
-
}
388
-
389
-
/* settings widget */
390
-
391
-
.conpherence-durable-column-body .notifications-update {
392
-
margin: 0px 12px;
393
-
}
394
-
395
-
.conpherence-durable-column-body .aphront-form-input {
396
-
margin: 8px 12px;
397
-
width: 100%;
398
-
}
399
-
400
179
.conpherence-durable-column-footer {
401
180
position: absolute;
402
181
height: 26px;
···
404
183
left: 0;
405
184
right: 0;
406
185
bottom: 0;
186
+
background-color: {$lightgreybackground};
407
187
}
408
188
409
189
.conpherence-durable-column-footer button {
+1
webroot/rsrc/css/font/font-source-sans-pro.css
+1
webroot/rsrc/css/font/font-source-sans-pro.css
+3
-1
webroot/rsrc/css/phui/phui-fontkit.css
+3
-1
webroot/rsrc/css/phui/phui-fontkit.css
···
10
10
}
11
11
12
12
.phui-font-source-sans.conpherence-message-pane,
13
-
.phui-font-source-sans.conpherence-message-pane .remarkup-assist-textarea {
13
+
.phui-font-source-sans.conpherence-message-pane .remarkup-assist-textarea,
14
+
.conpherence-durable-column-body,
15
+
.conpherence-durable-column-body .remarkup-assist-textarea {
14
16
font-family: 'Source Sans Pro', 'Helvetica Neue', Arial, sans-serif;
15
17
font-weight: 400;
16
18
font-size: 14px;