diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,9 +7,9 @@ */ return array( 'names' => array( - 'conpherence.pkg.css' => 'e25569a9', + 'conpherence.pkg.css' => 'a520d619', 'conpherence.pkg.js' => '6249a1cf', - 'core.pkg.css' => '867a3ad4', + 'core.pkg.css' => '946cfd80', 'core.pkg.js' => '1fa7c0c5', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => '4815647b', @@ -34,7 +34,7 @@ 'rsrc/css/aphront/typeahead.css' => 'd4f16145', 'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af', 'rsrc/css/application/auth/auth.css' => '0877ed6e', - 'rsrc/css/application/base/main-menu-view.css' => '62c04564', + 'rsrc/css/application/base/main-menu-view.css' => '43d59288', 'rsrc/css/application/base/notification-menu.css' => '6a697e43', 'rsrc/css/application/base/phui-theme.css' => '9f261c6b', 'rsrc/css/application/base/standard-page-view.css' => '894d8a25', @@ -47,15 +47,15 @@ 'rsrc/css/application/config/unhandled-exception.css' => '4c96257a', 'rsrc/css/application/conpherence/durable-column.css' => 'd82e130c', 'rsrc/css/application/conpherence/header-pane.css' => 'db93ebc6', - 'rsrc/css/application/conpherence/menu.css' => '4f51db5a', + 'rsrc/css/application/conpherence/menu.css' => '3d8e5c9c', 'rsrc/css/application/conpherence/message-pane.css' => 'b085d40d', 'rsrc/css/application/conpherence/notification.css' => '965db05b', - 'rsrc/css/application/conpherence/participant-pane.css' => 'ac1baaa8', + 'rsrc/css/application/conpherence/participant-pane.css' => '604a8b02', 'rsrc/css/application/conpherence/transaction.css' => '85129c68', 'rsrc/css/application/contentsource/content-source-view.css' => '4b8b05d4', 'rsrc/css/application/countdown/timer.css' => '16c52f5c', 'rsrc/css/application/daemon/bulk-job.css' => 'df9c1d4a', - 'rsrc/css/application/dashboard/dashboard.css' => 'bc6f2127', + 'rsrc/css/application/dashboard/dashboard.css' => 'b1879090', 'rsrc/css/application/diff/inline-comment-summary.css' => '51efda3a', 'rsrc/css/application/differential/add-comment.css' => 'c47f8c40', 'rsrc/css/application/differential/changeset-view.css' => '6a9bdf9c', @@ -81,7 +81,7 @@ 'rsrc/css/application/objectselector/object-selector.css' => '85ee8ce6', 'rsrc/css/application/owners/owners-path-editor.css' => '2f00933b', 'rsrc/css/application/paste/paste.css' => '1898e534', - 'rsrc/css/application/people/people-picture-menu-item.css' => '1ac65ef7', + 'rsrc/css/application/people/people-picture-menu-item.css' => 'a06f7f34', 'rsrc/css/application/people/people-profile.css' => '2473d929', 'rsrc/css/application/phame/phame.css' => '53fa6236', 'rsrc/css/application/pholio/pholio-edit.css' => '07676f51', @@ -107,7 +107,7 @@ 'rsrc/css/application/slowvote/slowvote.css' => 'a94b7230', 'rsrc/css/application/tokens/tokens.css' => '3d0f239e', 'rsrc/css/application/uiexample/example.css' => '528b19de', - 'rsrc/css/core/core.css' => '50dd5fa6', + 'rsrc/css/core/core.css' => '9f4cb463', 'rsrc/css/core/remarkup.css' => '4a2de2bb', 'rsrc/css/core/syntax.css' => '769d3498', 'rsrc/css/core/z-index.css' => '5e72c4e0', @@ -126,20 +126,20 @@ 'rsrc/css/phui/object-item/phui-oi-color.css' => 'cd2b9b77', 'rsrc/css/phui/object-item/phui-oi-drag-ui.css' => 'f12cbc9f', 'rsrc/css/phui/object-item/phui-oi-flush-ui.css' => '9d9685d6', - 'rsrc/css/phui/object-item/phui-oi-list-view.css' => 'bff632a4', + 'rsrc/css/phui/object-item/phui-oi-list-view.css' => '5c383524', 'rsrc/css/phui/object-item/phui-oi-simple-ui.css' => 'a8beebea', - 'rsrc/css/phui/phui-action-list.css' => '5679229f', + 'rsrc/css/phui/phui-action-list.css' => '445c267b', 'rsrc/css/phui/phui-action-panel.css' => '91c7b835', 'rsrc/css/phui/phui-badge.css' => '3baef8db', - 'rsrc/css/phui/phui-basic-nav-view.css' => '3d4b207b', + 'rsrc/css/phui/phui-basic-nav-view.css' => 'c2707bf1', 'rsrc/css/phui/phui-big-info-view.css' => 'bd903741', 'rsrc/css/phui/phui-box.css' => '269cbc99', 'rsrc/css/phui/phui-button.css' => '7eaff361', 'rsrc/css/phui/phui-chart.css' => '6bf6f78e', - 'rsrc/css/phui/phui-cms.css' => 'be43c8a8', + 'rsrc/css/phui/phui-cms.css' => '504b4b23', 'rsrc/css/phui/phui-comment-form.css' => '48fbd65d', 'rsrc/css/phui/phui-comment-panel.css' => 'f50152ad', - 'rsrc/css/phui/phui-crumbs-view.css' => 'f82868f2', + 'rsrc/css/phui/phui-crumbs-view.css' => 'b743f73e', 'rsrc/css/phui/phui-curtain-view.css' => '947bf1a4', 'rsrc/css/phui/phui-document-pro.css' => 'f56738ed', 'rsrc/css/phui/phui-document-summary.css' => '9ca48bdf', @@ -170,7 +170,7 @@ 'rsrc/css/phui/phui-tag-view.css' => '84d65f26', 'rsrc/css/phui/phui-timeline-view.css' => 'bc523970', 'rsrc/css/phui/phui-two-column-view.css' => '8a1074c7', - 'rsrc/css/phui/workboards/phui-workboard-color.css' => 'f0551a33', + 'rsrc/css/phui/workboards/phui-workboard-color.css' => '783cdff5', 'rsrc/css/phui/workboards/phui-workboard.css' => '3bc85455', 'rsrc/css/phui/workboards/phui-workcard.css' => 'cca5fa92', 'rsrc/css/phui/workboards/phui-workpanel.css' => 'a3a63478', @@ -565,10 +565,10 @@ 'config-page-css' => 'c1d5121b', 'conpherence-durable-column-view' => 'd82e130c', 'conpherence-header-pane-css' => 'db93ebc6', - 'conpherence-menu-css' => '4f51db5a', + 'conpherence-menu-css' => '3d8e5c9c', 'conpherence-message-pane-css' => 'b085d40d', 'conpherence-notification-css' => '965db05b', - 'conpherence-participant-pane-css' => 'ac1baaa8', + 'conpherence-participant-pane-css' => '604a8b02', 'conpherence-thread-manager' => 'c8b5ee6f', 'conpherence-transaction-css' => '85129c68', 'd3' => 'a11a5ff2', @@ -778,15 +778,15 @@ 'owners-path-editor-css' => '2f00933b', 'paste-css' => '1898e534', 'path-typeahead' => 'f7fc67ec', - 'people-picture-menu-item-css' => '1ac65ef7', + 'people-picture-menu-item-css' => 'a06f7f34', 'people-profile-css' => '2473d929', - 'phabricator-action-list-view-css' => '5679229f', + 'phabricator-action-list-view-css' => '445c267b', 'phabricator-busy' => '59a7976a', 'phabricator-chatlog-css' => 'd295b020', 'phabricator-content-source-view-css' => '4b8b05d4', - 'phabricator-core-css' => '50dd5fa6', + 'phabricator-core-css' => '9f4cb463', 'phabricator-countdown-css' => '16c52f5c', - 'phabricator-dashboard-css' => 'bc6f2127', + 'phabricator-dashboard-css' => 'b1879090', 'phabricator-drag-and-drop-file-upload' => '58dea2fa', 'phabricator-draggable-list' => 'bea6e7f4', 'phabricator-fatal-config-template-css' => '8f18fa41', @@ -797,7 +797,7 @@ 'phabricator-flag-css' => 'bba8f811', 'phabricator-keyboard-shortcut' => '1ae869f2', 'phabricator-keyboard-shortcut-manager' => '4a021c10', - 'phabricator-main-menu-view' => '62c04564', + 'phabricator-main-menu-view' => '43d59288', 'phabricator-nav-view-css' => 'b29426e9', 'phabricator-notification' => 'ccf1cbf8', 'phabricator-notification-css' => '3f6c89c9', @@ -838,7 +838,7 @@ 'phriction-document-css' => '4282e4ad', 'phui-action-panel-css' => '91c7b835', 'phui-badge-view-css' => '3baef8db', - 'phui-basic-nav-view-css' => '3d4b207b', + 'phui-basic-nav-view-css' => 'c2707bf1', 'phui-big-info-view-css' => 'bd903741', 'phui-box-css' => '269cbc99', 'phui-button-css' => '7eaff361', @@ -847,10 +847,10 @@ 'phui-calendar-list-css' => 'eb5c774b', 'phui-calendar-month-css' => '8e10e92c', 'phui-chart-css' => '6bf6f78e', - 'phui-cms-css' => 'be43c8a8', + 'phui-cms-css' => '504b4b23', 'phui-comment-form-css' => '48fbd65d', 'phui-comment-panel-css' => 'f50152ad', - 'phui-crumbs-view-css' => 'f82868f2', + 'phui-crumbs-view-css' => 'b743f73e', 'phui-curtain-view-css' => '947bf1a4', 'phui-document-summary-view-css' => '9ca48bdf', 'phui-document-view-css' => 'c32e8dec', @@ -878,7 +878,7 @@ 'phui-oi-color-css' => 'cd2b9b77', 'phui-oi-drag-ui-css' => 'f12cbc9f', 'phui-oi-flush-ui-css' => '9d9685d6', - 'phui-oi-list-view-css' => 'bff632a4', + 'phui-oi-list-view-css' => '5c383524', 'phui-oi-simple-ui-css' => 'a8beebea', 'phui-pager-css' => 'bea33d23', 'phui-pinboard-view-css' => '2495140e', @@ -891,7 +891,7 @@ 'phui-theme-css' => '9f261c6b', 'phui-timeline-view-css' => 'bc523970', 'phui-two-column-view-css' => '8a1074c7', - 'phui-workboard-color-css' => 'f0551a33', + 'phui-workboard-color-css' => '783cdff5', 'phui-workboard-view-css' => '3bc85455', 'phui-workcard-view-css' => 'cca5fa92', 'phui-workpanel-view-css' => 'a3a63478', @@ -1176,6 +1176,9 @@ 'javelin-dom', 'javelin-request', ), + '43d59288' => array( + 'phui-theme-css', + ), '44959b73' => array( 'javelin-util', 'javelin-uri', @@ -1367,9 +1370,6 @@ 'javelin-magical-init', 'javelin-util', ), - '62c04564' => array( - 'phui-theme-css', - ), '62dfea03' => array( 'javelin-install', 'javelin-util', diff --git a/src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php b/src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php --- a/src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php +++ b/src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php @@ -201,8 +201,8 @@ 'copy-background' => '#f1c40f', // Background color for "most" themes. - 'page.background' => '#f8f8fb', - 'page.sidenav' => '#f0f0f2', + 'page.background' => '#f3f5f7', + 'page.sidenav' => '#eaedf1', 'menu.profile.text' => 'rgba(255,255,255,.8)', 'menu.profile.text.selected' => 'rgba(255,255,255,1)', diff --git a/src/applications/project/controller/PhabricatorProjectBoardViewController.php b/src/applications/project/controller/PhabricatorProjectBoardViewController.php --- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php +++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php @@ -452,12 +452,14 @@ )); $background = $project->getDisplayWorkboardBackgroundColor(); + require_celerity_resource('phui-workboard-color-css'); if ($background !== null) { - require_celerity_resource('phui-workboard-color-css'); $background_color_class = "phui-workboard-{$background}"; $page->addClass('phui-workboard-color'); $page->addClass($background_color_class); + } else { + $page->addClass('phui-workboard-no-color'); } return $page; diff --git a/webroot/rsrc/css/application/dashboard/dashboard.css b/webroot/rsrc/css/application/dashboard/dashboard.css --- a/webroot/rsrc/css/application/dashboard/dashboard.css +++ b/webroot/rsrc/css/application/dashboard/dashboard.css @@ -14,6 +14,27 @@ margin: 0 0 16px 0; } +.dashboard-view .phui-box-border { + border-color: rgba({$alphablue},.2); + border-bottom-color: rgba({$alphablue},.3); +} + +.dashboard-view .phui-header-shell { + padding-top: 4px; + padding-bottom: 16px; +} + +.dashboard-view .phui-header-header { + color: #000; +} + +.dashboard-view .phui-oi-empty .phui-info-view { + padding-top: 16px; + padding-bottom: 16px; + font-style: italic; + color: {$lightgreytext}; +} + .dashboard-view .phui-object-box .phui-object-box { margin: 0; } diff --git a/webroot/rsrc/css/application/people/people-picture-menu-item.css b/webroot/rsrc/css/application/people/people-picture-menu-item.css --- a/webroot/rsrc/css/application/people/people-picture-menu-item.css +++ b/webroot/rsrc/css/application/people/people-picture-menu-item.css @@ -5,14 +5,13 @@ .people-menu-image { width: 160px; height: 160px; - border: 1px solid {$thinblueborder}; } .people-menu-image-container { background: #fff; - padding: 4px; - border-radius: 3px; - border: 1px solid {$lightblueborder}; + padding: 5px; + border-radius: 5px; + border: 1px solid rgba({$alphablue},.2); margin: 4px 0px 16px 20px; display: inline-block; } diff --git a/webroot/rsrc/css/core/core.css b/webroot/rsrc/css/core/core.css --- a/webroot/rsrc/css/core/core.css +++ b/webroot/rsrc/css/core/core.css @@ -84,7 +84,7 @@ cursor: pointer; } -a:hover { +.device-desktop a:hover { text-decoration: underline; } diff --git a/webroot/rsrc/css/phui/object-item/phui-oi-list-view.css b/webroot/rsrc/css/phui/object-item/phui-oi-list-view.css --- a/webroot/rsrc/css/phui/object-item/phui-oi-list-view.css +++ b/webroot/rsrc/css/phui/object-item/phui-oi-list-view.css @@ -551,7 +551,7 @@ color: {$darkbluetext}; border-top: 1px solid {$thinblueborder}; border-bottom: 1px solid {$thinblueborder}; - padding: 8px; + padding: 8px 12px; background-color: {$lightgreybackground}; } diff --git a/webroot/rsrc/css/phui/phui-action-list.css b/webroot/rsrc/css/phui/phui-action-list.css --- a/webroot/rsrc/css/phui/phui-action-list.css +++ b/webroot/rsrc/css/phui/phui-action-list.css @@ -57,6 +57,10 @@ min-width: 0; } +.phabricator-action-view button.phabricator-action-view-item .phui-icon-view { + color: {$darkbluetext}; +} + .phabricator-action-view button.phabricator-action-view-item, .phabricator-action-view-item { padding: 4px 8px 6px 8px; diff --git a/webroot/rsrc/css/phui/workboards/phui-workboard-color.css b/webroot/rsrc/css/phui/workboards/phui-workboard-color.css --- a/webroot/rsrc/css/phui/workboards/phui-workboard-color.css +++ b/webroot/rsrc/css/phui/workboards/phui-workboard-color.css @@ -6,6 +6,10 @@ background-color: transparent; } +.phui-workboard-no-color { + background-color: #fff; +} + .phui-workboard-color .phui-crumbs-view { background-color: rgba({$alphagrey},.15); border: none;