diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 3b7ee427c9..9129df06ca 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => '8edbf4c0', + 'core.pkg.css' => '048d109b', 'core.pkg.js' => '23d653bb', 'darkconsole.pkg.js' => '8ab24e01', 'differential.pkg.css' => '380f07e5', @@ -19,7 +19,7 @@ return array( 'rsrc/css/aphront/aphront-bars.css' => '231ac33c', 'rsrc/css/aphront/context-bar.css' => '1c3b0529', 'rsrc/css/aphront/dark-console.css' => '6378ef3d', - 'rsrc/css/aphront/dialog-view.css' => '52dcd4c6', + 'rsrc/css/aphront/dialog-view.css' => 'd2e76b88', 'rsrc/css/aphront/lightbox-attachment.css' => '7acac05d', 'rsrc/css/aphront/list-filter-view.css' => '2ae43867', 'rsrc/css/aphront/multi-column.css' => '41a848c0', @@ -501,7 +501,7 @@ return array( 'aphront-bars' => '231ac33c', 'aphront-contextbar-view-css' => '1c3b0529', 'aphront-dark-console-css' => '6378ef3d', - 'aphront-dialog-view-css' => '52dcd4c6', + 'aphront-dialog-view-css' => 'd2e76b88', 'aphront-list-filter-view-css' => '2ae43867', 'aphront-multi-column-view-css' => '41a848c0', 'aphront-pager-view-css' => '2e3539af', diff --git a/src/view/AphrontDialogView.php b/src/view/AphrontDialogView.php index beef711654..1b61d81dac 100644 --- a/src/view/AphrontDialogView.php +++ b/src/view/AphrontDialogView.php @@ -311,6 +311,19 @@ final class AphrontDialogView extends AphrontView { $this->footers); } + $tail = null; + if ($buttons || $footer) { + $tail = phutil_tag( + 'div', + array( + 'class' => 'aphront-dialog-tail grouped', + ), + array( + $buttons, + $footer, + )); + } + $content = array( phutil_tag( 'div', @@ -323,15 +336,7 @@ final class AphrontDialogView extends AphrontView { 'class' => 'aphront-dialog-body grouped', ), $children), - phutil_tag( - 'div', - array( - 'class' => 'aphront-dialog-tail grouped', - ), - array( - $buttons, - $footer, - )), + $tail, ); if ($this->renderAsForm) { diff --git a/src/view/widget/AphrontStackTraceView.php b/src/view/widget/AphrontStackTraceView.php index 61811a28e9..11a85dae4b 100644 --- a/src/view/widget/AphrontStackTraceView.php +++ b/src/view/widget/AphrontStackTraceView.php @@ -92,10 +92,10 @@ final class AphrontStackTraceView extends AphrontView { $table = new AphrontTableView($rows); $table->setHeaders( array( - 'Depth', - 'Library', - 'File', - 'Where', + pht('Depth'), + pht('Library'), + pht('File'), + pht('Where'), )); $table->setColumnClasses( array( @@ -107,14 +107,10 @@ final class AphrontStackTraceView extends AphrontView { return phutil_tag( 'div', - array('class' => 'exception-trace'), array( - phutil_tag( - 'div', - array('class' => 'exception-trace-header'), - pht('Stack Trace')), - $table->render(), - )); + 'class' => 'exception-trace', + ), + $table->render()); } } diff --git a/webroot/rsrc/css/aphront/dialog-view.css b/webroot/rsrc/css/aphront/dialog-view.css index c0906de8e1..fa21cdf451 100644 --- a/webroot/rsrc/css/aphront/dialog-view.css +++ b/webroot/rsrc/css/aphront/dialog-view.css @@ -55,7 +55,7 @@ border: none; background: {$lightgreybackground}; padding: 8px 16px; - border-top: 1px solid #d4dadf; + border-top: 1px solid {$thinblueborder}; } .aphront-dialog-foot { @@ -95,21 +95,14 @@ .aphront-exception-dialog .exception-message { font-size: 14px; - background: #efefef; - padding: 1em; + background: {$sh-yellowbackground}; + border: 1px solid {$sh-yellowborder}; + padding: 12px; white-space: pre-wrap; } .aphront-exception-dialog .exception-trace { - margin-top: 15px; -} - -.aphront-exception-dialog .exception-trace-header { - font-size: 11px; - color: {$greytext}; - border-bottom: 1px solid #aaaaaa; - padding-bottom: .5em; - margin-bottom: .5em; + margin-top: 16px; } .aphront-access-dialog {