diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 9ef346cf55..8be89c2732 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -981,7 +981,7 @@ celerity_register_resource_map(array( ), 'conpherence-menu-css' => array( - 'uri' => '/res/d250b49c/rsrc/css/application/conpherence/menu.css', + 'uri' => '/res/cae40b18/rsrc/css/application/conpherence/menu.css', 'type' => 'css', 'requires' => array( @@ -3063,7 +3063,7 @@ celerity_register_resource_map(array( ), 'phabricator-core-css' => array( - 'uri' => '/res/7736096e/rsrc/css/core/core.css', + 'uri' => '/res/bb4b77f3/rsrc/css/core/core.css', 'type' => 'css', 'requires' => array( @@ -3470,7 +3470,7 @@ celerity_register_resource_map(array( ), 'phabricator-standard-page-view' => array( - 'uri' => '/res/0151b341/rsrc/css/application/base/standard-page-view.css', + 'uri' => '/res/dabd95bf/rsrc/css/application/base/standard-page-view.css', 'type' => 'css', 'requires' => array( @@ -4172,7 +4172,7 @@ celerity_register_resource_map(array( ), array( 'packages' => array( - '9737ebe0' => + '4a060444' => array( 'name' => 'core.pkg.css', 'symbols' => @@ -4220,7 +4220,7 @@ celerity_register_resource_map(array( 40 => 'phabricator-property-list-view-css', 41 => 'phabricator-tag-view-css', ), - 'uri' => '/res/pkg/9737ebe0/core.pkg.css', + 'uri' => '/res/pkg/4a060444/core.pkg.css', 'type' => 'css', ), '4f81c788' => @@ -4411,16 +4411,16 @@ celerity_register_resource_map(array( ), 'reverse' => array( - 'aphront-dialog-view-css' => '9737ebe0', - 'aphront-error-view-css' => '9737ebe0', - 'aphront-form-view-css' => '9737ebe0', - 'aphront-list-filter-view-css' => '9737ebe0', - 'aphront-pager-view-css' => '9737ebe0', - 'aphront-panel-view-css' => '9737ebe0', - 'aphront-table-view-css' => '9737ebe0', - 'aphront-tokenizer-control-css' => '9737ebe0', - 'aphront-tooltip-css' => '9737ebe0', - 'aphront-typeahead-control-css' => '9737ebe0', + 'aphront-dialog-view-css' => '4a060444', + 'aphront-error-view-css' => '4a060444', + 'aphront-form-view-css' => '4a060444', + 'aphront-list-filter-view-css' => '4a060444', + 'aphront-pager-view-css' => '4a060444', + 'aphront-panel-view-css' => '4a060444', + 'aphront-table-view-css' => '4a060444', + 'aphront-tokenizer-control-css' => '4a060444', + 'aphront-tooltip-css' => '4a060444', + 'aphront-typeahead-control-css' => '4a060444', 'differential-changeset-view-css' => '09216861', 'differential-core-view-css' => '09216861', 'differential-inline-comment-editor' => 'd07a3bc2', @@ -4434,7 +4434,7 @@ celerity_register_resource_map(array( 'differential-table-of-contents-css' => '09216861', 'diffusion-commit-view-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88', - 'global-drag-and-drop-css' => '9737ebe0', + 'global-drag-and-drop-css' => '4a060444', 'inline-comment-summary-css' => '09216861', 'javelin-aphlict' => '4f81c788', 'javelin-behavior' => '2dbbb7d1', @@ -4507,55 +4507,55 @@ celerity_register_resource_map(array( 'javelin-util' => '2dbbb7d1', 'javelin-vector' => '2dbbb7d1', 'javelin-workflow' => '2dbbb7d1', - 'lightbox-attachment-css' => '9737ebe0', + 'lightbox-attachment-css' => '4a060444', 'maniphest-task-summary-css' => '06bacb9a', 'maniphest-transaction-detail-css' => '06bacb9a', - 'phabricator-action-list-view-css' => '9737ebe0', - 'phabricator-application-launch-view-css' => '9737ebe0', + 'phabricator-action-list-view-css' => '4a060444', + 'phabricator-application-launch-view-css' => '4a060444', 'phabricator-busy' => '4f81c788', 'phabricator-content-source-view-css' => '09216861', - 'phabricator-core-css' => '9737ebe0', - 'phabricator-crumbs-view-css' => '9737ebe0', + 'phabricator-core-css' => '4a060444', + 'phabricator-crumbs-view-css' => '4a060444', 'phabricator-drag-and-drop-file-upload' => 'd07a3bc2', 'phabricator-dropdown-menu' => '4f81c788', 'phabricator-file-upload' => '4f81c788', - 'phabricator-filetree-view-css' => '9737ebe0', - 'phabricator-flag-css' => '9737ebe0', - 'phabricator-form-view-css' => '9737ebe0', - 'phabricator-header-view-css' => '9737ebe0', + 'phabricator-filetree-view-css' => '4a060444', + 'phabricator-flag-css' => '4a060444', + 'phabricator-form-view-css' => '4a060444', + 'phabricator-header-view-css' => '4a060444', 'phabricator-hovercard' => '4f81c788', - 'phabricator-jump-nav' => '9737ebe0', + 'phabricator-jump-nav' => '4a060444', 'phabricator-keyboard-shortcut' => '4f81c788', 'phabricator-keyboard-shortcut-manager' => '4f81c788', - 'phabricator-main-menu-view' => '9737ebe0', + 'phabricator-main-menu-view' => '4a060444', 'phabricator-menu-item' => '4f81c788', - 'phabricator-nav-view-css' => '9737ebe0', + 'phabricator-nav-view-css' => '4a060444', 'phabricator-notification' => '4f81c788', - 'phabricator-notification-css' => '9737ebe0', - 'phabricator-notification-menu-css' => '9737ebe0', - 'phabricator-object-item-list-view-css' => '9737ebe0', + 'phabricator-notification-css' => '4a060444', + 'phabricator-notification-menu-css' => '4a060444', + 'phabricator-object-item-list-view-css' => '4a060444', 'phabricator-object-selector-css' => '09216861', 'phabricator-phtize' => '4f81c788', 'phabricator-prefab' => '4f81c788', 'phabricator-project-tag-css' => '06bacb9a', - 'phabricator-property-list-view-css' => '9737ebe0', - 'phabricator-remarkup-css' => '9737ebe0', + 'phabricator-property-list-view-css' => '4a060444', + 'phabricator-remarkup-css' => '4a060444', 'phabricator-shaped-request' => 'd07a3bc2', - 'phabricator-side-menu-view-css' => '9737ebe0', - 'phabricator-standard-page-view' => '9737ebe0', - 'phabricator-tag-view-css' => '9737ebe0', + 'phabricator-side-menu-view-css' => '4a060444', + 'phabricator-standard-page-view' => '4a060444', + 'phabricator-tag-view-css' => '4a060444', 'phabricator-textareautils' => '4f81c788', 'phabricator-tooltip' => '4f81c788', - 'phabricator-transaction-view-css' => '9737ebe0', - 'phabricator-zindex-css' => '9737ebe0', - 'phui-button-css' => '9737ebe0', - 'phui-form-css' => '9737ebe0', - 'phui-icon-view-css' => '9737ebe0', - 'phui-spacing-css' => '9737ebe0', - 'sprite-apps-large-css' => '9737ebe0', - 'sprite-gradient-css' => '9737ebe0', - 'sprite-icons-css' => '9737ebe0', - 'sprite-menu-css' => '9737ebe0', - 'syntax-highlighting-css' => '9737ebe0', + 'phabricator-transaction-view-css' => '4a060444', + 'phabricator-zindex-css' => '4a060444', + 'phui-button-css' => '4a060444', + 'phui-form-css' => '4a060444', + 'phui-icon-view-css' => '4a060444', + 'phui-spacing-css' => '4a060444', + 'sprite-apps-large-css' => '4a060444', + 'sprite-gradient-css' => '4a060444', + 'sprite-icons-css' => '4a060444', + 'sprite-menu-css' => '4a060444', + 'syntax-highlighting-css' => '4a060444', ), )); diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php index 22df5631dc..45cc78bb32 100644 --- a/src/applications/base/controller/PhabricatorController.php +++ b/src/applications/base/controller/PhabricatorController.php @@ -188,7 +188,6 @@ abstract class PhabricatorController extends AphrontController { } $page->setShowChrome(idx($options, 'chrome', true)); - $page->setDust(idx($options, 'dust', false)); $application_menu = $this->buildApplicationMenu(); if ($application_menu) { @@ -226,7 +225,6 @@ abstract class PhabricatorController extends AphrontController { $view->appendChild(hsprintf( '
%s
', $response->buildResponseString())); - $view->setDust(true); $response = new AphrontWebpageResponse(); $response->setContent($view->render()); return $response; diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php index 9771a9f23f..4cac85a909 100644 --- a/src/view/page/PhabricatorStandardPageView.php +++ b/src/view/page/PhabricatorStandardPageView.php @@ -12,7 +12,6 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView { private $glyph; private $menuContent; private $showChrome = true; - private $layDownSomeDust = false; private $disableConsole; private $searchDefaultScope; private $pageObjects = array(); @@ -55,19 +54,10 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView { return $this; } - public function setDust($is_dusty) { - $this->layDownSomeDust = $is_dusty; - return $this; - } - public function getShowChrome() { return $this->showChrome; } - public function getDust() { - return $this->layDownSomeDust; - } - public function setSearchDefaultScope($search_default_scope) { $this->searchDefaultScope = $search_default_scope; return $this; @@ -407,10 +397,6 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView { $classes[] = 'phabricator-chromeless-page'; } - if ($this->getDust()) { - $classes[] = 'make-me-sneeze'; - } - $agent = AphrontRequest::getHTTPHeader('User-Agent'); // Try to guess the device resolution based on UA strings to avoid a flash diff --git a/webroot/rsrc/css/application/base/standard-page-view.css b/webroot/rsrc/css/application/base/standard-page-view.css index 473a6ca566..e5cbd79344 100644 --- a/webroot/rsrc/css/application/base/standard-page-view.css +++ b/webroot/rsrc/css/application/base/standard-page-view.css @@ -2,10 +2,6 @@ * @provides phabricator-standard-page-view */ -.phabricator-standard-page { - background: #ffffff; -} - .phabricator-anchor-view, .phabricator-anchor-navigation-marker { position: absolute; diff --git a/webroot/rsrc/css/application/conpherence/menu.css b/webroot/rsrc/css/application/conpherence/menu.css index 74b46d668f..08a5700332 100644 --- a/webroot/rsrc/css/application/conpherence/menu.css +++ b/webroot/rsrc/css/application/conpherence/menu.css @@ -8,6 +8,7 @@ left: 0; right: 0; top: 44px; + background: #fff; } .conpherence-layout .conpherence-no-threads { diff --git a/webroot/rsrc/css/core/core.css b/webroot/rsrc/css/core/core.css index d72781cb80..50bec2ef17 100644 --- a/webroot/rsrc/css/core/core.css +++ b/webroot/rsrc/css/core/core.css @@ -29,14 +29,6 @@ p, blockquote, th, td, button { border: 0; } -body.make-me-sneeze { - background: #e9eaed url('/rsrc/image/texture/dust_background.jpeg'); -} - -.make-me-sneeze .phabricator-standard-page { - background: transparent; -} - table { border-collapse: collapse; border-spacing: 0; @@ -73,10 +65,7 @@ body { direction: ltr; text-align: left; unicode-bidi: embed; -} - -body.phabricator-chromeless-page { - background: #ffffff; + background: #EBECEE; } textarea {