Page MenuHomePhabricator
Files F13197639

D17924.diff
No OneTemporary
Actions

D17924.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
'names' => array(
'conpherence.pkg.css' => 'ff161f2d',
'conpherence.pkg.js' => 'b5b51108',
- 'core.pkg.css' => 'ee5f28cd',
+ 'core.pkg.css' => 'a5a2d647',
'core.pkg.js' => '8c5f913d',
'darkconsole.pkg.js' => '1f9a31bc',
'differential.pkg.css' => '4ff77743',
@@ -145,7 +145,7 @@
'rsrc/css/phui/phui-comment-form.css' => '57af2e14',
'rsrc/css/phui/phui-comment-panel.css' => 'f50152ad',
'rsrc/css/phui/phui-crumbs-view.css' => '6ece3bbb',
- 'rsrc/css/phui/phui-curtain-view.css' => '679743bb',
+ 'rsrc/css/phui/phui-curtain-view.css' => '55dd0e59',
'rsrc/css/phui/phui-document-pro.css' => '62c4dcbf',
'rsrc/css/phui/phui-document-summary.css' => '9ca48bdf',
'rsrc/css/phui/phui-document.css' => 'c32e8dec',
@@ -846,7 +846,7 @@
'phui-comment-form-css' => '57af2e14',
'phui-comment-panel-css' => 'f50152ad',
'phui-crumbs-view-css' => '6ece3bbb',
- 'phui-curtain-view-css' => '679743bb',
+ 'phui-curtain-view-css' => '55dd0e59',
'phui-document-summary-view-css' => '9ca48bdf',
'phui-document-view-css' => 'c32e8dec',
'phui-document-view-pro-css' => '62c4dcbf',
diff --git a/src/view/layout/PHUICurtainView.php b/src/view/layout/PHUICurtainView.php
--- a/src/view/layout/PHUICurtainView.php
+++ b/src/view/layout/PHUICurtainView.php
@@ -3,10 +3,11 @@
final class PHUICurtainView extends AphrontTagView {
private $actionList;
+ private $actions = array();
private $panels = array();
public function addAction(PhabricatorActionView $action) {
- $this->getActionList()->addAction($action);
+ $this->actions[] = $action;
return $this;
}
@@ -46,10 +47,18 @@
$panels = $this->renderPanels();
- return id(new PHUIObjectBoxView())
- ->appendChild($action_list)
- ->appendChild($panels)
- ->addClass('phui-two-column-properties');
+ foreach ($this->actions as $action) {
+ $this->getActionList()->addAction($action);
+ }
+
+ $view = new PHUIObjectBoxView();
+ if ($this->actions) {
+ $view->appendChild($action_list);
+ }
+ $view->appendChild($panels);
+ $view->addClass('phui-two-column-properties');
+
+ return $view;
}
private function renderPanels() {
diff --git a/webroot/rsrc/css/phui/phui-curtain-view.css b/webroot/rsrc/css/phui/phui-curtain-view.css
--- a/webroot/rsrc/css/phui/phui-curtain-view.css
+++ b/webroot/rsrc/css/phui/phui-curtain-view.css
@@ -7,12 +7,17 @@
margin: 0 4px;
}
+.phui-two-column-properties > .phui-curtain-panel:first-child {
+ padding-top: 6px;
+}
+
.device .phui-curtain-panel {
padding: 8px 0;
margin: 0;
}
-.device-desktop .phui-curtain-panel {
+.device-desktop .phui-curtain-panel + .phui-curtain-panel,
+.device-desktop .phabricator-action-list-view + .phui-curtain-panel {
border-top: 1px solid {$greybackground};
}

File Metadata

Mime Type
text/plain
Expires
May 14 2024, 12:21 AM (4 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6291589
Default Alt Text
D17924.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility