@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
[Redesign] Remove gradient headers
Summary: Ref T8099, this removes the gradient headers and their edge cases in Pinboard View, Setup Issues, Exceptions, and Document Heiriarchy.
Test Plan:
Tested each of these, grep for "gradient" and verify all states are gone.
{F410708}
{F410709}
{F410710}
{F410714}
Reviewers: btrahan, epriestley
Reviewed By: epriestley
Subscribers: Korvin, epriestley
Maniphest Tasks: T8099
Differential Revision: https://secure.phabricator.com/D12944
+60
-187
+9
-13
resources/celerity/map.php
+9
-13
resources/celerity/map.php
···
7
7
*/
8
8
return array(
9
9
'names' => array(
10
-
'core.pkg.css' => 'a16eb6ed',
10
+
'core.pkg.css' => 'df06e8ae',
11
11
'core.pkg.js' => 'f3e08b38',
12
12
'darkconsole.pkg.js' => 'e7393ebb',
13
13
'differential.pkg.css' => 'bb338e4b',
···
43
43
'rsrc/css/application/config/config-options.css' => '7fedf08b',
44
44
'rsrc/css/application/config/config-template.css' => '8e6c6fcd',
45
45
'rsrc/css/application/config/config-welcome.css' => '6abd79be',
46
-
'rsrc/css/application/config/setup-issue.css' => '22270af2',
47
-
'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2',
46
+
'rsrc/css/application/config/setup-issue.css' => '631c4e92',
47
+
'rsrc/css/application/config/unhandled-exception.css' => '4c96257a',
48
48
'rsrc/css/application/conpherence/durable-column.css' => 'd1e796f0',
49
49
'rsrc/css/application/conpherence/menu.css' => 'f9f1d143',
50
50
'rsrc/css/application/conpherence/message-pane.css' => '7cbf4cbb',
···
133
133
'rsrc/css/phui/phui-fontkit.css' => '489a1341',
134
134
'rsrc/css/phui/phui-form-view.css' => 'e1abbe8e',
135
135
'rsrc/css/phui/phui-form.css' => 'f535f938',
136
-
'rsrc/css/phui/phui-header-view.css' => '2ad5de97',
136
+
'rsrc/css/phui/phui-header-view.css' => '3c91963d',
137
137
'rsrc/css/phui/phui-icon.css' => '88ba9081',
138
138
'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8',
139
139
'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
···
141
141
'rsrc/css/phui/phui-list.css' => 'e448b6ba',
142
142
'rsrc/css/phui/phui-object-box.css' => 'c8d82bfe',
143
143
'rsrc/css/phui/phui-object-item-list-view.css' => '4be0645f',
144
-
'rsrc/css/phui/phui-pinboard-view.css' => 'eaab2b1b',
144
+
'rsrc/css/phui/phui-pinboard-view.css' => '22891c15',
145
145
'rsrc/css/phui/phui-property-list-view.css' => 'd2d143ea',
146
146
'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b',
147
147
'rsrc/css/phui/phui-spacing.css' => '042804d6',
···
151
151
'rsrc/css/phui/phui-timeline-view.css' => 'a85542c8',
152
152
'rsrc/css/phui/phui-workboard-view.css' => '38446bc3',
153
153
'rsrc/css/phui/phui-workpanel-view.css' => 'e6435408',
154
-
'rsrc/css/sprite-gradient.css' => '4bdb98a7',
155
154
'rsrc/css/sprite-login.css' => 'a3526809',
156
155
'rsrc/css/sprite-main-header.css' => '28d01b0b',
157
156
'rsrc/css/sprite-menu.css' => '02aa815a',
···
303
302
'rsrc/image/people/washington.png' => '40dd301c',
304
303
'rsrc/image/phrequent_active.png' => 'a466a8ed',
305
304
'rsrc/image/phrequent_inactive.png' => 'bfc15a69',
306
-
'rsrc/image/sprite-gradient.png' => 'ec15a417',
307
305
'rsrc/image/sprite-login-X2.png' => 'a15918f0',
308
306
'rsrc/image/sprite-login.png' => '8cee4f6e',
309
307
'rsrc/image/sprite-main-header.png' => '39419fa6',
···
767
765
'phui-fontkit-css' => '489a1341',
768
766
'phui-form-css' => 'f535f938',
769
767
'phui-form-view-css' => 'e1abbe8e',
770
-
'phui-header-view-css' => '2ad5de97',
768
+
'phui-header-view-css' => '3c91963d',
771
769
'phui-icon-view-css' => '88ba9081',
772
770
'phui-image-mask-css' => '5a8b09c8',
773
771
'phui-info-panel-css' => '27ea50a1',
···
776
774
'phui-list-view-css' => 'e448b6ba',
777
775
'phui-object-box-css' => 'c8d82bfe',
778
776
'phui-object-item-list-view-css' => '4be0645f',
779
-
'phui-pinboard-view-css' => 'eaab2b1b',
777
+
'phui-pinboard-view-css' => '22891c15',
780
778
'phui-property-list-view-css' => 'd2d143ea',
781
779
'phui-remarkup-preview-css' => '19ad512b',
782
780
'phui-spacing-css' => '042804d6',
···
804
802
'releeph-preview-branch' => 'b7a6f4a5',
805
803
'releeph-request-differential-create-dialog' => '8d8b92cd',
806
804
'releeph-request-typeahead-css' => '667a48ae',
807
-
'setup-issue-css' => '22270af2',
808
-
'sprite-gradient-css' => '4bdb98a7',
805
+
'setup-issue-css' => '631c4e92',
809
806
'sprite-login-css' => 'a3526809',
810
807
'sprite-main-header-css' => '28d01b0b',
811
808
'sprite-menu-css' => '02aa815a',
···
814
811
'syntax-highlighting-css' => '6b7b24d9',
815
812
'tokens-css' => '3d0f239e',
816
813
'typeahead-browse-css' => 'd8581d2c',
817
-
'unhandled-exception-css' => '37d4f9a2',
814
+
'unhandled-exception-css' => '4c96257a',
818
815
),
819
816
'requires' => array(
820
817
'029a133d' => array(
···
2039
2036
'aphront-tooltip-css',
2040
2037
'phabricator-flag-css',
2041
2038
'phui-info-view-css',
2042
-
'sprite-gradient-css',
2043
2039
'sprite-menu-css',
2044
2040
'phabricator-main-menu-view',
2045
2041
'phabricator-notification-css',
-2
resources/celerity/packages.php
-2
resources/celerity/packages.php
resources/sprite/gradients/dark-grey-header.png
resources/sprite/gradients/dark-grey-header.png
This is a binary file and will not be displayed.
resources/sprite/gradients/grey-header.png
resources/sprite/gradients/grey-header.png
This is a binary file and will not be displayed.
resources/sprite/gradients/lightblue-header.png
resources/sprite/gradients/lightblue-header.png
This is a binary file and will not be displayed.
resources/sprite/gradients/lightgreen-header.png
resources/sprite/gradients/lightgreen-header.png
This is a binary file and will not be displayed.
resources/sprite/gradients/lightred-header.png
resources/sprite/gradients/lightred-header.png
This is a binary file and will not be displayed.
resources/sprite/gradients/lightviolet-header.png
resources/sprite/gradients/lightviolet-header.png
This is a binary file and will not be displayed.
-40
resources/sprite/manifest/gradient.json
-40
resources/sprite/manifest/gradient.json
···
1
-
{
2
-
"version" : 1,
3
-
"sprites" : {
4
-
"gradient-dark-grey-header" : {
5
-
"name" : "gradient-dark-grey-header",
6
-
"rule" : ".gradient-dark-grey-header",
7
-
"hash" : "e8762dd2849410a7e4fba8f972f946ff"
8
-
},
9
-
"gradient-grey-header" : {
10
-
"name" : "gradient-grey-header",
11
-
"rule" : ".gradient-grey-header",
12
-
"hash" : "1c8f8d61984e3fc5a7e528b9bd4d484a"
13
-
},
14
-
"gradient-lightblue-header" : {
15
-
"name" : "gradient-lightblue-header",
16
-
"rule" : ".gradient-lightblue-header",
17
-
"hash" : "e7753a6ce63c6822a559266eef9e255b"
18
-
},
19
-
"gradient-lightgreen-header" : {
20
-
"name" : "gradient-lightgreen-header",
21
-
"rule" : ".gradient-lightgreen-header",
22
-
"hash" : "87b5c391ea4ea84dd8531fb0f199cbeb"
23
-
},
24
-
"gradient-lightred-header" : {
25
-
"name" : "gradient-lightred-header",
26
-
"rule" : ".gradient-lightred-header",
27
-
"hash" : "a367ea9163aa15f52c105b5805cf493e"
28
-
},
29
-
"gradient-lightviolet-header" : {
30
-
"name" : "gradient-lightviolet-header",
31
-
"rule" : ".gradient-lightviolet-header",
32
-
"hash" : "e17e05135e53e1258340cfc27f96f23f"
33
-
}
34
-
},
35
-
"scales" : [
36
-
1
37
-
],
38
-
"header" : "\/**\n * @provides sprite-gradient-css\n * @generated\n *\/\n\n.sprite-gradient {\n background-image: url(\/rsrc\/image\/sprite-gradient.png);\n background-repeat: repeat-x;\n}\n\n\n",
39
-
"type" : "repeat-x"
40
-
}
-1
scripts/celerity/generate_sprites.php
-1
scripts/celerity/generate_sprites.php
···
29
29
$sheets = array(
30
30
'menu' => $generator->buildMenuSheet(),
31
31
'tokens' => $generator->buildTokenSheet(),
32
-
'gradient' => $generator->buildGradientSheet(),
33
32
'main-header' => $generator->buildMainHeaderSheet(),
34
33
'login' => $generator->buildLoginSheet(),
35
34
'projects' => $generator->buildProjectsSheet(),
-39
src/applications/celerity/CeleritySpriteGenerator.php
-39
src/applications/celerity/CeleritySpriteGenerator.php
···
144
144
return $sheet;
145
145
}
146
146
147
-
public function buildGradientSheet() {
148
-
$gradients = $this->getDirectoryList('gradients');
149
-
150
-
$template = new PhutilSprite();
151
-
152
-
$unusual_heights = array(
153
-
'breadcrumbs' => 31,
154
-
'grey-header' => 70,
155
-
'dark-grey-header' => 70,
156
-
'lightblue-header' => 240,
157
-
'lightgreen-header' => 240,
158
-
'lightviolet-header' => 240,
159
-
'lightred-header' => 240,
160
-
);
161
-
162
-
$sprites = array();
163
-
foreach ($gradients as $gradient) {
164
-
$path = $this->getPath('gradients/'.$gradient.'.png');
165
-
$sprite = id(clone $template)
166
-
->setName('gradient-'.$gradient)
167
-
->setSourceFile($path)
168
-
->setTargetCSS('.gradient-'.$gradient);
169
-
170
-
$sprite->setSourceSize(4, idx($unusual_heights, $gradient, 26));
171
-
172
-
$sprites[] = $sprite;
173
-
}
174
-
175
-
$sheet = $this->buildSheet(
176
-
'gradient',
177
-
false,
178
-
PhutilSpriteSheet::TYPE_REPEAT_X);
179
-
foreach ($sprites as $sprite) {
180
-
$sheet->addSprite($sprite);
181
-
}
182
-
183
-
return $sheet;
184
-
}
185
-
186
147
public function buildMainHeaderSheet() {
187
148
$gradients = $this->getDirectoryList('main_header');
188
149
$template = new PhutilSprite();
+22
-19
src/applications/phriction/controller/PhrictionDocumentController.php
+22
-19
src/applications/phriction/controller/PhrictionDocumentController.php
···
391
391
392
392
$list = array();
393
393
foreach ($children_dicts as $child) {
394
-
$list[] = hsprintf('<li>');
394
+
$list[] = hsprintf('<li class="remarkup-list-item">');
395
395
$list[] = $this->renderChildDocumentLink($child);
396
396
$grand = idx($grandchildren_dicts, $child['slug'], array());
397
397
if ($grand) {
398
-
$list[] = hsprintf('<ul>');
398
+
$list[] = hsprintf('<ul class="remarkup-list">');
399
399
foreach ($grand as $grandchild) {
400
-
$list[] = hsprintf('<li>');
400
+
$list[] = hsprintf('<li class="remarkup-list-item">');
401
401
$list[] = $this->renderChildDocumentLink($grandchild);
402
402
$list[] = hsprintf('</li>');
403
403
}
···
406
406
$list[] = hsprintf('</li>');
407
407
}
408
408
if ($more_children) {
409
-
$list[] = phutil_tag('li', array(), pht('More...'));
409
+
$list[] = phutil_tag(
410
+
'li',
411
+
array(
412
+
'class' => 'remarkup-list-item',
413
+
),
414
+
pht('More...'));
410
415
}
411
416
412
-
$content = array(
413
-
phutil_tag(
417
+
$header = id(new PHUIHeaderView())
418
+
->setHeader(pht('Document Hierarchy'));
419
+
420
+
return id(new PHUIDocumentView())
421
+
->setHeader($header)
422
+
->appendChild(phutil_tag(
414
423
'div',
415
424
array(
416
-
'class' => 'phriction-children-header '.
417
-
'sprite-gradient gradient-lightblue-header',
418
-
),
419
-
pht('Document Hierarchy')),
420
-
phutil_tag(
421
-
'div',
422
-
array(
423
-
'class' => 'phriction-children',
425
+
'class' => 'phabricator-remarkup',
424
426
),
425
-
phutil_tag('ul', array(), $list)),
426
-
);
427
-
428
-
return id(new PHUIDocumentView())
429
-
->appendChild($content);
427
+
phutil_tag(
428
+
'ul',
429
+
array(
430
+
'class' => 'remarkup-list',
431
+
),
432
+
$list)));
430
433
}
431
434
432
435
private function renderChildDocumentLink(array $info) {
-1
src/view/page/PhabricatorStandardPageView.php
-1
src/view/page/PhabricatorStandardPageView.php
···
170
170
require_celerity_resource('phui-button-css');
171
171
require_celerity_resource('phui-spacing-css');
172
172
require_celerity_resource('phui-form-css');
173
-
require_celerity_resource('sprite-gradient-css');
174
173
require_celerity_resource('phabricator-standard-page-view');
175
174
require_celerity_resource('conpherence-durable-column-view');
176
175
+3
-5
src/view/phui/PHUIPinboardItemView.php
+3
-5
src/view/phui/PHUIPinboardItemView.php
···
46
46
require_celerity_resource('phui-pinboard-view-css');
47
47
$header = null;
48
48
if ($this->header) {
49
+
$header_color = null;
49
50
if ($this->disabled) {
50
-
$header_color = 'gradient-lightgrey-header';
51
-
} else {
52
-
$header_color = 'gradient-lightblue-header';
51
+
$header_color = 'phui-pinboard-disabled';
53
52
}
54
53
$header = phutil_tag(
55
54
'div',
56
55
array(
57
-
'class' => 'phui-pinboard-item-header '.
58
-
'sprite-gradient '.$header_color,
56
+
'class' => 'phui-pinboard-item-header '.$header_color,
59
57
),
60
58
phutil_tag('a', array('href' => $this->uri), $this->header));
61
59
}
+11
-13
webroot/rsrc/css/application/config/setup-issue.css
+11
-13
webroot/rsrc/css/application/config/setup-issue.css
···
1
1
/**
2
2
* @provides setup-issue-css
3
3
*/
4
-
5
-
6
4
.setup-issue-background {
7
5
padding: 12px 0;
8
6
}
···
15
13
.setup-issue {
16
14
background: #fff;
17
15
border: 1px solid #BFCFDA;
18
-
border-bottom: 1px solid #8C98B8;
16
+
padding: 8px;
17
+
border-radius: 3px;
19
18
}
20
19
21
20
.setup-issue p {
···
78
77
79
78
.setup-issue-name {
80
79
color: #464C5C;
81
-
text-shadow: 0 1px #fff;
82
-
padding: 16px 12px;
80
+
padding: 4px 8px 12px;
83
81
border-bottom: 1px solid #BFCFDA;
84
82
font-size: 15px;
85
-
font-weight: bold;
86
-
background-image: url(/rsrc/image/lightblue-header.png);
87
-
background-repeat: repeat-x;
83
+
font-weight: 500;
88
84
}
89
85
90
86
.setup-issue-tail {
···
92
88
}
93
89
94
90
.setup-issue-status {
91
+
margin: 12px 4px 0;
95
92
padding: 12px;
96
93
background: #FDF5D4;
97
94
color: #bc7837;
98
-
border-bottom: 1px solid #BFCFDA;
95
+
border: 1px solid #bc7837;
96
+
border-radius: 3px;
99
97
}
100
98
101
99
.setup-issue-actions {
102
-
padding: 12px;
103
-
background: #f3f3f3;
100
+
padding: 8px 12px;
104
101
border-top: 1px solid #dfdfdf;
102
+
background-color: #f7f7f7;
105
103
overflow: hidden;
104
+
margin: 0 -8px -8px -8px;
106
105
}
107
106
108
107
.setup-issue-next {
···
115
114
}
116
115
117
116
.setup-issue-config {
118
-
padding: 0 12px;
119
-
background: #fff;
117
+
padding: 8px 12px;
120
118
}
121
119
122
120
.setup-issue ul {
+8
-10
webroot/rsrc/css/application/config/unhandled-exception.css
+8
-10
webroot/rsrc/css/application/config/unhandled-exception.css
···
6
6
max-width: 760px;
7
7
margin: 24px auto;
8
8
background: #fff;
9
-
border: 1px solid #f4c6c6;
10
-
border-bottom: 1px solid #eb9797;
9
+
border: 1px solid #c0392b;
10
+
border-radius: 3px;
11
+
padding: 0 8px;
11
12
}
12
13
13
14
.unhandled-exception-detail .unhandled-exception-title {
14
-
color: #802b2b;
15
-
text-shadow: 0 1px #fff;
16
-
padding: 16px 12px;
17
-
border-bottom: 1px solid #f4c6c6;
18
-
font-size: 15px;
19
-
font-weight: bold;
20
-
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAADwCAIAAABHUjkYAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAEpJREFUeNrs0TEKADAIBEER//9aa00bmzTGNNnrBhEO1ayxcJctKjUmmaf5a5tEtPazt/+67/Q/bvfr3nu6D8YYY4wxxvgfLwEGAIQkJawSMraKAAAAAElFTkSuQmCC');
21
-
background-repeat: repeat-x;
15
+
color: #c0392b;
16
+
padding: 12px 8px;
17
+
border-bottom: 1px solid #f4dddb;
18
+
font-size: 16px;
19
+
font-weight: 500;
22
20
margin: 0;
23
21
}
24
22
-4
webroot/rsrc/css/phui/phui-header-view.css
-4
webroot/rsrc/css/phui/phui-header-view.css
+7
-4
webroot/rsrc/css/phui/phui-pinboard-view.css
+7
-4
webroot/rsrc/css/phui/phui-pinboard-view.css
···
17
17
background: #ffffff;
18
18
border-radius: 3px;
19
19
border: 1px solid {$lightblueborder};
20
-
border-bottom: 1px solid {$blueborder};
21
20
text-align: left;
22
21
width: 288px;
23
22
}
···
27
26
}
28
27
29
28
.device-desktop .phui-pinboard-item-view:hover {
30
-
box-shadow: {$dropshadow};
29
+
border-color: {$blue};
30
+
}
31
+
32
+
.device-desktop .phui-pinboard-item-view:hover .phui-pinboard-item-header a {
33
+
color: {$blue};
31
34
}
32
35
33
36
/* On phones, show a single column of items. */
···
42
45
font-weight: bold;
43
46
border-top-left-radius: 3px;
44
47
border-top-right-radius: 3px;
45
-
border-bottom: 1px solid {$lightblueborder};
48
+
border-bottom: 1px solid {$thinblueborder};
46
49
white-space: nowrap;
47
50
overflow: hidden;
48
51
}
49
52
50
53
.phui-pinboard-item-header a {
51
-
color: {$bluetext};
54
+
color: {$darkbluetext};
52
55
}
53
56
54
57
.phui-pinboard-item-image-link {
-36
webroot/rsrc/css/sprite-gradient.css
-36
webroot/rsrc/css/sprite-gradient.css
···
1
-
/**
2
-
* @provides sprite-gradient-css
3
-
* @generated
4
-
*/
5
-
6
-
.sprite-gradient {
7
-
background-image: url(/rsrc/image/sprite-gradient.png);
8
-
background-repeat: repeat-x;
9
-
}
10
-
11
-
12
-
13
-
14
-
.gradient-dark-grey-header {
15
-
background-position: 0px 0px;
16
-
}
17
-
18
-
.gradient-grey-header {
19
-
background-position: 0px -71px;
20
-
}
21
-
22
-
.gradient-lightblue-header {
23
-
background-position: 0px -142px;
24
-
}
25
-
26
-
.gradient-lightgreen-header {
27
-
background-position: 0px -383px;
28
-
}
29
-
30
-
.gradient-lightred-header {
31
-
background-position: 0px -624px;
32
-
}
33
-
34
-
.gradient-lightviolet-header {
35
-
background-position: 0px -865px;
36
-
}
webroot/rsrc/image/sprite-gradient.png
webroot/rsrc/image/sprite-gradient.png
This is a binary file and will not be displayed.