diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 2df4c428dd..0a6ce7d67e 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => 'c71b1a2e', + 'core.pkg.css' => '8aed144e', 'core.pkg.js' => '60924527', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => 'bb338e4b', @@ -130,16 +130,16 @@ return array( 'rsrc/css/phui/phui-crumbs-view.css' => 'aeff7a21', 'rsrc/css/phui/phui-document.css' => '7b564cf6', 'rsrc/css/phui/phui-feed-story.css' => 'c9f3a0b5', - 'rsrc/css/phui/phui-fontkit.css' => 'dd8ddf27', + 'rsrc/css/phui/phui-fontkit.css' => '1e71371a', 'rsrc/css/phui/phui-form-view.css' => 'ddec8479', 'rsrc/css/phui/phui-form.css' => 'f535f938', 'rsrc/css/phui/phui-header-view.css' => 'a1d2905a', 'rsrc/css/phui/phui-icon.css' => 'bc766998', 'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8', 'rsrc/css/phui/phui-info-panel.css' => '27ea50a1', - 'rsrc/css/phui/phui-info-view.css' => '13c10a8e', + 'rsrc/css/phui/phui-info-view.css' => '33595731', 'rsrc/css/phui/phui-list.css' => '2e25ebfb', - 'rsrc/css/phui/phui-object-box.css' => '2d3b3b42', + 'rsrc/css/phui/phui-object-box.css' => '3a601bc5', 'rsrc/css/phui/phui-object-item-list-view.css' => '172ea456', 'rsrc/css/phui/phui-pinboard-view.css' => 'eaab2b1b', 'rsrc/css/phui/phui-property-list-view.css' => 'd2d143ea', @@ -778,17 +778,17 @@ return array( 'phui-document-view-css' => '7b564cf6', 'phui-feed-story-css' => 'c9f3a0b5', 'phui-font-icon-base-css' => '3dad2ae3', - 'phui-fontkit-css' => 'dd8ddf27', + 'phui-fontkit-css' => '1e71371a', 'phui-form-css' => 'f535f938', 'phui-form-view-css' => 'ddec8479', 'phui-header-view-css' => 'a1d2905a', 'phui-icon-view-css' => 'bc766998', 'phui-image-mask-css' => '5a8b09c8', 'phui-info-panel-css' => '27ea50a1', - 'phui-info-view-css' => '13c10a8e', + 'phui-info-view-css' => '33595731', 'phui-inline-comment-view-css' => '2174771a', 'phui-list-view-css' => '2e25ebfb', - 'phui-object-box-css' => '2d3b3b42', + 'phui-object-box-css' => '3a601bc5', 'phui-object-item-list-view-css' => '172ea456', 'phui-pinboard-view-css' => 'eaab2b1b', 'phui-property-list-view-css' => 'd2d143ea', diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php index 0806f38aaa..7b61c7b288 100644 --- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php +++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php @@ -350,10 +350,6 @@ final class ManiphestTaskDetailController extends ManiphestController { ->setHeader($header) ->addPropertyList($properties); - if ($info_view) { - $object_box->setInfoView($info_view); - } - if ($description) { $object_box->addPropertyList($description); } @@ -361,6 +357,7 @@ final class ManiphestTaskDetailController extends ManiphestController { return $this->buildApplicationPage( array( $crumbs, + $info_view, $object_box, $timeline, $comment_box, diff --git a/webroot/rsrc/css/phui/phui-fontkit.css b/webroot/rsrc/css/phui/phui-fontkit.css index 894fc32559..22016e7479 100644 --- a/webroot/rsrc/css/phui/phui-fontkit.css +++ b/webroot/rsrc/css/phui/phui-fontkit.css @@ -66,10 +66,13 @@ .diviner-view .phui-font-source-sans .phui-property-list-section, .legalpad .phui-font-source-sans .phui-property-list-section { border-bottom: 1px solid {$thinblueborder}; - margin-bottom: 8px; background: {$lightgreybackground}; } +.legalpad .phui-font-source-sans .phui-property-list-section-header { + padding: 16px 4px 0 16px; +} + .phui-font-source-sans .phui-property-list-text-content { background: {$lightgreybackground}; padding: 0; diff --git a/webroot/rsrc/css/phui/phui-info-view.css b/webroot/rsrc/css/phui/phui-info-view.css index 580bb9e684..4e00fdf528 100644 --- a/webroot/rsrc/css/phui/phui-info-view.css +++ b/webroot/rsrc/css/phui/phui-info-view.css @@ -55,32 +55,32 @@ h1.phui-info-view-head { .phui-info-severity-error, .phui-info-severity-error a.button { - border-color: {$red}; - background: {$lightred}; + border-color: {$sh-redborder}; + background: {$sh-redbackground}; } .phui-info-severity-error a.button { - color: {$red}; + color: {$sh-redtext}; } .phui-info-severity-warning, .phui-info-severity-warning a.button { - border-color: {$yellow}; - background: {$lightyellow}; + border-color: {$sh-yellowborder}; + background: {$sh-yellowbackground}; } .phui-info-severity-warning a.button { - color: #bc7837; + color: {$sh-yellowtext}; } .phui-info-severity-notice, .phui-info-severity-notice a.button { - border-color: {$blue}; - background: {$lightblue}; + border-color: {$sh-blueborder}; + background: {$sh-bluebackground}; } .phui-info-severity-notice a.button { - color: {$blue}; + color: {$sh-bluetext}; } .phui-info-severity-nodata, @@ -95,34 +95,24 @@ h1.phui-info-view-head { .phui-info-severity-success, .phui-info-severity-success a.button { - border-color: {$green}; - background: {$lightgreen}; + border-color: {$sh-greenborder}; + background: {$sh-greenbackground}; } .phui-info-severity-success a.button { - color: {$green}; + color: {$sh-greentext}; } .legalpad .phui-info-view { margin: 0; - border-width: 0 0 1px 0; - border-bottom: 1px solid {$lightblueborder}; + border-radius: 0; + border-width: 0; } .aphront-dialog-body .phui-info-view { margin: 0 0 8px 0; } -.aphront-dialog-body .phui-info-view .phui-info-view-list { - margin: 0 0 0 16px; - list-style: disc; -} - -.phui-object-box .phui-info-severity-warning, -.aphront-dialog-body .phui-info-severity-warning { - color: #bc7837; -} - .phui-crumbs-view + .phui-info-view { margin-top: 0; } diff --git a/webroot/rsrc/css/phui/phui-object-box.css b/webroot/rsrc/css/phui/phui-object-box.css index b2c16d4cc2..339246243e 100644 --- a/webroot/rsrc/css/phui/phui-object-box.css +++ b/webroot/rsrc/css/phui/phui-object-box.css @@ -27,9 +27,7 @@ div.phui-object-box.phui-object-box-flush { } .phui-object-box .phui-header-shell + .phui-info-view { - margin: 0; - border-width: 0; - border-bottom: 1px solid {$lightblueborder}; + margin: 12px 0 0 0; } .device-phone .phui-object-box {