Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15471711
D16645.id40073.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
21 KB
Referenced Files
None
Subscribers
None
D16645.id40073.diff
View Options
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' => 'c8fbe125',
'conpherence.pkg.js' => '11f3e07e',
- 'core.pkg.css' => 'ade19c40',
+ 'core.pkg.css' => 'cfc3eabe',
'core.pkg.js' => '03c1cb09',
'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => 'e1d704ce',
@@ -38,7 +38,7 @@
'rsrc/css/application/base/notification-menu.css' => 'b3ab500d',
'rsrc/css/application/base/phabricator-application-launch-view.css' => '95351601',
'rsrc/css/application/base/phui-theme.css' => '027ba77e',
- 'rsrc/css/application/base/standard-page-view.css' => 'e5d90676',
+ 'rsrc/css/application/base/standard-page-view.css' => '79176f5a',
'rsrc/css/application/chatlog/chatlog.css' => 'd295b020',
'rsrc/css/application/conduit/conduit-api.css' => '7bc725c4',
'rsrc/css/application/config/config-options.css' => '0ede4c9b',
@@ -102,12 +102,12 @@
'rsrc/css/application/releeph/releeph-preview-branch.css' => 'b7a6f4a5',
'rsrc/css/application/releeph/releeph-request-differential-create-dialog.css' => '8d8b92cd',
'rsrc/css/application/releeph/releeph-request-typeahead.css' => '667a48ae',
- 'rsrc/css/application/search/application-search-view.css' => '9c9bc8dc',
+ 'rsrc/css/application/search/application-search-view.css' => 'be6454ec',
'rsrc/css/application/search/search-results.css' => '7dea472c',
'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' => '4f5111ea',
+ 'rsrc/css/core/core.css' => 'd0801452',
'rsrc/css/core/remarkup.css' => 'cd912f2c',
'rsrc/css/core/syntax.css' => '769d3498',
'rsrc/css/core/z-index.css' => '0d4e5558',
@@ -125,7 +125,7 @@
'rsrc/css/phui/phui-action-list.css' => 'c5eba19d',
'rsrc/css/phui/phui-action-panel.css' => '91c7b835',
'rsrc/css/phui/phui-badge.css' => '3baef8db',
- 'rsrc/css/phui/phui-basic-nav-view.css' => 'c377093a',
+ 'rsrc/css/phui/phui-basic-nav-view.css' => '7093573b',
'rsrc/css/phui/phui-big-info-view.css' => 'bd903741',
'rsrc/css/phui/phui-box.css' => '5c8387cf',
'rsrc/css/phui/phui-button.css' => '4a5fbe3d',
@@ -163,8 +163,8 @@
'rsrc/css/phui/phui-tag-view.css' => '6bbd83e2',
'rsrc/css/phui/phui-timeline-view.css' => 'bc523970',
'rsrc/css/phui/phui-two-column-view.css' => 'fcfbe347',
- 'rsrc/css/phui/workboards/phui-workboard-color.css' => '6da20b15',
- 'rsrc/css/phui/workboards/phui-workboard.css' => 'fe70ad9c',
+ 'rsrc/css/phui/workboards/phui-workboard-color.css' => 'ac6fe6a7',
+ 'rsrc/css/phui/workboards/phui-workboard.css' => 'e09eb53a',
'rsrc/css/phui/workboards/phui-workcard.css' => '0c62d7c5',
'rsrc/css/phui/workboards/phui-workpanel.css' => '92197373',
'rsrc/css/sprite-login.css' => '6dbbbd97',
@@ -611,7 +611,7 @@
'aphront-tokenizer-control-css' => '056da01b',
'aphront-tooltip-css' => '1a07aea8',
'aphront-typeahead-control-css' => 'd4f16145',
- 'application-search-view-css' => '9c9bc8dc',
+ 'application-search-view-css' => 'be6454ec',
'auth-css' => '0877ed6e',
'bulk-job-css' => 'df9c1d4a',
'changeset-view-manager' => 'a2828756',
@@ -844,7 +844,7 @@
'phabricator-busy' => '59a7976a',
'phabricator-chatlog-css' => 'd295b020',
'phabricator-content-source-view-css' => '4b8b05d4',
- 'phabricator-core-css' => '4f5111ea',
+ 'phabricator-core-css' => 'd0801452',
'phabricator-countdown-css' => '16c52f5c',
'phabricator-dashboard-css' => 'bc6f2127',
'phabricator-drag-and-drop-file-upload' => '58dea2fa',
@@ -869,7 +869,7 @@
'phabricator-shaped-request' => '7cbe244b',
'phabricator-slowvote-css' => 'a94b7230',
'phabricator-source-code-view-css' => 'cbeef983',
- 'phabricator-standard-page-view' => 'e5d90676',
+ 'phabricator-standard-page-view' => '79176f5a',
'phabricator-textareautils' => '320810c8',
'phabricator-title' => 'df5e11d2',
'phabricator-tooltip' => '6323f942',
@@ -896,7 +896,7 @@
'phriction-document-css' => '4282e4ad',
'phui-action-panel-css' => '91c7b835',
'phui-badge-view-css' => '3baef8db',
- 'phui-basic-nav-view-css' => 'c377093a',
+ 'phui-basic-nav-view-css' => '7093573b',
'phui-big-info-view-css' => 'bd903741',
'phui-box-css' => '5c8387cf',
'phui-button-css' => '4a5fbe3d',
@@ -942,8 +942,8 @@
'phui-theme-css' => '027ba77e',
'phui-timeline-view-css' => 'bc523970',
'phui-two-column-view-css' => 'fcfbe347',
- 'phui-workboard-color-css' => '6da20b15',
- 'phui-workboard-view-css' => 'fe70ad9c',
+ 'phui-workboard-color-css' => 'ac6fe6a7',
+ 'phui-workboard-view-css' => 'e09eb53a',
'phui-workcard-view-css' => '0c62d7c5',
'phui-workpanel-view-css' => '92197373',
'phuix-action-list-view' => 'b5c256b8',
diff --git a/src/applications/config/controller/PhabricatorConfigAllController.php b/src/applications/config/controller/PhabricatorConfigAllController.php
--- a/src/applications/config/controller/PhabricatorConfigAllController.php
+++ b/src/applications/config/controller/PhabricatorConfigAllController.php
@@ -71,7 +71,7 @@
->setCrumbs($crumbs)
->setNavigation($nav)
->appendChild($content)
- ->addFrameClass('white-background');
+ ->addClass('white-background');
}
diff --git a/src/applications/config/controller/PhabricatorConfigApplicationController.php b/src/applications/config/controller/PhabricatorConfigApplicationController.php
--- a/src/applications/config/controller/PhabricatorConfigApplicationController.php
+++ b/src/applications/config/controller/PhabricatorConfigApplicationController.php
@@ -32,7 +32,7 @@
->setCrumbs($crumbs)
->setNavigation($nav)
->appendChild($content)
- ->addFrameClass('white-background');
+ ->addClass('white-background');
}
private function buildConfigOptionsList(array $groups, $type) {
diff --git a/src/applications/config/controller/PhabricatorConfigCacheController.php b/src/applications/config/controller/PhabricatorConfigCacheController.php
--- a/src/applications/config/controller/PhabricatorConfigCacheController.php
+++ b/src/applications/config/controller/PhabricatorConfigCacheController.php
@@ -37,7 +37,7 @@
->setCrumbs($crumbs)
->setNavigation($nav)
->appendChild($content)
- ->addFrameClass('white-background');
+ ->addClass('white-background');
}
private function renderCodeBox() {
diff --git a/src/applications/config/controller/PhabricatorConfigClusterDatabasesController.php b/src/applications/config/controller/PhabricatorConfigClusterDatabasesController.php
--- a/src/applications/config/controller/PhabricatorConfigClusterDatabasesController.php
+++ b/src/applications/config/controller/PhabricatorConfigClusterDatabasesController.php
@@ -36,7 +36,7 @@
->setCrumbs($crumbs)
->setNavigation($nav)
->appendChild($content)
- ->addFrameClass('white-background');
+ ->addClass('white-background');
}
private function buildClusterDatabaseStatus() {
diff --git a/src/applications/config/controller/PhabricatorConfigClusterNotificationsController.php b/src/applications/config/controller/PhabricatorConfigClusterNotificationsController.php
--- a/src/applications/config/controller/PhabricatorConfigClusterNotificationsController.php
+++ b/src/applications/config/controller/PhabricatorConfigClusterNotificationsController.php
@@ -36,7 +36,7 @@
->setCrumbs($crumbs)
->setNavigation($nav)
->appendChild($content)
- ->addFrameClass('white-background');
+ ->addClass('white-background');
}
private function buildClusterNotificationStatus() {
diff --git a/src/applications/config/controller/PhabricatorConfigClusterRepositoriesController.php b/src/applications/config/controller/PhabricatorConfigClusterRepositoriesController.php
--- a/src/applications/config/controller/PhabricatorConfigClusterRepositoriesController.php
+++ b/src/applications/config/controller/PhabricatorConfigClusterRepositoriesController.php
@@ -42,7 +42,7 @@
->setCrumbs($crumbs)
->setNavigation($nav)
->appendChild($content)
- ->addFrameClass('white-background');
+ ->addClass('white-background');
}
private function buildClusterRepositoryStatus() {
diff --git a/src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php b/src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php
--- a/src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php
+++ b/src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php
@@ -165,7 +165,7 @@
->setCrumbs($crumbs)
->setNavigation($nav)
->appendChild($content)
- ->addFrameClass('white-background');
+ ->addClass('white-background');
}
}
diff --git a/src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php b/src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php
--- a/src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php
+++ b/src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php
@@ -117,7 +117,7 @@
->setCrumbs($crumbs)
->setNavigation($nav)
->appendChild($content)
- ->addFrameClass('white-background');
+ ->addClass('white-background');
}
diff --git a/src/applications/config/controller/PhabricatorConfigGroupController.php b/src/applications/config/controller/PhabricatorConfigGroupController.php
--- a/src/applications/config/controller/PhabricatorConfigGroupController.php
+++ b/src/applications/config/controller/PhabricatorConfigGroupController.php
@@ -43,7 +43,7 @@
->setCrumbs($crumbs)
->setNavigation($nav)
->appendChild($content)
- ->addFrameClass('white-background');
+ ->addClass('white-background');
}
private function buildOptionList(array $options) {
diff --git a/src/applications/config/controller/PhabricatorConfigHistoryController.php b/src/applications/config/controller/PhabricatorConfigHistoryController.php
--- a/src/applications/config/controller/PhabricatorConfigHistoryController.php
+++ b/src/applications/config/controller/PhabricatorConfigHistoryController.php
@@ -50,7 +50,7 @@
->setCrumbs($crumbs)
->setNavigation($nav)
->appendChild($content)
- ->addFrameClass('white-background');
+ ->addClass('white-background');
}
}
diff --git a/src/applications/config/controller/PhabricatorConfigIssueListController.php b/src/applications/config/controller/PhabricatorConfigIssueListController.php
--- a/src/applications/config/controller/PhabricatorConfigIssueListController.php
+++ b/src/applications/config/controller/PhabricatorConfigIssueListController.php
@@ -68,7 +68,7 @@
->setCrumbs($crumbs)
->setNavigation($nav)
->appendChild($content)
- ->addFrameClass('white-background');
+ ->addClass('white-background');
}
private function buildIssueList(array $issues, $group, $fonticon) {
diff --git a/src/applications/config/controller/PhabricatorConfigIssueViewController.php b/src/applications/config/controller/PhabricatorConfigIssueViewController.php
--- a/src/applications/config/controller/PhabricatorConfigIssueViewController.php
+++ b/src/applications/config/controller/PhabricatorConfigIssueViewController.php
@@ -46,7 +46,7 @@
->setCrumbs($crumbs)
->setNavigation($nav)
->appendChild($content)
- ->addFrameClass('white-background');
+ ->addClass('white-background');
}
private function renderIssue(PhabricatorSetupIssue $issue) {
diff --git a/src/applications/config/controller/PhabricatorConfigListController.php b/src/applications/config/controller/PhabricatorConfigListController.php
--- a/src/applications/config/controller/PhabricatorConfigListController.php
+++ b/src/applications/config/controller/PhabricatorConfigListController.php
@@ -32,7 +32,7 @@
->setCrumbs($crumbs)
->setNavigation($nav)
->appendChild($content)
- ->addFrameClass('white-background');
+ ->addClass('white-background');
}
private function buildConfigOptionsList(array $groups, $type) {
diff --git a/src/applications/config/controller/PhabricatorConfigModuleController.php b/src/applications/config/controller/PhabricatorConfigModuleController.php
--- a/src/applications/config/controller/PhabricatorConfigModuleController.php
+++ b/src/applications/config/controller/PhabricatorConfigModuleController.php
@@ -36,7 +36,7 @@
->setCrumbs($crumbs)
->setNavigation($nav)
->appendChild($content)
- ->addFrameClass('white-background');
+ ->addClass('white-background');
}
}
diff --git a/src/applications/config/controller/PhabricatorConfigVersionController.php b/src/applications/config/controller/PhabricatorConfigVersionController.php
--- a/src/applications/config/controller/PhabricatorConfigVersionController.php
+++ b/src/applications/config/controller/PhabricatorConfigVersionController.php
@@ -31,7 +31,7 @@
->setCrumbs($crumbs)
->setNavigation($nav)
->appendChild($content)
- ->addFrameClass('white-background');
+ ->addClass('white-background');
}
diff --git a/src/applications/home/controller/PhabricatorHomeMainController.php b/src/applications/home/controller/PhabricatorHomeMainController.php
--- a/src/applications/home/controller/PhabricatorHomeMainController.php
+++ b/src/applications/home/controller/PhabricatorHomeMainController.php
@@ -46,7 +46,7 @@
return $this->newPage()
->setTitle('Phabricator')
- ->addFrameClass('phabricator-home')
+ ->addClass('phabricator-home')
->appendChild($content);
}
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
@@ -455,8 +455,8 @@
require_celerity_resource('phui-workboard-color-css');
$background_color_class = "phui-workboard-{$background}";
- $page->addFrameClass('phui-workboard-color');
- $page->addFrameClass($background_color_class);
+ $page->addClass('phui-workboard-color');
+ $page->addClass($background_color_class);
}
return $page;
diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php
--- a/src/applications/search/controller/PhabricatorApplicationSearchController.php
+++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php
@@ -320,6 +320,7 @@
$crumbs->addTextCrumb($title);
}
+ $nav->addClass('application-search-view');
require_celerity_resource('application-search-view-css');
return $this->newPage()
@@ -327,7 +328,6 @@
->setTitle(pht('Query: %s', $title))
->setCrumbs($crumbs)
->setNavigation($nav)
- ->addFrameClass('application-search-view')
->appendChild($body);
}
@@ -419,6 +419,7 @@
->setObjectList($list)
->addClass('application-search-results');
+ $nav->addClass('application-search-view');
require_celerity_resource('application-search-view-css');
return $this->newPage()
@@ -426,7 +427,6 @@
->setTitle(pht('Saved Queries'))
->setCrumbs($crumbs)
->setNavigation($nav)
- ->addFrameClass('application-search-view')
->appendChild($box);
}
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -13,7 +13,6 @@
private $menuContent;
private $showChrome = true;
private $classes = array();
- private $frameClasses = array();
private $disableConsole;
private $pageObjects = array();
private $applicationMenu;
@@ -81,11 +80,6 @@
return $this;
}
- public function addFrameClass($class) {
- $this->frameClasses[] = $class;
- return $this;
- }
-
public function setPageObjectPHIDs(array $phids) {
$this->pageObjects = $phids;
return $this;
@@ -534,7 +528,7 @@
}
$nav->appendChild($body);
$nav->appendFooter($footer);
- $content = $nav;
+ $content = phutil_implode_html('', array($nav->render()));
} else {
$content = array();
@@ -545,17 +539,9 @@
$content[] = $body;
$content[] = $footer;
- }
-
- $frame_classes = $this->frameClasses;
- $frame_classes[] = 'main-page-background';
- $content = phutil_tag(
- 'div',
- array(
- 'class' => implode(' ', $frame_classes),
- ),
- $content);
+ $content = phutil_implode_html('', $content);
+ }
return array(
($console ? hsprintf('<darkconsole />') : null),
diff --git a/webroot/rsrc/css/application/base/standard-page-view.css b/webroot/rsrc/css/application/base/standard-page-view.css
--- a/webroot/rsrc/css/application/base/standard-page-view.css
+++ b/webroot/rsrc/css/application/base/standard-page-view.css
@@ -17,18 +17,7 @@
clear: both;
}
-.main-page-background {
- position: absolute;
- top: 44px;
- bottom: 0;
- left: 0;
- right: 0;
- overflow: scroll;
- z-index: -1;
- background: {$page.background};
-}
-
-.main-page-background.white-background {
+body.white-background {
background: #fff;
}
diff --git a/webroot/rsrc/css/application/search/application-search-view.css b/webroot/rsrc/css/application/search/application-search-view.css
--- a/webroot/rsrc/css/application/search/application-search-view.css
+++ b/webroot/rsrc/css/application/search/application-search-view.css
@@ -11,11 +11,6 @@
padding: 0 16px 24px;
}
-.device-phone .application-search-view
- .application-search-results.phui-object-box {
- padding: 0 8px 24px;
-}
-
.application-search-view .application-search-results .phui-profile-header {
padding: 16px 8px;
border-bottom: 1px solid {$thinblueborder};
@@ -58,8 +53,3 @@
.device-phone .application-search-pager {
margin: 12px;
}
-
-.device-phone .application-search-view .application-search-results
- .phui-profile-header {
- padding-top: 12px;
-}
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
@@ -42,17 +42,12 @@
font-weight: bold;
}
-html{
- min-height: 100%;
- position: relative;
-}
-
body {
font: {$basefont};
direction: ltr;
text-align: left;
unicode-bidi: embed;
- height: 100%;
+ background: {$page.background};
/* By default, the iPhone zooms all text on the page by some percentage when
you rotate from portrait mode to landscape mode. Disable this, since it
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
@@ -3,19 +3,19 @@
*/
.device-desktop .phui-navigation-shell,
-.device .phabricator-home .phui-navigation-shell {
+.phabricator-home.device .phui-navigation-shell {
display: table;
width: 100%;
height: calc(100vh - {$menu.main.height});
}
.device-desktop .phui-navigation-shell .phabricator-nav,
-.device .phabricator-home .phui-navigation-shell .phabricator-nav {
+.phabricator-home.device .phui-navigation-shell .phabricator-nav {
display: table-row;
}
.device-desktop .phui-navigation-shell .phabricator-nav-local,
-.device .phabricator-home .phui-navigation-shell .phabricator-nav-local {
+.phabricator-home.device .phui-navigation-shell .phabricator-nav-local {
display: table-cell;
position: relative;
vertical-align: top;
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
@@ -30,11 +30,11 @@
background-color: rgba({$alphawhite},.6);
}
-body .phui-workboard-color .phui-profile-menu .phabricator-side-menu {
+body.phui-workboard-color .phui-profile-menu .phabricator-side-menu {
background-color: rgba({$alphagrey},.3);
}
-body .phui-workboard-color .phabricator-side-menu .phui-profile-menu-footer-1 {
+body.phui-workboard-color .phabricator-side-menu .phui-profile-menu-footer-1 {
background-color: transparent;
}
diff --git a/webroot/rsrc/css/phui/workboards/phui-workboard.css b/webroot/rsrc/css/phui/workboards/phui-workboard.css
--- a/webroot/rsrc/css/phui/workboards/phui-workboard.css
+++ b/webroot/rsrc/css/phui/workboards/phui-workboard.css
@@ -14,11 +14,12 @@
overflow-x: auto;
overflow-y: hidden;
position: absolute;
- top: 32px;
+ top: 79px;
bottom: 0;
left: 0;
right: 0;
padding: 16px;
+ background-color: #fff;
}
.phui-workboard-view-shadow::-webkit-scrollbar {
@@ -74,13 +75,9 @@
display: none;
}
-.device-desktop .phui-workboard-fullscreen .main-page-background {
- top: 0;
-}
-
.device-desktop .phui-workboard-fullscreen .phui-profile-menu
.phui-workboard-view-shadow {
- top: 32px;
+ top: 35px;
left: 0;
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Apr 6, 7:37 AM (1 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7387499
Default Alt Text
D16645.id40073.diff (21 KB)
Attached To
Mode
D16645: Revert "Clean up more Quicksand"
Attached
Detach File
Event Timeline
Log In to Comment