Skip to content

Commit 5a8a32b

Browse files
committedMay 23, 2014
Dashboard UI stuffs
Summary: - Make CSS more resilient with columns - Add objectlist css - Fix Maniphest list css Test Plan: Tested a number of different panels and dashboards, desktop, tablet, and mobile. {F159447} Reviewers: btrahan, epriestley Reviewed By: epriestley Subscribers: epriestley, Korvin Differential Revision: https://secure.phabricator.com/D9273
1 parent 102befd commit 5a8a32b

File tree

6 files changed

+42
-44
lines changed

6 files changed

+42
-44
lines changed
 

‎resources/celerity/map.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
return array(
88
'names' =>
99
array(
10-
'core.pkg.css' => 'f936c63f',
10+
'core.pkg.css' => '8de873a1',
1111
'core.pkg.js' => 'e01fd8e2',
1212
'darkconsole.pkg.js' => 'ca8671ce',
1313
'differential.pkg.css' => 'fbf57382',
1414
'differential.pkg.js' => 'f4c86691',
1515
'diffusion.pkg.css' => '3783278d',
1616
'diffusion.pkg.js' => '077e3ad0',
17-
'maniphest.pkg.css' => 'fdc718f2',
17+
'maniphest.pkg.css' => '90fd820a',
1818
'maniphest.pkg.js' => 'd1347a35',
1919
'rsrc/css/aphront/aphront-bars.css' => '231ac33c',
2020
'rsrc/css/aphront/context-bar.css' => '1c3b0529',
@@ -51,7 +51,7 @@
5151
'rsrc/css/application/conpherence/widget-pane.css' => 'bf275a6c',
5252
'rsrc/css/application/contentsource/content-source-view.css' => '4b8b05d4',
5353
'rsrc/css/application/countdown/timer.css' => '86b7b0a0',
54-
'rsrc/css/application/dashboard/dashboard.css' => 'c1d7f80b',
54+
'rsrc/css/application/dashboard/dashboard.css' => 'f593f8c2',
5555
'rsrc/css/application/diff/inline-comment-summary.css' => '8cfd34e8',
5656
'rsrc/css/application/differential/add-comment.css' => 'c478bcaa',
5757
'rsrc/css/application/differential/changeset-view.css' => 'f234b888',
@@ -74,7 +74,7 @@
7474
'rsrc/css/application/maniphest/batch-editor.css' => '8f380ebc',
7575
'rsrc/css/application/maniphest/report.css' => '6fc16517',
7676
'rsrc/css/application/maniphest/task-edit.css' => '8e23031b',
77-
'rsrc/css/application/maniphest/task-summary.css' => '05ccbfb7',
77+
'rsrc/css/application/maniphest/task-summary.css' => '74820b2f',
7878
'rsrc/css/application/objectselector/object-selector.css' => '029a133d',
7979
'rsrc/css/application/owners/owners-path-editor.css' => '2f00933b',
8080
'rsrc/css/application/paste/paste.css' => 'aa1767d1',
@@ -137,7 +137,7 @@
137137
'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
138138
'rsrc/css/phui/phui-list.css' => 'ce29d035',
139139
'rsrc/css/phui/phui-object-box.css' => 'ce92d8ec',
140-
'rsrc/css/phui/phui-object-item-list-view.css' => '64b6b266',
140+
'rsrc/css/phui/phui-object-item-list-view.css' => 'f01650b6',
141141
'rsrc/css/phui/phui-pinboard-view.css' => '874c22f9',
142142
'rsrc/css/phui/phui-property-list-view.css' => '2f7199e8',
143143
'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b',
@@ -681,7 +681,7 @@
681681
'maniphest-batch-editor' => '8f380ebc',
682682
'maniphest-report-css' => '6fc16517',
683683
'maniphest-task-edit-css' => '8e23031b',
684-
'maniphest-task-summary-css' => '05ccbfb7',
684+
'maniphest-task-summary-css' => '74820b2f',
685685
'multirow-row-manager' => '50395a1b',
686686
'owners-path-editor' => '46efd18e',
687687
'owners-path-editor-css' => '2f00933b',
@@ -697,7 +697,7 @@
697697
'phabricator-core-css' => '40151074',
698698
'phabricator-countdown-css' => '86b7b0a0',
699699
'phabricator-crumbs-view-css' => '6a23399c',
700-
'phabricator-dashboard-css' => 'c1d7f80b',
700+
'phabricator-dashboard-css' => 'f593f8c2',
701701
'phabricator-drag-and-drop-file-upload' => 'ae6abfba',
702702
'phabricator-draggable-list' => '1681c4d4',
703703
'phabricator-fatal-config-template-css' => '25d446d6',
@@ -768,7 +768,7 @@
768768
'phui-info-panel-css' => '27ea50a1',
769769
'phui-list-view-css' => 'ce29d035',
770770
'phui-object-box-css' => 'ce92d8ec',
771-
'phui-object-item-list-view-css' => '64b6b266',
771+
'phui-object-item-list-view-css' => 'f01650b6',
772772
'phui-pinboard-view-css' => '874c22f9',
773773
'phui-property-list-view-css' => '2f7199e8',
774774
'phui-remarkup-preview-css' => '19ad512b',

‎src/applications/dashboard/controller/PhabricatorDashboardPanelRenderController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function processRequest() {
5555
->addTextCrumb(pht('Standalone View'));
5656

5757
$view = id(new PHUIBoxView())
58-
->addMargin(PHUI::MARGIN_LARGE)
58+
->addClass('dashboard-view')
5959
->appendChild($rendered_panel);
6060

6161
return $this->buildApplicationPage(

‎src/applications/dashboard/engine/PhabricatorDashboardRenderingEngine.php

+7-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ public function renderDashboard() {
3232
$dashboard_id = celerity_generate_unique_node_id();
3333
$result = id(new AphrontMultiColumnView())
3434
->setID($dashboard_id)
35-
->setFluidlayout(true);
35+
->setFluidlayout(true)
36+
->setGutter(AphrontMultiColumnView::GUTTER_LARGE);
3637

3738
if ($this->arrangeMode) {
3839
$h_mode = PhabricatorDashboardPanelRenderingEngine::HEADER_MODE_EDIT;
@@ -76,7 +77,11 @@ public function renderDashboard() {
7677
));
7778
}
7879

79-
return $result;
80+
$view = id(new PHUIBoxView())
81+
->addClass('dashboard-view')
82+
->appendChild($result);
83+
84+
return $view;
8085
}
8186

8287
private function renderAddPanelPlaceHolder($column) {

‎webroot/rsrc/css/application/dashboard/dashboard.css

+12-24
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
22
* @provides phabricator-dashboard-css
33
*/
44

5+
.dashboard-view {
6+
margin: 16px;
7+
}
8+
9+
.device-phone .dashboard-view {
10+
margin: 8px;
11+
}
12+
13+
.dashboard-panel + .dashboard-panel {
14+
margin-top: 16px;
15+
}
16+
517
.device-desktop .aphront-multi-column-fluid .aphront-multi-column-2-up
618
.aphront-multi-column-column-outer.half {
719
width: 50%;
@@ -17,30 +29,6 @@
1729
width: 66.66%;
1830
}
1931

20-
.device-phone .aphront-multi-column-fluid
21-
.aphront-multi-column-column-outer
22-
.aphront-multi-column-column .dashboard-panel {
23-
margin: 16px 8px;
24-
}
25-
26-
.device-tablet .aphront-multi-column-fluid
27-
.aphront-multi-column-column-outer
28-
.aphront-multi-column-column .dashboard-panel {
29-
margin: 16px 16px 0;
30-
}
31-
32-
.aphront-multi-column-fluid
33-
.aphront-multi-column-column-outer
34-
.aphront-multi-column-column .dashboard-panel {
35-
margin: 16px 0 0 16px;
36-
}
37-
38-
.aphront-multi-column-fluid
39-
.aphront-multi-colum-column-outer-last
40-
.aphront-multi-column-column .dashboard-panel {
41-
margin: 16px 16px 0 16px;
42-
}
43-
4432
.aphront-multi-column-fluid
4533
.aphront-multi-column-column-outer.grippable
4634
.aphront-multi-column-column .dashboard-panel {

‎webroot/rsrc/css/application/maniphest/task-summary.css

+4-9
Original file line numberDiff line numberDiff line change
@@ -94,23 +94,18 @@
9494

9595
.dashboard-panel .maniphest-list-container {
9696
background: {$backdrop};
97-
border-left: 1px solid {$lightblueborder};
98-
border-right: 1px solid {$lightblueborder};
99-
border-bottom: 1px solid {$blueborder};
10097
}
10198

10299
.dashboard-panel .maniphest-list-container {
103-
padding: 4px 4px 0 4px;
100+
padding: 0;
104101
}
105102

106103
.dashboard-panel .maniphest-task-group-header {
107104
font-size: 12px;
108105
font-weight: normal;
109-
color: {$bluetext};
110-
padding: 4px 8px;
111-
background: rgba(255,255,255,.5);
112-
margin: 0 0 4px 0;
113-
border-radius: 3px;
106+
color: {$darkbluetext};
107+
padding: 8px 8px 2px;
108+
margin: 0;
114109
}
115110

116111
.dashboard-panel .maniphest-task-group + .maniphest-task-group {

‎webroot/rsrc/css/phui/phui-object-item-list-view.css

+10
Original file line numberDiff line numberDiff line change
@@ -649,3 +649,13 @@
649649
.phui-object-list-states .phui-object-item-frame {
650650
min-height: 44px;
651651
}
652+
653+
/* - Dashboards ------------------------------------------------------------ */
654+
655+
.dashboard-panel .phui-object-item-list-view {
656+
padding: 4px 4px 0 4px;
657+
background: {$backdrop};
658+
border-left: 1px solid {$lightblueborder};
659+
border-right: 1px solid {$lightblueborder};
660+
border-bottom: 1px solid {$blueborder};
661+
}

0 commit comments

Comments
 (0)
Failed to load comments.