diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -44,8 +44,8 @@ 'rsrc/css/application/config/config-welcome.css' => '6abd79be', 'rsrc/css/application/config/setup-issue.css' => '22270af2', 'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2', - 'rsrc/css/application/conpherence/durable-column.css' => 'caa12d4a', - 'rsrc/css/application/conpherence/menu.css' => '7c900089', + 'rsrc/css/application/conpherence/durable-column.css' => 'f0c208ac', + 'rsrc/css/application/conpherence/menu.css' => 'f389e048', 'rsrc/css/application/conpherence/message-pane.css' => 'e44b667b', 'rsrc/css/application/conpherence/notification.css' => '04a6e10a', 'rsrc/css/application/conpherence/update.css' => '1099a660', @@ -515,8 +515,8 @@ 'changeset-view-manager' => '58562350', 'config-options-css' => '7fedf08b', 'config-welcome-css' => '6abd79be', - 'conpherence-durable-column-view' => 'caa12d4a', - 'conpherence-menu-css' => '7c900089', + 'conpherence-durable-column-view' => 'f0c208ac', + 'conpherence-menu-css' => 'f389e048', 'conpherence-message-pane-css' => 'e44b667b', 'conpherence-notification-css' => '04a6e10a', 'conpherence-thread-manager' => '0a5192c4', diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php --- a/src/view/page/PhabricatorStandardPageView.php +++ b/src/view/page/PhabricatorStandardPageView.php @@ -348,6 +348,8 @@ $header_chrome = $this->menuContent; } + $classes = array(); + $classes[] = 'main-page-frame'; $developer_warning = null; if (PhabricatorEnv::getEnvConfig('phabricator.developer-mode') && DarkConsoleErrorLogPluginAPI::getErrors()) { @@ -363,6 +365,7 @@ if ($user && $user->getIsAdmin()) { $open = PhabricatorSetupCheck::getOpenSetupIssueKeys(); if ($open) { + $classes[] = 'page-has-warning'; $setup_warning = phutil_tag_div( 'setup-warning-callout', phutil_tag( @@ -389,8 +392,6 @@ 'class' => 'phabricator-standard-page', ), array( - $developer_warning, - $setup_warning, $header_chrome, phutil_tag( 'div', @@ -418,9 +419,11 @@ return phutil_tag( 'div', array( - 'class' => 'main-page-frame', + 'class' => implode(' ', $classes), ), array( + $developer_warning, + $setup_warning, $main_page, $durable_column, )); diff --git a/webroot/rsrc/css/application/conpherence/durable-column.css b/webroot/rsrc/css/application/conpherence/durable-column.css --- a/webroot/rsrc/css/application/conpherence/durable-column.css +++ b/webroot/rsrc/css/application/conpherence/durable-column.css @@ -29,6 +29,10 @@ background: #fff; } +.page-has-warning .conpherence-durable-column { + top: 32px; +} + .conpherence-durable-column .loading-mask { position: absolute; top: 90px; diff --git a/webroot/rsrc/css/application/conpherence/menu.css b/webroot/rsrc/css/application/conpherence/menu.css --- a/webroot/rsrc/css/application/conpherence/menu.css +++ b/webroot/rsrc/css/application/conpherence/menu.css @@ -11,6 +11,10 @@ background: #fff; } +.page-has-warning .conpherence-layout { + top: 76px; +} + .conpherence-layout .conpherence-no-threads { text-align: center; position: fixed;