Skip to content

Commit ed8118d

Browse files
committed
[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
1 parent fa858cc commit ed8118d

20 files changed

+60
-187
lines changed

resources/celerity/map.php

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88
return array(
99
'names' => array(
10-
'core.pkg.css' => 'bd0be091',
10+
'core.pkg.css' => '92042a08',
1111
'core.pkg.js' => 'f3e08b38',
1212
'darkconsole.pkg.js' => 'e7393ebb',
1313
'differential.pkg.css' => 'bb338e4b',
@@ -43,8 +43,8 @@
4343
'rsrc/css/application/config/config-options.css' => '7fedf08b',
4444
'rsrc/css/application/config/config-template.css' => '8e6c6fcd',
4545
'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' => 'a4aeaa42',
47+
'rsrc/css/application/config/unhandled-exception.css' => '4c96257a',
4848
'rsrc/css/application/conpherence/durable-column.css' => 'd1e796f0',
4949
'rsrc/css/application/conpherence/menu.css' => 'f9f1d143',
5050
'rsrc/css/application/conpherence/message-pane.css' => '7cbf4cbb',
@@ -133,15 +133,15 @@
133133
'rsrc/css/phui/phui-fontkit.css' => '489a1341',
134134
'rsrc/css/phui/phui-form-view.css' => 'e1abbe8e',
135135
'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',
137137
'rsrc/css/phui/phui-icon.css' => '88ba9081',
138138
'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8',
139139
'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
140140
'rsrc/css/phui/phui-info-view.css' => '33595731',
141141
'rsrc/css/phui/phui-list.css' => 'e448b6ba',
142142
'rsrc/css/phui/phui-object-box.css' => '8c1cf7c0',
143143
'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',
145145
'rsrc/css/phui/phui-property-list-view.css' => 'd2d143ea',
146146
'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b',
147147
'rsrc/css/phui/phui-spacing.css' => '042804d6',
@@ -151,7 +151,6 @@
151151
'rsrc/css/phui/phui-timeline-view.css' => 'a85542c8',
152152
'rsrc/css/phui/phui-workboard-view.css' => '38446bc3',
153153
'rsrc/css/phui/phui-workpanel-view.css' => 'e6435408',
154-
'rsrc/css/sprite-gradient.css' => '4bdb98a7',
155154
'rsrc/css/sprite-login.css' => 'a3526809',
156155
'rsrc/css/sprite-main-header.css' => '28d01b0b',
157156
'rsrc/css/sprite-menu.css' => '02aa815a',
@@ -303,7 +302,6 @@
303302
'rsrc/image/people/washington.png' => '40dd301c',
304303
'rsrc/image/phrequent_active.png' => 'a466a8ed',
305304
'rsrc/image/phrequent_inactive.png' => 'bfc15a69',
306-
'rsrc/image/sprite-gradient.png' => 'ec15a417',
307305
'rsrc/image/sprite-login-X2.png' => 'a15918f0',
308306
'rsrc/image/sprite-login.png' => '8cee4f6e',
309307
'rsrc/image/sprite-main-header.png' => '39419fa6',
@@ -767,7 +765,7 @@
767765
'phui-fontkit-css' => '489a1341',
768766
'phui-form-css' => 'f535f938',
769767
'phui-form-view-css' => 'e1abbe8e',
770-
'phui-header-view-css' => '2ad5de97',
768+
'phui-header-view-css' => '3c91963d',
771769
'phui-icon-view-css' => '88ba9081',
772770
'phui-image-mask-css' => '5a8b09c8',
773771
'phui-info-panel-css' => '27ea50a1',
@@ -776,7 +774,7 @@
776774
'phui-list-view-css' => 'e448b6ba',
777775
'phui-object-box-css' => '8c1cf7c0',
778776
'phui-object-item-list-view-css' => '4be0645f',
779-
'phui-pinboard-view-css' => 'eaab2b1b',
777+
'phui-pinboard-view-css' => '22891c15',
780778
'phui-property-list-view-css' => 'd2d143ea',
781779
'phui-remarkup-preview-css' => '19ad512b',
782780
'phui-spacing-css' => '042804d6',
@@ -804,8 +802,7 @@
804802
'releeph-preview-branch' => 'b7a6f4a5',
805803
'releeph-request-differential-create-dialog' => '8d8b92cd',
806804
'releeph-request-typeahead-css' => '667a48ae',
807-
'setup-issue-css' => '22270af2',
808-
'sprite-gradient-css' => '4bdb98a7',
805+
'setup-issue-css' => 'a4aeaa42',
809806
'sprite-login-css' => 'a3526809',
810807
'sprite-main-header-css' => '28d01b0b',
811808
'sprite-menu-css' => '02aa815a',
@@ -814,7 +811,7 @@
814811
'syntax-highlighting-css' => '6b7b24d9',
815812
'tokens-css' => '3d0f239e',
816813
'typeahead-browse-css' => 'd8581d2c',
817-
'unhandled-exception-css' => '37d4f9a2',
814+
'unhandled-exception-css' => '4c96257a',
818815
),
819816
'requires' => array(
820817
'029a133d' => array(
@@ -2039,7 +2036,6 @@
20392036
'aphront-tooltip-css',
20402037
'phabricator-flag-css',
20412038
'phui-info-view-css',
2042-
'sprite-gradient-css',
20432039
'sprite-menu-css',
20442040
'phabricator-main-menu-view',
20452041
'phabricator-notification-css',

resources/celerity/packages.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@
100100
'aphront-tooltip-css',
101101
'phabricator-flag-css',
102102
'phui-info-view-css',
103-
104-
'sprite-gradient-css',
105103
'sprite-menu-css',
106104

107105
'phabricator-main-menu-view',
-966 Bytes
Binary file not shown.
-964 Bytes
Binary file not shown.
-195 Bytes
Binary file not shown.
-201 Bytes
Binary file not shown.
-168 Bytes
Binary file not shown.
-178 Bytes
Binary file not shown.

resources/sprite/manifest/gradient.json

Lines changed: 0 additions & 40 deletions
This file was deleted.

scripts/celerity/generate_sprites.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
$sheets = array(
3030
'menu' => $generator->buildMenuSheet(),
3131
'tokens' => $generator->buildTokenSheet(),
32-
'gradient' => $generator->buildGradientSheet(),
3332
'main-header' => $generator->buildMainHeaderSheet(),
3433
'login' => $generator->buildLoginSheet(),
3534
'projects' => $generator->buildProjectsSheet(),

src/applications/celerity/CeleritySpriteGenerator.php

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -144,45 +144,6 @@ public function buildLoginSheet() {
144144
return $sheet;
145145
}
146146

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-
186147
public function buildMainHeaderSheet() {
187148
$gradients = $this->getDirectoryList('main_header');
188149
$template = new PhutilSprite();

src/applications/phriction/controller/PhrictionDocumentController.php

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -391,13 +391,13 @@ private function renderDocumentChildren($slug) {
391391

392392
$list = array();
393393
foreach ($children_dicts as $child) {
394-
$list[] = hsprintf('<li>');
394+
$list[] = hsprintf('<li class="remarkup-list-item">');
395395
$list[] = $this->renderChildDocumentLink($child);
396396
$grand = idx($grandchildren_dicts, $child['slug'], array());
397397
if ($grand) {
398-
$list[] = hsprintf('<ul>');
398+
$list[] = hsprintf('<ul class="remarkup-list">');
399399
foreach ($grand as $grandchild) {
400-
$list[] = hsprintf('<li>');
400+
$list[] = hsprintf('<li class="remarkup-list-item">');
401401
$list[] = $this->renderChildDocumentLink($grandchild);
402402
$list[] = hsprintf('</li>');
403403
}
@@ -406,27 +406,30 @@ private function renderDocumentChildren($slug) {
406406
$list[] = hsprintf('</li>');
407407
}
408408
if ($more_children) {
409-
$list[] = phutil_tag('li', array(), pht('More...'));
410-
}
411-
412-
$content = array(
413-
phutil_tag(
414-
'div',
409+
$list[] = phutil_tag(
410+
'li',
415411
array(
416-
'class' => 'phriction-children-header '.
417-
'sprite-gradient gradient-lightblue-header',
412+
'class' => 'remarkup-list-item',
418413
),
419-
pht('Document Hierarchy')),
420-
phutil_tag(
414+
pht('More...'));
415+
}
416+
417+
$header = id(new PHUIHeaderView())
418+
->setHeader(pht('Document Hierarchy'));
419+
420+
return id(new PHUIDocumentView())
421+
->setHeader($header)
422+
->appendChild(phutil_tag(
421423
'div',
422424
array(
423-
'class' => 'phriction-children',
425+
'class' => 'phabricator-remarkup',
424426
),
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)));
430433
}
431434

432435
private function renderChildDocumentLink(array $info) {

src/view/page/PhabricatorStandardPageView.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ protected function willRenderPage() {
170170
require_celerity_resource('phui-button-css');
171171
require_celerity_resource('phui-spacing-css');
172172
require_celerity_resource('phui-form-css');
173-
require_celerity_resource('sprite-gradient-css');
174173
require_celerity_resource('phabricator-standard-page-view');
175174
require_celerity_resource('conpherence-durable-column-view');
176175

src/view/phui/PHUIPinboardItemView.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,14 @@ public function render() {
4646
require_celerity_resource('phui-pinboard-view-css');
4747
$header = null;
4848
if ($this->header) {
49+
$header_color = null;
4950
if ($this->disabled) {
50-
$header_color = 'gradient-lightgrey-header';
51-
} else {
52-
$header_color = 'gradient-lightblue-header';
51+
$header_color = 'phui-pinboard-disabled';
5352
}
5453
$header = phutil_tag(
5554
'div',
5655
array(
57-
'class' => 'phui-pinboard-item-header '.
58-
'sprite-gradient '.$header_color,
56+
'class' => 'phui-pinboard-item-header '.$header_color,
5957
),
6058
phutil_tag('a', array('href' => $this->uri), $this->header));
6159
}

webroot/rsrc/css/application/config/setup-issue.css

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
/**
22
* @provides setup-issue-css
33
*/
4-
5-
64
.setup-issue-background {
75
padding: 12px 0;
86
}
@@ -15,7 +13,8 @@
1513
.setup-issue {
1614
background: #fff;
1715
border: 1px solid #BFCFDA;
18-
border-bottom: 1px solid #8C98B8;
16+
padding: 8px;
17+
border-radius: 3px;
1918
}
2019

2120
.setup-issue p {
@@ -78,31 +77,31 @@
7877

7978
.setup-issue-name {
8079
color: #464C5C;
81-
text-shadow: 0 1px #fff;
82-
padding: 16px 12px;
80+
padding: 4px 8px 12px;
8381
border-bottom: 1px solid #BFCFDA;
8482
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;
8884
}
8985

9086
.setup-issue-tail {
9187
margin-top: 12px;
9288
}
9389

9490
.setup-issue-status {
91+
margin: 12px 4px 0;
9592
padding: 12px;
9693
background: #FDF5D4;
9794
color: #bc7837;
98-
border-bottom: 1px solid #BFCFDA;
95+
border: 1px solid #bc7837;
96+
border-radius: 3px;
9997
}
10098

10199
.setup-issue-actions {
102-
padding: 12px;
103-
background: #f3f3f3;
100+
padding: 8px 12px;
104101
border-top: 1px solid #dfdfdf;
102+
background-color: #f7f7f7;
105103
overflow: hidden;
104+
margin: 0 -8px -8px -8px;
106105
}
107106

108107
.setup-issue-next {
@@ -115,8 +114,7 @@
115114
}
116115

117116
.setup-issue-config {
118-
padding: 0 12px;
119-
background: #fff;
117+
padding: 8px 12px;
120118
}
121119

122120
.setup-issue ul {

webroot/rsrc/css/application/config/unhandled-exception.css

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,17 @@
66
max-width: 760px;
77
margin: 24px auto;
88
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;
1112
}
1213

1314
.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;
2220
margin: 0;
2321
}
2422

0 commit comments

Comments
 (0)