diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => 'df56364d', + 'core.pkg.css' => '69f486e4', 'core.pkg.js' => '41f5edc5', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => 'fe951924', @@ -141,7 +141,7 @@ 'rsrc/css/phui/phui-info-view.css' => '33e54618', 'rsrc/css/phui/phui-list.css' => '02ab3534', 'rsrc/css/phui/phui-object-box.css' => '3db9f358', - 'rsrc/css/phui/phui-object-item-list-view.css' => 'a7d38075', + 'rsrc/css/phui/phui-object-item-list-view.css' => '4d5fe709', 'rsrc/css/phui/phui-pager.css' => 'bea33d23', 'rsrc/css/phui/phui-pinboard-view.css' => '2495140e', 'rsrc/css/phui/phui-property-list-view.css' => '1baf23eb', @@ -783,7 +783,7 @@ 'phui-inline-comment-view-css' => 'fa5b8d1f', 'phui-list-view-css' => '02ab3534', 'phui-object-box-css' => '3db9f358', - 'phui-object-item-list-view-css' => 'a7d38075', + 'phui-object-item-list-view-css' => '4d5fe709', 'phui-pager-css' => 'bea33d23', 'phui-pinboard-view-css' => '2495140e', 'phui-property-list-view-css' => '1baf23eb', diff --git a/src/applications/conpherence/controller/ConpherenceViewController.php b/src/applications/conpherence/controller/ConpherenceViewController.php --- a/src/applications/conpherence/controller/ConpherenceViewController.php +++ b/src/applications/conpherence/controller/ConpherenceViewController.php @@ -9,7 +9,7 @@ return true; } - public function buildApplicationCrumbs() { + protected function buildApplicationCrumbs() { $crumbs = $this->buildConpherenceApplicationCrumbs(); $crumbs->setBorder(true); return $crumbs; diff --git a/src/applications/people/application/PhabricatorPeopleApplication.php b/src/applications/people/application/PhabricatorPeopleApplication.php --- a/src/applications/people/application/PhabricatorPeopleApplication.php +++ b/src/applications/people/application/PhabricatorPeopleApplication.php @@ -73,8 +73,6 @@ => 'PhabricatorPeopleProfileController', '/p/(?P[\w._-]+)/calendar/' => 'PhabricatorPeopleCalendarController', - '/p/(?P[\w._-]+)/feed/' - => 'PhabricatorPeopleFeedController', ); } diff --git a/src/view/page/menu/PhabricatorMainMenuView.php b/src/view/page/menu/PhabricatorMainMenuView.php --- a/src/view/page/menu/PhabricatorMainMenuView.php +++ b/src/view/page/menu/PhabricatorMainMenuView.php @@ -274,13 +274,13 @@ 'background-position: 0px 0px; '. 'background-image: url('.$logo_uri.');'; } + } + + $color = PhabricatorEnv::getEnvConfig('ui.header-color'); + if ($color == 'light') { + $color = 'dark'; } else { - $color = PhabricatorEnv::getEnvConfig('ui.header-color'); - if ($color == 'light') { - $color = 'dark'; - } else { - $color = 'light'; - } + $color = 'light'; } return phutil_tag( diff --git a/webroot/rsrc/css/phui/phui-object-item-list-view.css b/webroot/rsrc/css/phui/phui-object-item-list-view.css --- a/webroot/rsrc/css/phui/phui-object-item-list-view.css +++ b/webroot/rsrc/css/phui/phui-object-item-list-view.css @@ -116,7 +116,7 @@ top: 0; bottom: 0; left: 0; - width: 16px; + width: 20px; background: url('/rsrc/image/texture/grip.png') center center no-repeat; } @@ -151,6 +151,7 @@ width: 20px; display: table-cell; vertical-align: middle; + padding-left: 4px; } .device-phone .phui-object-item-col0 {