@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Revert "Clean up more Quicksand"

Summary: This reverts commit 5eb4bc6ca960aa0eafaa25591baea102ff4e034b.

Test Plan: Reload homepage, no scrollbars

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D16645

+46 -89
+13 -13
resources/celerity/map.php
··· 9 9 'names' => array( 10 10 'conpherence.pkg.css' => 'c8fbe125', 11 11 'conpherence.pkg.js' => '11f3e07e', 12 - 'core.pkg.css' => 'ade19c40', 12 + 'core.pkg.css' => 'cfc3eabe', 13 13 'core.pkg.js' => '03c1cb09', 14 14 'darkconsole.pkg.js' => 'e7393ebb', 15 15 'differential.pkg.css' => 'e1d704ce', ··· 38 38 'rsrc/css/application/base/notification-menu.css' => 'b3ab500d', 39 39 'rsrc/css/application/base/phabricator-application-launch-view.css' => '95351601', 40 40 'rsrc/css/application/base/phui-theme.css' => '027ba77e', 41 - 'rsrc/css/application/base/standard-page-view.css' => 'e5d90676', 41 + 'rsrc/css/application/base/standard-page-view.css' => '79176f5a', 42 42 'rsrc/css/application/chatlog/chatlog.css' => 'd295b020', 43 43 'rsrc/css/application/conduit/conduit-api.css' => '7bc725c4', 44 44 'rsrc/css/application/config/config-options.css' => '0ede4c9b', ··· 102 102 'rsrc/css/application/releeph/releeph-preview-branch.css' => 'b7a6f4a5', 103 103 'rsrc/css/application/releeph/releeph-request-differential-create-dialog.css' => '8d8b92cd', 104 104 'rsrc/css/application/releeph/releeph-request-typeahead.css' => '667a48ae', 105 - 'rsrc/css/application/search/application-search-view.css' => '9c9bc8dc', 105 + 'rsrc/css/application/search/application-search-view.css' => 'be6454ec', 106 106 'rsrc/css/application/search/search-results.css' => '7dea472c', 107 107 'rsrc/css/application/slowvote/slowvote.css' => 'a94b7230', 108 108 'rsrc/css/application/tokens/tokens.css' => '3d0f239e', 109 109 'rsrc/css/application/uiexample/example.css' => '528b19de', 110 - 'rsrc/css/core/core.css' => '4f5111ea', 110 + 'rsrc/css/core/core.css' => 'd0801452', 111 111 'rsrc/css/core/remarkup.css' => 'cd912f2c', 112 112 'rsrc/css/core/syntax.css' => '769d3498', 113 113 'rsrc/css/core/z-index.css' => '0d4e5558', ··· 125 125 'rsrc/css/phui/phui-action-list.css' => 'c5eba19d', 126 126 'rsrc/css/phui/phui-action-panel.css' => '91c7b835', 127 127 'rsrc/css/phui/phui-badge.css' => '3baef8db', 128 - 'rsrc/css/phui/phui-basic-nav-view.css' => 'c377093a', 128 + 'rsrc/css/phui/phui-basic-nav-view.css' => '7093573b', 129 129 'rsrc/css/phui/phui-big-info-view.css' => 'bd903741', 130 130 'rsrc/css/phui/phui-box.css' => '5c8387cf', 131 131 'rsrc/css/phui/phui-button.css' => '4a5fbe3d', ··· 163 163 'rsrc/css/phui/phui-tag-view.css' => '6bbd83e2', 164 164 'rsrc/css/phui/phui-timeline-view.css' => 'bc523970', 165 165 'rsrc/css/phui/phui-two-column-view.css' => 'fcfbe347', 166 - 'rsrc/css/phui/workboards/phui-workboard-color.css' => '6da20b15', 167 - 'rsrc/css/phui/workboards/phui-workboard.css' => 'fe70ad9c', 166 + 'rsrc/css/phui/workboards/phui-workboard-color.css' => 'ac6fe6a7', 167 + 'rsrc/css/phui/workboards/phui-workboard.css' => 'e09eb53a', 168 168 'rsrc/css/phui/workboards/phui-workcard.css' => '0c62d7c5', 169 169 'rsrc/css/phui/workboards/phui-workpanel.css' => '92197373', 170 170 'rsrc/css/sprite-login.css' => '6dbbbd97', ··· 611 611 'aphront-tokenizer-control-css' => '056da01b', 612 612 'aphront-tooltip-css' => '1a07aea8', 613 613 'aphront-typeahead-control-css' => 'd4f16145', 614 - 'application-search-view-css' => '9c9bc8dc', 614 + 'application-search-view-css' => 'be6454ec', 615 615 'auth-css' => '0877ed6e', 616 616 'bulk-job-css' => 'df9c1d4a', 617 617 'changeset-view-manager' => 'a2828756', ··· 844 844 'phabricator-busy' => '59a7976a', 845 845 'phabricator-chatlog-css' => 'd295b020', 846 846 'phabricator-content-source-view-css' => '4b8b05d4', 847 - 'phabricator-core-css' => '4f5111ea', 847 + 'phabricator-core-css' => 'd0801452', 848 848 'phabricator-countdown-css' => '16c52f5c', 849 849 'phabricator-dashboard-css' => 'bc6f2127', 850 850 'phabricator-drag-and-drop-file-upload' => '58dea2fa', ··· 869 869 'phabricator-shaped-request' => '7cbe244b', 870 870 'phabricator-slowvote-css' => 'a94b7230', 871 871 'phabricator-source-code-view-css' => 'cbeef983', 872 - 'phabricator-standard-page-view' => 'e5d90676', 872 + 'phabricator-standard-page-view' => '79176f5a', 873 873 'phabricator-textareautils' => '320810c8', 874 874 'phabricator-title' => 'df5e11d2', 875 875 'phabricator-tooltip' => '6323f942', ··· 896 896 'phriction-document-css' => '4282e4ad', 897 897 'phui-action-panel-css' => '91c7b835', 898 898 'phui-badge-view-css' => '3baef8db', 899 - 'phui-basic-nav-view-css' => 'c377093a', 899 + 'phui-basic-nav-view-css' => '7093573b', 900 900 'phui-big-info-view-css' => 'bd903741', 901 901 'phui-box-css' => '5c8387cf', 902 902 'phui-button-css' => '4a5fbe3d', ··· 942 942 'phui-theme-css' => '027ba77e', 943 943 'phui-timeline-view-css' => 'bc523970', 944 944 'phui-two-column-view-css' => 'fcfbe347', 945 - 'phui-workboard-color-css' => '6da20b15', 946 - 'phui-workboard-view-css' => 'fe70ad9c', 945 + 'phui-workboard-color-css' => 'ac6fe6a7', 946 + 'phui-workboard-view-css' => 'e09eb53a', 947 947 'phui-workcard-view-css' => '0c62d7c5', 948 948 'phui-workpanel-view-css' => '92197373', 949 949 'phuix-action-list-view' => 'b5c256b8',
+1 -1
src/applications/config/controller/PhabricatorConfigAllController.php
··· 71 71 ->setCrumbs($crumbs) 72 72 ->setNavigation($nav) 73 73 ->appendChild($content) 74 - ->addFrameClass('white-background'); 74 + ->addClass('white-background'); 75 75 76 76 } 77 77
+1 -1
src/applications/config/controller/PhabricatorConfigApplicationController.php
··· 32 32 ->setCrumbs($crumbs) 33 33 ->setNavigation($nav) 34 34 ->appendChild($content) 35 - ->addFrameClass('white-background'); 35 + ->addClass('white-background'); 36 36 } 37 37 38 38 private function buildConfigOptionsList(array $groups, $type) {
+1 -1
src/applications/config/controller/PhabricatorConfigCacheController.php
··· 37 37 ->setCrumbs($crumbs) 38 38 ->setNavigation($nav) 39 39 ->appendChild($content) 40 - ->addFrameClass('white-background'); 40 + ->addClass('white-background'); 41 41 } 42 42 43 43 private function renderCodeBox() {
+1 -1
src/applications/config/controller/PhabricatorConfigClusterDatabasesController.php
··· 36 36 ->setCrumbs($crumbs) 37 37 ->setNavigation($nav) 38 38 ->appendChild($content) 39 - ->addFrameClass('white-background'); 39 + ->addClass('white-background'); 40 40 } 41 41 42 42 private function buildClusterDatabaseStatus() {
+1 -1
src/applications/config/controller/PhabricatorConfigClusterNotificationsController.php
··· 36 36 ->setCrumbs($crumbs) 37 37 ->setNavigation($nav) 38 38 ->appendChild($content) 39 - ->addFrameClass('white-background'); 39 + ->addClass('white-background'); 40 40 } 41 41 42 42 private function buildClusterNotificationStatus() {
+1 -1
src/applications/config/controller/PhabricatorConfigClusterRepositoriesController.php
··· 42 42 ->setCrumbs($crumbs) 43 43 ->setNavigation($nav) 44 44 ->appendChild($content) 45 - ->addFrameClass('white-background'); 45 + ->addClass('white-background'); 46 46 } 47 47 48 48 private function buildClusterRepositoryStatus() {
+1 -1
src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php
··· 165 165 ->setCrumbs($crumbs) 166 166 ->setNavigation($nav) 167 167 ->appendChild($content) 168 - ->addFrameClass('white-background'); 168 + ->addClass('white-background'); 169 169 } 170 170 171 171 }
+1 -1
src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php
··· 117 117 ->setCrumbs($crumbs) 118 118 ->setNavigation($nav) 119 119 ->appendChild($content) 120 - ->addFrameClass('white-background'); 120 + ->addClass('white-background'); 121 121 } 122 122 123 123
+1 -1
src/applications/config/controller/PhabricatorConfigGroupController.php
··· 43 43 ->setCrumbs($crumbs) 44 44 ->setNavigation($nav) 45 45 ->appendChild($content) 46 - ->addFrameClass('white-background'); 46 + ->addClass('white-background'); 47 47 } 48 48 49 49 private function buildOptionList(array $options) {
+1 -1
src/applications/config/controller/PhabricatorConfigHistoryController.php
··· 50 50 ->setCrumbs($crumbs) 51 51 ->setNavigation($nav) 52 52 ->appendChild($content) 53 - ->addFrameClass('white-background'); 53 + ->addClass('white-background'); 54 54 } 55 55 56 56 }
+1 -1
src/applications/config/controller/PhabricatorConfigIssueListController.php
··· 68 68 ->setCrumbs($crumbs) 69 69 ->setNavigation($nav) 70 70 ->appendChild($content) 71 - ->addFrameClass('white-background'); 71 + ->addClass('white-background'); 72 72 } 73 73 74 74 private function buildIssueList(array $issues, $group, $fonticon) {
+1 -1
src/applications/config/controller/PhabricatorConfigIssueViewController.php
··· 46 46 ->setCrumbs($crumbs) 47 47 ->setNavigation($nav) 48 48 ->appendChild($content) 49 - ->addFrameClass('white-background'); 49 + ->addClass('white-background'); 50 50 } 51 51 52 52 private function renderIssue(PhabricatorSetupIssue $issue) {
+1 -1
src/applications/config/controller/PhabricatorConfigListController.php
··· 32 32 ->setCrumbs($crumbs) 33 33 ->setNavigation($nav) 34 34 ->appendChild($content) 35 - ->addFrameClass('white-background'); 35 + ->addClass('white-background'); 36 36 } 37 37 38 38 private function buildConfigOptionsList(array $groups, $type) {
+1 -1
src/applications/config/controller/PhabricatorConfigModuleController.php
··· 36 36 ->setCrumbs($crumbs) 37 37 ->setNavigation($nav) 38 38 ->appendChild($content) 39 - ->addFrameClass('white-background'); 39 + ->addClass('white-background'); 40 40 } 41 41 42 42 }
+1 -1
src/applications/config/controller/PhabricatorConfigVersionController.php
··· 31 31 ->setCrumbs($crumbs) 32 32 ->setNavigation($nav) 33 33 ->appendChild($content) 34 - ->addFrameClass('white-background'); 34 + ->addClass('white-background'); 35 35 36 36 } 37 37
+1 -1
src/applications/home/controller/PhabricatorHomeMainController.php
··· 46 46 47 47 return $this->newPage() 48 48 ->setTitle('Phabricator') 49 - ->addFrameClass('phabricator-home') 49 + ->addClass('phabricator-home') 50 50 ->appendChild($content); 51 51 52 52 }
+2 -2
src/applications/project/controller/PhabricatorProjectBoardViewController.php
··· 455 455 require_celerity_resource('phui-workboard-color-css'); 456 456 $background_color_class = "phui-workboard-{$background}"; 457 457 458 - $page->addFrameClass('phui-workboard-color'); 459 - $page->addFrameClass($background_color_class); 458 + $page->addClass('phui-workboard-color'); 459 + $page->addClass($background_color_class); 460 460 } 461 461 462 462 return $page;
+2 -2
src/applications/search/controller/PhabricatorApplicationSearchController.php
··· 320 320 $crumbs->addTextCrumb($title); 321 321 } 322 322 323 + $nav->addClass('application-search-view'); 323 324 require_celerity_resource('application-search-view-css'); 324 325 325 326 return $this->newPage() ··· 327 328 ->setTitle(pht('Query: %s', $title)) 328 329 ->setCrumbs($crumbs) 329 330 ->setNavigation($nav) 330 - ->addFrameClass('application-search-view') 331 331 ->appendChild($body); 332 332 } 333 333 ··· 419 419 ->setObjectList($list) 420 420 ->addClass('application-search-results'); 421 421 422 + $nav->addClass('application-search-view'); 422 423 require_celerity_resource('application-search-view-css'); 423 424 424 425 return $this->newPage() ··· 426 427 ->setTitle(pht('Saved Queries')) 427 428 ->setCrumbs($crumbs) 428 429 ->setNavigation($nav) 429 - ->addFrameClass('application-search-view') 430 430 ->appendChild($box); 431 431 } 432 432
+3 -17
src/view/page/PhabricatorStandardPageView.php
··· 13 13 private $menuContent; 14 14 private $showChrome = true; 15 15 private $classes = array(); 16 - private $frameClasses = array(); 17 16 private $disableConsole; 18 17 private $pageObjects = array(); 19 18 private $applicationMenu; ··· 78 77 79 78 public function addClass($class) { 80 79 $this->classes[] = $class; 81 - return $this; 82 - } 83 - 84 - public function addFrameClass($class) { 85 - $this->frameClasses[] = $class; 86 80 return $this; 87 81 } 88 82 ··· 534 528 } 535 529 $nav->appendChild($body); 536 530 $nav->appendFooter($footer); 537 - $content = $nav; 531 + $content = phutil_implode_html('', array($nav->render())); 538 532 } else { 539 533 $content = array(); 540 534 ··· 545 539 546 540 $content[] = $body; 547 541 $content[] = $footer; 548 - } 549 542 550 - $frame_classes = $this->frameClasses; 551 - $frame_classes[] = 'main-page-background'; 552 - 553 - $content = phutil_tag( 554 - 'div', 555 - array( 556 - 'class' => implode(' ', $frame_classes), 557 - ), 558 - $content); 543 + $content = phutil_implode_html('', $content); 544 + } 559 545 560 546 return array( 561 547 ($console ? hsprintf('<darkconsole />') : null),
+1 -12
webroot/rsrc/css/application/base/standard-page-view.css
··· 17 17 clear: both; 18 18 } 19 19 20 - .main-page-background { 21 - position: absolute; 22 - top: 44px; 23 - bottom: 0; 24 - left: 0; 25 - right: 0; 26 - overflow: scroll; 27 - z-index: -1; 28 - background: {$page.background}; 29 - } 30 - 31 - .main-page-background.white-background { 20 + body.white-background { 32 21 background: #fff; 33 22 } 34 23
-10
webroot/rsrc/css/application/search/application-search-view.css
··· 11 11 padding: 0 16px 24px; 12 12 } 13 13 14 - .device-phone .application-search-view 15 - .application-search-results.phui-object-box { 16 - padding: 0 8px 24px; 17 - } 18 - 19 14 .application-search-view .application-search-results .phui-profile-header { 20 15 padding: 16px 8px; 21 16 border-bottom: 1px solid {$thinblueborder}; ··· 58 53 .device-phone .application-search-pager { 59 54 margin: 12px; 60 55 } 61 - 62 - .device-phone .application-search-view .application-search-results 63 - .phui-profile-header { 64 - padding-top: 12px; 65 - }
+1 -6
webroot/rsrc/css/core/core.css
··· 42 42 font-weight: bold; 43 43 } 44 44 45 - html{ 46 - min-height: 100%; 47 - position: relative; 48 - } 49 - 50 45 body { 51 46 font: {$basefont}; 52 47 direction: ltr; 53 48 text-align: left; 54 49 unicode-bidi: embed; 55 - height: 100%; 50 + background: {$page.background}; 56 51 57 52 /* By default, the iPhone zooms all text on the page by some percentage when 58 53 you rotate from portrait mode to landscape mode. Disable this, since it
+3 -3
webroot/rsrc/css/phui/phui-basic-nav-view.css
··· 3 3 */ 4 4 5 5 .device-desktop .phui-navigation-shell, 6 - .device .phabricator-home .phui-navigation-shell { 6 + .phabricator-home.device .phui-navigation-shell { 7 7 display: table; 8 8 width: 100%; 9 9 height: calc(100vh - {$menu.main.height}); 10 10 } 11 11 12 12 .device-desktop .phui-navigation-shell .phabricator-nav, 13 - .device .phabricator-home .phui-navigation-shell .phabricator-nav { 13 + .phabricator-home.device .phui-navigation-shell .phabricator-nav { 14 14 display: table-row; 15 15 } 16 16 17 17 .device-desktop .phui-navigation-shell .phabricator-nav-local, 18 - .device .phabricator-home .phui-navigation-shell .phabricator-nav-local { 18 + .phabricator-home.device .phui-navigation-shell .phabricator-nav-local { 19 19 display: table-cell; 20 20 position: relative; 21 21 vertical-align: top;
+2 -2
webroot/rsrc/css/phui/workboards/phui-workboard-color.css
··· 30 30 background-color: rgba({$alphawhite},.6); 31 31 } 32 32 33 - body .phui-workboard-color .phui-profile-menu .phabricator-side-menu { 33 + body.phui-workboard-color .phui-profile-menu .phabricator-side-menu { 34 34 background-color: rgba({$alphagrey},.3); 35 35 } 36 36 37 - body .phui-workboard-color .phabricator-side-menu .phui-profile-menu-footer-1 { 37 + body.phui-workboard-color .phabricator-side-menu .phui-profile-menu-footer-1 { 38 38 background-color: transparent; 39 39 } 40 40
+3 -6
webroot/rsrc/css/phui/workboards/phui-workboard.css
··· 14 14 overflow-x: auto; 15 15 overflow-y: hidden; 16 16 position: absolute; 17 - top: 32px; 17 + top: 79px; 18 18 bottom: 0; 19 19 left: 0; 20 20 right: 0; 21 21 padding: 16px; 22 + background-color: #fff; 22 23 } 23 24 24 25 .phui-workboard-view-shadow::-webkit-scrollbar { ··· 74 75 display: none; 75 76 } 76 77 77 - .device-desktop .phui-workboard-fullscreen .main-page-background { 78 - top: 0; 79 - } 80 - 81 78 .device-desktop .phui-workboard-fullscreen .phui-profile-menu 82 79 .phui-workboard-view-shadow { 83 - top: 32px; 80 + top: 35px; 84 81 left: 0; 85 82 } 86 83