diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -9,7 +9,7 @@ 'names' => array( 'conpherence.pkg.css' => 'a520d619', 'conpherence.pkg.js' => '6249a1cf', - 'core.pkg.css' => '25475b75', + 'core.pkg.css' => '72ab63ef', 'core.pkg.js' => '1fa7c0c5', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => '4815647b', @@ -55,7 +55,7 @@ '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' => 'b1879090', + 'rsrc/css/application/dashboard/dashboard.css' => '226c4dc6', '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', @@ -97,7 +97,7 @@ 'rsrc/css/application/policy/policy.css' => '957ea14c', 'rsrc/css/application/ponder/ponder-view.css' => 'fbd45f96', 'rsrc/css/application/project/project-card-view.css' => 'f25746f5', - 'rsrc/css/application/project/project-view.css' => 'ceabdbaa', + 'rsrc/css/application/project/project-view.css' => '9f6ce0e1', 'rsrc/css/application/releeph/releeph-core.css' => '9b3c5733', 'rsrc/css/application/releeph/releeph-preview-branch.css' => 'b7a6f4a5', 'rsrc/css/application/releeph/releeph-request-differential-create-dialog.css' => '8d8b92cd', @@ -119,7 +119,7 @@ 'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82', 'rsrc/css/layout/phabricator-source-code-view.css' => '4383192f', 'rsrc/css/phui/calendar/phui-calendar-day.css' => '572b1893', - 'rsrc/css/phui/calendar/phui-calendar-list.css' => 'eb5c774b', + 'rsrc/css/phui/calendar/phui-calendar-list.css' => '576be600', 'rsrc/css/phui/calendar/phui-calendar-month.css' => '8e10e92c', 'rsrc/css/phui/calendar/phui-calendar.css' => '477acfaa', 'rsrc/css/phui/object-item/phui-oi-big-ui.css' => '19f9369b', @@ -131,7 +131,7 @@ 'rsrc/css/phui/phui-action-list.css' => 'f980c059', 'rsrc/css/phui/phui-action-panel.css' => '91c7b835', 'rsrc/css/phui/phui-badge.css' => '3baef8db', - 'rsrc/css/phui/phui-basic-nav-view.css' => '2e7648d4', + 'rsrc/css/phui/phui-basic-nav-view.css' => 'a0705f53', 'rsrc/css/phui/phui-big-info-view.css' => 'bd903741', 'rsrc/css/phui/phui-box.css' => '269cbc99', 'rsrc/css/phui/phui-button.css' => '7eaff361', @@ -149,7 +149,7 @@ 'rsrc/css/phui/phui-form-view.css' => 'adca31ce', 'rsrc/css/phui/phui-form.css' => '5815af7b', 'rsrc/css/phui/phui-head-thing.css' => 'fd311e5f', - 'rsrc/css/phui/phui-header-view.css' => '92935c02', + 'rsrc/css/phui/phui-header-view.css' => 'fef6a54e', 'rsrc/css/phui/phui-hovercard.css' => 'e904f5dc', 'rsrc/css/phui/phui-icon-set-selector.css' => '87db8fee', 'rsrc/css/phui/phui-icon.css' => '09f46dd9', @@ -786,7 +786,7 @@ 'phabricator-content-source-view-css' => '4b8b05d4', 'phabricator-core-css' => '9f4cb463', 'phabricator-countdown-css' => '16c52f5c', - 'phabricator-dashboard-css' => 'b1879090', + 'phabricator-dashboard-css' => '226c4dc6', 'phabricator-drag-and-drop-file-upload' => '58dea2fa', 'phabricator-draggable-list' => 'bea6e7f4', 'phabricator-fatal-config-template-css' => '8f18fa41', @@ -838,13 +838,13 @@ 'phriction-document-css' => '4282e4ad', 'phui-action-panel-css' => '91c7b835', 'phui-badge-view-css' => '3baef8db', - 'phui-basic-nav-view-css' => '2e7648d4', + 'phui-basic-nav-view-css' => 'a0705f53', 'phui-big-info-view-css' => 'bd903741', 'phui-box-css' => '269cbc99', 'phui-button-css' => '7eaff361', 'phui-calendar-css' => '477acfaa', 'phui-calendar-day-css' => '572b1893', - 'phui-calendar-list-css' => 'eb5c774b', + 'phui-calendar-list-css' => '576be600', 'phui-calendar-month-css' => '8e10e92c', 'phui-chart-css' => '6bf6f78e', 'phui-cms-css' => '504b4b23', @@ -861,7 +861,7 @@ 'phui-form-css' => '5815af7b', 'phui-form-view-css' => 'adca31ce', 'phui-head-thing-view-css' => 'fd311e5f', - 'phui-header-view-css' => '92935c02', + 'phui-header-view-css' => 'fef6a54e', 'phui-hovercard' => '1bd28176', 'phui-hovercard-view-css' => 'e904f5dc', 'phui-icon-set-selector-css' => '87db8fee', @@ -906,7 +906,7 @@ 'policy-transaction-detail-css' => '82100a43', 'ponder-view-css' => 'fbd45f96', 'project-card-view-css' => 'f25746f5', - 'project-view-css' => 'ceabdbaa', + 'project-view-css' => '9f6ce0e1', 'releeph-core' => '9b3c5733', 'releeph-preview-branch' => 'b7a6f4a5', 'releeph-request-differential-create-dialog' => '8d8b92cd', diff --git a/src/applications/people/controller/PhabricatorPeopleProfileViewController.php b/src/applications/people/controller/PhabricatorPeopleProfileViewController.php --- a/src/applications/people/controller/PhabricatorPeopleProfileViewController.php +++ b/src/applications/people/controller/PhabricatorPeopleProfileViewController.php @@ -42,6 +42,7 @@ $home = id(new PHUITwoColumnView()) ->setHeader($header) ->addClass('project-view-home') + ->addClass('project-view-people-home') ->setMainColumn( array( $properties, @@ -87,8 +88,13 @@ return null; } + $header = id(new PHUIHeaderView()) + ->setHeader(pht('User Details')); + $view = id(new PHUIObjectBoxView()) ->appendChild($view) + ->setHeader($header) + ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY) ->addClass('project-view-properties'); return $view; @@ -143,7 +149,7 @@ $box = id(new PHUIObjectBoxView()) ->setHeader($header) ->appendChild($list) - ->setBackground(PHUIObjectBoxView::GREY); + ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY); return $box; } @@ -217,7 +223,7 @@ ->setHeader($header) ->appendChild($day_view) ->addClass('calendar-profile-box') - ->setBackground(PHUIObjectBoxView::GREY); + ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY); return $box; } @@ -317,7 +323,7 @@ ->setHeader($header) ->addClass('project-view-badges') ->appendChild($flex) - ->setBackground(PHUIObjectBoxView::GREY); + ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY); return $box; } diff --git a/src/applications/project/controller/PhabricatorProjectProfileController.php b/src/applications/project/controller/PhabricatorProjectProfileController.php --- a/src/applications/project/controller/PhabricatorProjectProfileController.php +++ b/src/applications/project/controller/PhabricatorProjectProfileController.php @@ -59,14 +59,14 @@ ->setUser($viewer) ->setProject($project) ->setLimit(5) - ->setBackground(PHUIObjectBoxView::GREY) + ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY) ->setUserPHIDs($project->getMemberPHIDs()); $watcher_list = id(new PhabricatorProjectWatcherListView()) ->setUser($viewer) ->setProject($project) ->setLimit(5) - ->setBackground(PHUIObjectBoxView::GREY) + ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY) ->setUserPHIDs($project->getWatcherPHIDs()); $nav = $this->getProfileMenu(); @@ -137,8 +137,13 @@ return null; } + $header = id(new PHUIHeaderView()) + ->setHeader(pht('Properties')); + $view = id(new PHUIObjectBoxView()) + ->setHeader($header) ->appendChild($view) + ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY) ->addClass('project-view-properties'); return $view; @@ -287,7 +292,7 @@ return id(new PHUIObjectBoxView()) ->setHeader($header) - ->setBackground(PHUIObjectBoxView::GREY) + ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY) ->setObjectList($subproject_list); } 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,11 +14,6 @@ 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; diff --git a/webroot/rsrc/css/application/project/project-view.css b/webroot/rsrc/css/application/project/project-view.css --- a/webroot/rsrc/css/application/project/project-view.css +++ b/webroot/rsrc/css/application/project/project-view.css @@ -2,6 +2,12 @@ * @provides project-view-css */ +.project-view-people-home.phui-two-column-view .phui-two-column-header { + background: transparent; + border: none; + margin-bottom: 8px; +} + .project-view-header-tag { margin-left: 8px; font-size: {$normalfontsize}; @@ -27,8 +33,6 @@ .project-view-home .phui-box.project-view-properties { margin: 0 0 16px 0; padding: 0; - border: 1px solid rgba({$alphagrey}, .2); - background-color: #fff; } .device-desktop .phui-two-column-view .project-view-properties @@ -38,7 +42,7 @@ .project-view-properties .phui-property-list-container + .phui-property-list-text-content { - border-color: rgba({$alphagrey},.2); + border-color: {$thinblueborder}; } .project-view-properties .phui-property-list-key { @@ -51,29 +55,16 @@ padding: 12px 4px 0; } -.project-view-feed.phui-object-box.phui-box-border { - border: 1px solid rgba({$alphagrey}, .2); -} - -.project-view-home .phui-box-grey { - padding: 0; -} - -.project-view-home .phui-box-grey .phui-header-shell { +.project-view-home .phui-side-column .phui-object-box .phui-header-shell { padding: 6px 6px 6px 12px; } -.project-view-home .phui-box-grey .phui-header-header { - font-size: {$biggerfontsize}; -} - -.project-view-home .phui-box-grey .phui-header-action-link { - margin-top: 0; - margin-bottom: 0; -} - -.project-view-home .phui-box-grey .phui-oi-list-view { - padding: 4px 8px 0 8px; +.project-view-home .phui-side-column .phui-object-box + div.phui-info-severity-nodata { + color: {$lightgreytext}; + font-style: italic; + border: none; + text-align: center; } .project-view-badges .phui-badge-flex-view { diff --git a/webroot/rsrc/css/phui/calendar/phui-calendar-list.css b/webroot/rsrc/css/phui/calendar/phui-calendar-list.css --- a/webroot/rsrc/css/phui/calendar/phui-calendar-list.css +++ b/webroot/rsrc/css/phui/calendar/phui-calendar-list.css @@ -12,7 +12,7 @@ padding: 0 12px 12px; } -.project-view-home .phui-box-grey .phui-calendar-list-container +.project-view-home .phui-object-box .phui-calendar-list-container .phui-header-shell { padding: 8px 0; background: #fff; diff --git a/webroot/rsrc/css/phui/phui-basic-nav-view.css b/webroot/rsrc/css/phui/phui-basic-nav-view.css --- a/webroot/rsrc/css/phui/phui-basic-nav-view.css +++ b/webroot/rsrc/css/phui/phui-basic-nav-view.css @@ -27,10 +27,6 @@ display: none; } -.phabricator-home .phui-basic-nav .phabricator-side-menu { - background: transparent; -} - .device-phone.phabricator-home .phui-basic-nav .phabricator-side-menu .phui-list-item-selected { background-color: transparent; diff --git a/webroot/rsrc/css/phui/phui-header-view.css b/webroot/rsrc/css/phui/phui-header-view.css --- a/webroot/rsrc/css/phui/phui-header-view.css +++ b/webroot/rsrc/css/phui/phui-header-view.css @@ -93,6 +93,10 @@ color: {$darkbluetext}; } +.phui-box-blue-property .phui-header-view .phui-header-header a { + color: {$bluetext}; +} + .device-desktop .phui-header-view .phui-header-header a:hover { text-decoration: none; color: {$blue};