diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 8682591543..f899395be6 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => '178ec7e2', + 'core.pkg.css' => 'ff3395d7', 'core.pkg.js' => 'f3e08b38', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => 'bb338e4b', @@ -34,7 +34,7 @@ return array( 'rsrc/css/aphront/typeahead.css' => '0e403212', 'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af', 'rsrc/css/application/auth/auth.css' => '44975d4b', - 'rsrc/css/application/base/main-menu-view.css' => '1766b04d', + 'rsrc/css/application/base/main-menu-view.css' => 'ac574fc3', 'rsrc/css/application/base/notification-menu.css' => '3c9d8aa1', 'rsrc/css/application/base/phabricator-application-launch-view.css' => '132f9d14', 'rsrc/css/application/base/standard-page-view.css' => '062f0f54', @@ -45,7 +45,7 @@ return array( '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' => '8c43d6ac', + 'rsrc/css/application/conpherence/durable-column.css' => '27c64ba8', 'rsrc/css/application/conpherence/menu.css' => 'f9f1d143', 'rsrc/css/application/conpherence/message-pane.css' => '7cbf4cbb', 'rsrc/css/application/conpherence/notification.css' => '919974b6', @@ -495,7 +495,7 @@ return array( 'conduit-api-css' => '7bc725c4', 'config-options-css' => '7fedf08b', 'config-welcome-css' => '6abd79be', - 'conpherence-durable-column-view' => '8c43d6ac', + 'conpherence-durable-column-view' => '27c64ba8', 'conpherence-menu-css' => 'f9f1d143', 'conpherence-message-pane-css' => '7cbf4cbb', 'conpherence-notification-css' => '919974b6', @@ -714,7 +714,7 @@ return array( 'phabricator-hovercard-view-css' => '44394670', 'phabricator-keyboard-shortcut' => '1ae869f2', 'phabricator-keyboard-shortcut-manager' => 'c1700f6f', - 'phabricator-main-menu-view' => '1766b04d', + 'phabricator-main-menu-view' => 'ac574fc3', 'phabricator-nav-view-css' => '949b43d9', 'phabricator-notification' => '0c6946e7', 'phabricator-notification-css' => '9c279160', diff --git a/src/applications/conpherence/view/ConpherenceDurableColumnView.php b/src/applications/conpherence/view/ConpherenceDurableColumnView.php index f52f48c8e6..def5b01f07 100644 --- a/src/applications/conpherence/view/ConpherenceDurableColumnView.php +++ b/src/applications/conpherence/view/ConpherenceDurableColumnView.php @@ -138,8 +138,7 @@ final class ConpherenceDurableColumnView extends AphrontTagView { $classes = array(); $classes[] = 'conpherence-durable-column-header'; - $classes[] = 'sprite-main-header'; - $classes[] = 'main-header-'.PhabricatorEnv::getEnvConfig('ui.header-color'); + $classes[] = 'phabricator-main-menu-background'; $loading_mask = phutil_tag( 'div', diff --git a/src/view/page/menu/PhabricatorMainMenuView.php b/src/view/page/menu/PhabricatorMainMenuView.php index b905d90106..8f5ddc6fb2 100644 --- a/src/view/page/menu/PhabricatorMainMenuView.php +++ b/src/view/page/menu/PhabricatorMainMenuView.php @@ -81,6 +81,7 @@ final class PhabricatorMainMenuView extends AphrontView { $application_menu = $this->renderApplicationMenu(); $classes = array(); $classes[] = 'phabricator-main-menu'; + $classes[] = 'phabricator-main-menu-background'; return phutil_tag( 'div', diff --git a/webroot/rsrc/css/application/base/main-menu-view.css b/webroot/rsrc/css/application/base/main-menu-view.css index c53ec1aba6..83bdd289a6 100644 --- a/webroot/rsrc/css/application/base/main-menu-view.css +++ b/webroot/rsrc/css/application/base/main-menu-view.css @@ -11,8 +11,10 @@ */ .phabricator-main-menu { - background-repeat: repeat-x; position: relative; +} + +.phabricator-main-menu-background { min-height: 43px; background: #ebecee; border-bottom: 1px solid {$hovergrey}; diff --git a/webroot/rsrc/css/application/conpherence/durable-column.css b/webroot/rsrc/css/application/conpherence/durable-column.css index 1dbb829565..c81f91270a 100644 --- a/webroot/rsrc/css/application/conpherence/durable-column.css +++ b/webroot/rsrc/css/application/conpherence/durable-column.css @@ -66,10 +66,6 @@ display: block; } -.conpherence-durable-column-header { - height: 44px; -} - .conpherence-durable-column-header .conpherence-settings-dropdown { z-index: 1; } @@ -82,12 +78,13 @@ float: left; padding: 13px 0 12px 12px; font-size: 15px; - color: rgba(255,255,255,.8); + color: {$darkbluetext}; + font-weight: 500; width: 230px; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; - border-left: 1px solid rgba(0,0,0,.2); + border-left: 1px solid {$lightblueborder}; } .conpherence-durable-column-header-text .phui-icon-view {