diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 64b03e4b15..910e623e57 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => 'a9b47b99', + 'core.pkg.css' => 'a79276eb', 'core.pkg.js' => '47dc9ebb', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => '2de124c9', @@ -126,7 +126,7 @@ return array( 'rsrc/css/phui/phui-box.css' => 'a5bb366d', 'rsrc/css/phui/phui-button.css' => '16020a60', 'rsrc/css/phui/phui-crumbs-view.css' => 'd842f867', - 'rsrc/css/phui/phui-document-pro.css' => '5f86a934', + 'rsrc/css/phui/phui-document-pro.css' => '61d70f8e', 'rsrc/css/phui/phui-document.css' => '9fa715d2', 'rsrc/css/phui/phui-feed-story.css' => 'b7b26d23', 'rsrc/css/phui/phui-fontkit.css' => 'c9d63950', @@ -136,7 +136,7 @@ return array( 'rsrc/css/phui/phui-icon.css' => 'b0a6b1b6', 'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8', 'rsrc/css/phui/phui-info-panel.css' => '27ea50a1', - 'rsrc/css/phui/phui-info-view.css' => 'fdabaa73', + 'rsrc/css/phui/phui-info-view.css' => '6d7c3509', 'rsrc/css/phui/phui-list.css' => '125599df', 'rsrc/css/phui/phui-object-box.css' => '407eaf5a', 'rsrc/css/phui/phui-object-item-list-view.css' => '26c30d3f', @@ -781,7 +781,7 @@ return array( 'phui-calendar-month-css' => '476be7e0', 'phui-crumbs-view-css' => 'd842f867', 'phui-document-view-css' => '9fa715d2', - 'phui-document-view-pro-css' => '5f86a934', + 'phui-document-view-pro-css' => '61d70f8e', 'phui-feed-story-css' => 'b7b26d23', 'phui-font-icon-base-css' => 'ecbbb4c2', 'phui-fontkit-css' => 'c9d63950', @@ -791,7 +791,7 @@ return array( 'phui-icon-view-css' => 'b0a6b1b6', 'phui-image-mask-css' => '5a8b09c8', 'phui-info-panel-css' => '27ea50a1', - 'phui-info-view-css' => 'fdabaa73', + 'phui-info-view-css' => '6d7c3509', 'phui-inline-comment-view-css' => '0fdb3667', 'phui-list-view-css' => '125599df', 'phui-object-box-css' => '407eaf5a', diff --git a/src/applications/meta/controller/PhabricatorApplicationEmailCommandsController.php b/src/applications/meta/controller/PhabricatorApplicationEmailCommandsController.php index 23ac83ac92..63f2d256e1 100644 --- a/src/applications/meta/controller/PhabricatorApplicationEmailCommandsController.php +++ b/src/applications/meta/controller/PhabricatorApplicationEmailCommandsController.php @@ -115,6 +115,7 @@ final class PhabricatorApplicationEmailCommandsController $crumbs = $this->buildApplicationCrumbs(); $this->addApplicationCrumb($crumbs, $selected); $crumbs->addTextCrumb($title); + $crumbs->setBorder(true); $content_box = PhabricatorMarkupEngine::renderOneObject( id(new PhabricatorMarkupOneOff())->setContent($content), @@ -134,7 +135,7 @@ final class PhabricatorApplicationEmailCommandsController $header = id(new PHUIHeaderView()) ->setHeader($title); - $document = id(new PHUIDocumentView()) + $document = id(new PHUIDocumentViewPro()) ->setHeader($header) ->appendChild($info_view) ->appendChild($content_box); @@ -146,6 +147,7 @@ final class PhabricatorApplicationEmailCommandsController ), array( 'title' => $title, + 'class' => 'pro-white-background', )); } diff --git a/src/applications/transactions/editengine/PhabricatorApplicationEditEngine.php b/src/applications/transactions/editengine/PhabricatorApplicationEditEngine.php index 0205cd5c9c..d43f65d000 100644 --- a/src/applications/transactions/editengine/PhabricatorApplicationEditEngine.php +++ b/src/applications/transactions/editengine/PhabricatorApplicationEditEngine.php @@ -370,6 +370,7 @@ abstract class PhabricatorApplicationEditEngine extends Phobject { $crumbs = $this->buildCrumbs($object); $crumbs->addTextCrumb(pht('HTTP Parameters')); + $crumbs->setBorder(true); $header = id(new PHUIHeaderView()) ->setHeader( @@ -377,9 +378,7 @@ abstract class PhabricatorApplicationEditEngine extends Phobject { 'HTTP Parameters: %s', $this->getObjectCreateShortText($object))); - // TODO: Upgrade to DocumentViewPro. - - $document = id(new PHUIDocumentView()) + $document = id(new PHUIDocumentViewPro()) ->setUser($viewer) ->setHeader($header); @@ -391,6 +390,7 @@ abstract class PhabricatorApplicationEditEngine extends Phobject { return $controller->newPage() ->setTitle(pht('HTTP Parameters')) ->setCrumbs($crumbs) + ->addClass('pro-white-background') ->appendChild($document); } diff --git a/src/applications/transactions/view/PhabricatorApplicationEditHTTPParameterHelpView.php b/src/applications/transactions/view/PhabricatorApplicationEditHTTPParameterHelpView.php index 9a085174ec..4326ca1909 100644 --- a/src/applications/transactions/view/PhabricatorApplicationEditHTTPParameterHelpView.php +++ b/src/applications/transactions/view/PhabricatorApplicationEditHTTPParameterHelpView.php @@ -306,31 +306,19 @@ EOTEXT return array( $this->renderInstructions($intro), - $this->renderTable($main_table), + $main_table, $this->renderInstructions($aliases_text), - $this->renderTable($alias_table), + $alias_table, $this->renderInstructions($select_text), - $this->renderTable($select_table), + $select_table, $this->renderInstructions($types_text), - $this->renderTable($types_table), + $types_table, ); } - protected function renderTable(AphrontTableView $table) { - return id(new PHUIBoxView()) - ->addMargin(PHUI::MARGIN_LARGE_LEFT) - ->addMargin(PHUI::MARGIN_LARGE_RIGHT) - ->addMargin(PHUI::MARGIN_LARGE_BOTTOM) - ->appendChild($table); - } - protected function renderInstructions($corpus) { $viewer = $this->getUser(); - - return id(new PHUIBoxView()) - ->addMargin(PHUI::MARGIN_SMALL_TOP) - ->addMargin(PHUI::MARGIN_SMALL_BOTTOM) - ->appendChild(new PHUIRemarkupView($viewer, $corpus)); + return new PHUIRemarkupView($viewer, $corpus); } } diff --git a/webroot/rsrc/css/phui/phui-document-pro.css b/webroot/rsrc/css/phui/phui-document-pro.css index ba0e4157a3..39fa574e59 100644 --- a/webroot/rsrc/css/phui/phui-document-pro.css +++ b/webroot/rsrc/css/phui/phui-document-pro.css @@ -94,6 +94,7 @@ a.button.phui-document-toc { .device-phone .phui-document-view.phui-document-view-pro .phui-header-shell { margin: 8px 0 0 0; + padding: 8px 0 20px; } .phui-document-view.phui-document-view-pro .phui-header-tall @@ -107,3 +108,7 @@ a.button.phui-document-toc { display: block; padding: 8px 0 0 0; } + +.phui-document-view-pro .phui-info-view { + margin: 16px 0 0 0; +} diff --git a/webroot/rsrc/css/phui/phui-info-view.css b/webroot/rsrc/css/phui/phui-info-view.css index b311160335..cb7c7e77ba 100644 --- a/webroot/rsrc/css/phui/phui-info-view.css +++ b/webroot/rsrc/css/phui/phui-info-view.css @@ -108,10 +108,6 @@ h1.phui-info-view-head { color: {$sh-greentext}; } -.legalpad .phui-info-view { - margin: 16px 0 0 0; -} - .aphront-dialog-body .phui-info-view { margin: 0 0 8px 0; }