diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 4d75a0318b..84010e230c 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -9,7 +9,7 @@ return array( 'names' => array( 'conpherence.pkg.css' => '4601645d', 'conpherence.pkg.js' => '11f3e07e', - 'core.pkg.css' => '3fa66cb3', + 'core.pkg.css' => 'edd0a773', 'core.pkg.js' => '30185d95', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => 'e1d704ce', @@ -37,7 +37,7 @@ return array( 'rsrc/css/application/base/main-menu-view.css' => 'f03e17be', 'rsrc/css/application/base/notification-menu.css' => '1e055865', 'rsrc/css/application/base/phabricator-application-launch-view.css' => '95351601', - 'rsrc/css/application/base/phui-theme.css' => '027ba77e', + 'rsrc/css/application/base/phui-theme.css' => '798c69b8', 'rsrc/css/application/base/standard-page-view.css' => '79176f5a', 'rsrc/css/application/chatlog/chatlog.css' => 'd295b020', 'rsrc/css/application/conduit/conduit-api.css' => '7bc725c4', @@ -154,7 +154,7 @@ return array( 'rsrc/css/phui/phui-object-item-list-view.css' => '87278fa0', 'rsrc/css/phui/phui-pager.css' => 'bea33d23', 'rsrc/css/phui/phui-pinboard-view.css' => '2495140e', - 'rsrc/css/phui/phui-profile-menu.css' => '8a3fc181', + 'rsrc/css/phui/phui-profile-menu.css' => '12727a44', 'rsrc/css/phui/phui-property-list-view.css' => '6d8e58ac', 'rsrc/css/phui/phui-remarkup-preview.css' => '1a8f2591', 'rsrc/css/phui/phui-segment-bar-view.css' => '46342871', @@ -930,14 +930,14 @@ return array( 'phui-object-item-list-view-css' => '87278fa0', 'phui-pager-css' => 'bea33d23', 'phui-pinboard-view-css' => '2495140e', - 'phui-profile-menu-css' => '8a3fc181', + 'phui-profile-menu-css' => '12727a44', 'phui-property-list-view-css' => '6d8e58ac', 'phui-remarkup-preview-css' => '1a8f2591', 'phui-segment-bar-view-css' => '46342871', 'phui-spacing-css' => '042804d6', 'phui-status-list-view-css' => 'd5263e49', 'phui-tag-view-css' => '6bbd83e2', - 'phui-theme-css' => '027ba77e', + 'phui-theme-css' => '798c69b8', 'phui-timeline-view-css' => 'bc523970', 'phui-two-column-view-css' => 'fcfbe347', 'phui-workboard-color-css' => 'ac6fe6a7', diff --git a/webroot/rsrc/css/application/base/phui-theme.css b/webroot/rsrc/css/application/base/phui-theme.css index e0bfbf36a6..5313f2099b 100644 --- a/webroot/rsrc/css/application/base/phui-theme.css +++ b/webroot/rsrc/css/application/base/phui-theme.css @@ -28,36 +28,3 @@ background: #124A1B; } -/*--- Profile Nav Colors -----------------------------------------------------*/ - - -.phui-theme-blindigo .phui-profile-menu .phabricator-side-menu, -.phui-theme-blindigo .phabricator-side-menu .phui-profile-menu-footer-1 { - background: #525867; -} - -.phui-theme-dark .phui-profile-menu .phabricator-side-menu, -.phui-theme-dark .phabricator-side-menu .phui-profile-menu-footer-1 { - background: #30333A; -} - -.phui-theme-indigo .phui-profile-menu .phabricator-side-menu, -.phui-theme-indigo .phabricator-side-menu .phui-profile-menu-footer-1 { - background: #423658; -} - -.phui-theme-red .phui-profile-menu .phabricator-side-menu, -.phui-theme-red .phabricator-side-menu .phui-profile-menu-footer-1 { - background: #420C0C; -} - -.phui-theme-blue .phui-profile-menu .phabricator-side-menu, -.phui-theme-blue .phabricator-side-menu .phui-profile-menu-footer-1 { - background: #062842; -} - -.phui-theme-green .phui-profile-menu .phabricator-side-menu, -.phui-theme-green .phabricator-side-menu .phui-profile-menu-footer-1 { - background: #122916; -} - diff --git a/webroot/rsrc/css/phui/phui-profile-menu.css b/webroot/rsrc/css/phui/phui-profile-menu.css index 275bff1dde..3af8efcf79 100644 --- a/webroot/rsrc/css/phui/phui-profile-menu.css +++ b/webroot/rsrc/css/phui/phui-profile-menu.css @@ -17,7 +17,7 @@ } .phui-profile-menu .phabricator-side-menu { - background: #525867; + background: rgba({$alphablue}, 0.15); width: 240px; } @@ -32,9 +32,9 @@ height: 48px; font-size: {$biggerfontsize}; -webkit-font-smoothing: antialiased; - color: {$menu.profile.text}; line-height: 22px; overflow: hidden; + color: {$darkbluetext}; text-overflow: ellipsis; line-height: 48px; } @@ -50,7 +50,7 @@ height: 24px; line-height: 24px; text-align: center; - color: {$menu.profile.text}; + color: {$darkbluetext}; background-size: 100%; } @@ -81,7 +81,7 @@ .phui-profile-menu .phabricator-side-menu .phui-list-item-disabled .phui-list-item-icon { - color: {$menu.profile.icon.disabled}; + color: {$lightgreytext}; } .phui-profile-menu .phabricator-side-menu .phui-icon-view { @@ -90,28 +90,17 @@ .device-desktop .phui-profile-menu .phabricator-side-menu .phui-list-item-href:hover { - background-color: rgba({$alphablack},0.15); - color: {$menu.profile.text.selected}; -} - -.phui-profile-menu .phabricator-side-menu - .phui-list-item-selected - .phui-list-item-icon, -.device-desktop .phui-profile-menu .phabricator-side-menu - .phui-list-item-href:hover - .phui-list-item-icon { - color: {$menu.profile.text.selected}; + background-color: rgba({$alphablack},0.05); } .phui-profile-menu .phabricator-side-menu .phui-list-item-selected .phui-list-item-href { - background-color: rgba({$alphablack},0.3); - color: {$menu.profile.text.selected}; + background-color: rgba({$alphablack},0.1); } .phui-profile-menu .phabricator-side-menu .phui-list-item-selected .phui-list-item-href:hover { - background-color: rgba({$alphablack},0.45); + background-color: rgba({$alphablack},0.15); } .phui-profile-menu .phabricator-side-menu .phui-divider { @@ -123,13 +112,13 @@ white-space: normal; padding: 18px 15px; font-size: 12px; - color: {$menu.profile.text}; + color: {$darkbluetext}; } .phui-profile-menu .phabricator-side-menu .phui-motivator .phui-icon-view { position: static; font-size: 12px; - color: {$menu.profile.text}; + color: {$darkbluetext}; } .phui-profile-menu .phabricator-side-menu .phui-profile-menu-error { @@ -150,11 +139,11 @@ .phui-list-item-href, .phui-profile-menu .phui-list-sidenav .phui-list-item-disabled .phui-list-item-href { - color: rgba({$alphawhite}, 0.5); + color: rgba({$lightgreytext}); } .phui-profile-menu .phabricator-side-menu .phui-profile-segment-bar { - color: {$menu.profile.text}; + color: {$darkbluetext}; font-size: {$smallerfontsize}; -webkit-font-smoothing: antialiased; padding: 8px 12px 16px; @@ -201,25 +190,11 @@ } .phui-profile-menu .phui-profile-menu-footer .phui-icon-circle { - border-color: {$menu.profile.text}; + border-color: {$darkbluetext}; } .phui-profile-menu .phui-profile-menu-footer .phui-icon-circle .phui-icon-view { - color: {$menu.profile.text}; -} - -.phui-profile-menu .phui-profile-menu-footer .phui-list-item-href:hover - .phui-icon-circle, -.phui-profile-menu .phui-list-item-selected.phui-profile-menu-footer - .phui-icon-circle { - border-color: {$menu.profile.text.selected}; -} - -.phui-profile-menu .phui-profile-menu-footer .phui-list-item-href:hover - .phui-icon-circle .phui-icon-view, -.phui-profile-menu .phui-list-item-selected.phui-profile-menu-footer - .phui-icon-circle .phui-icon-view { - color: {$menu.profile.text.selected}; + color: {$darkbluetext}; } .phui-profile-menu .phui-profile-menu-footer