diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 2e0f3fa169..da6eeb04a6 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => 'bd0be091', + 'core.pkg.css' => '92042a08', 'core.pkg.js' => 'f3e08b38', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => 'bb338e4b', @@ -43,8 +43,8 @@ return array( 'rsrc/css/application/config/config-options.css' => '7fedf08b', 'rsrc/css/application/config/config-template.css' => '8e6c6fcd', 'rsrc/css/application/config/config-welcome.css' => '6abd79be', - 'rsrc/css/application/config/setup-issue.css' => '22270af2', - 'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2', + 'rsrc/css/application/config/setup-issue.css' => 'a4aeaa42', + 'rsrc/css/application/config/unhandled-exception.css' => '4c96257a', 'rsrc/css/application/conpherence/durable-column.css' => 'd1e796f0', 'rsrc/css/application/conpherence/menu.css' => 'f9f1d143', 'rsrc/css/application/conpherence/message-pane.css' => '7cbf4cbb', @@ -133,7 +133,7 @@ return array( 'rsrc/css/phui/phui-fontkit.css' => '489a1341', 'rsrc/css/phui/phui-form-view.css' => 'e1abbe8e', 'rsrc/css/phui/phui-form.css' => 'f535f938', - 'rsrc/css/phui/phui-header-view.css' => '2ad5de97', + 'rsrc/css/phui/phui-header-view.css' => '3c91963d', 'rsrc/css/phui/phui-icon.css' => '88ba9081', 'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8', 'rsrc/css/phui/phui-info-panel.css' => '27ea50a1', @@ -141,7 +141,7 @@ return array( 'rsrc/css/phui/phui-list.css' => 'e448b6ba', 'rsrc/css/phui/phui-object-box.css' => '8c1cf7c0', 'rsrc/css/phui/phui-object-item-list-view.css' => '4be0645f', - 'rsrc/css/phui/phui-pinboard-view.css' => 'eaab2b1b', + 'rsrc/css/phui/phui-pinboard-view.css' => '22891c15', 'rsrc/css/phui/phui-property-list-view.css' => 'd2d143ea', 'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b', 'rsrc/css/phui/phui-spacing.css' => '042804d6', @@ -151,7 +151,6 @@ return array( 'rsrc/css/phui/phui-timeline-view.css' => 'a85542c8', 'rsrc/css/phui/phui-workboard-view.css' => '38446bc3', 'rsrc/css/phui/phui-workpanel-view.css' => 'e6435408', - 'rsrc/css/sprite-gradient.css' => '4bdb98a7', 'rsrc/css/sprite-login.css' => 'a3526809', 'rsrc/css/sprite-main-header.css' => '28d01b0b', 'rsrc/css/sprite-menu.css' => '02aa815a', @@ -303,7 +302,6 @@ return array( 'rsrc/image/people/washington.png' => '40dd301c', 'rsrc/image/phrequent_active.png' => 'a466a8ed', 'rsrc/image/phrequent_inactive.png' => 'bfc15a69', - 'rsrc/image/sprite-gradient.png' => 'ec15a417', 'rsrc/image/sprite-login-X2.png' => 'a15918f0', 'rsrc/image/sprite-login.png' => '8cee4f6e', 'rsrc/image/sprite-main-header.png' => '39419fa6', @@ -767,7 +765,7 @@ return array( 'phui-fontkit-css' => '489a1341', 'phui-form-css' => 'f535f938', 'phui-form-view-css' => 'e1abbe8e', - 'phui-header-view-css' => '2ad5de97', + 'phui-header-view-css' => '3c91963d', 'phui-icon-view-css' => '88ba9081', 'phui-image-mask-css' => '5a8b09c8', 'phui-info-panel-css' => '27ea50a1', @@ -776,7 +774,7 @@ return array( 'phui-list-view-css' => 'e448b6ba', 'phui-object-box-css' => '8c1cf7c0', 'phui-object-item-list-view-css' => '4be0645f', - 'phui-pinboard-view-css' => 'eaab2b1b', + 'phui-pinboard-view-css' => '22891c15', 'phui-property-list-view-css' => 'd2d143ea', 'phui-remarkup-preview-css' => '19ad512b', 'phui-spacing-css' => '042804d6', @@ -804,8 +802,7 @@ return array( 'releeph-preview-branch' => 'b7a6f4a5', 'releeph-request-differential-create-dialog' => '8d8b92cd', 'releeph-request-typeahead-css' => '667a48ae', - 'setup-issue-css' => '22270af2', - 'sprite-gradient-css' => '4bdb98a7', + 'setup-issue-css' => 'a4aeaa42', 'sprite-login-css' => 'a3526809', 'sprite-main-header-css' => '28d01b0b', 'sprite-menu-css' => '02aa815a', @@ -814,7 +811,7 @@ return array( 'syntax-highlighting-css' => '6b7b24d9', 'tokens-css' => '3d0f239e', 'typeahead-browse-css' => 'd8581d2c', - 'unhandled-exception-css' => '37d4f9a2', + 'unhandled-exception-css' => '4c96257a', ), 'requires' => array( '029a133d' => array( @@ -2039,7 +2036,6 @@ return array( 'aphront-tooltip-css', 'phabricator-flag-css', 'phui-info-view-css', - 'sprite-gradient-css', 'sprite-menu-css', 'phabricator-main-menu-view', 'phabricator-notification-css', diff --git a/resources/celerity/packages.php b/resources/celerity/packages.php index 88f16a5034..33256e9639 100644 --- a/resources/celerity/packages.php +++ b/resources/celerity/packages.php @@ -100,8 +100,6 @@ return array( 'aphront-tooltip-css', 'phabricator-flag-css', 'phui-info-view-css', - - 'sprite-gradient-css', 'sprite-menu-css', 'phabricator-main-menu-view', diff --git a/resources/sprite/gradients/dark-grey-header.png b/resources/sprite/gradients/dark-grey-header.png deleted file mode 100644 index 4a169a5054..0000000000 Binary files a/resources/sprite/gradients/dark-grey-header.png and /dev/null differ diff --git a/resources/sprite/gradients/grey-header.png b/resources/sprite/gradients/grey-header.png deleted file mode 100644 index e94e2dc468..0000000000 Binary files a/resources/sprite/gradients/grey-header.png and /dev/null differ diff --git a/resources/sprite/gradients/lightblue-header.png b/resources/sprite/gradients/lightblue-header.png deleted file mode 100644 index b2177d7d7e..0000000000 Binary files a/resources/sprite/gradients/lightblue-header.png and /dev/null differ diff --git a/resources/sprite/gradients/lightgreen-header.png b/resources/sprite/gradients/lightgreen-header.png deleted file mode 100644 index 556184a82f..0000000000 Binary files a/resources/sprite/gradients/lightgreen-header.png and /dev/null differ diff --git a/resources/sprite/gradients/lightred-header.png b/resources/sprite/gradients/lightred-header.png deleted file mode 100644 index c41f9d2039..0000000000 Binary files a/resources/sprite/gradients/lightred-header.png and /dev/null differ diff --git a/resources/sprite/gradients/lightviolet-header.png b/resources/sprite/gradients/lightviolet-header.png deleted file mode 100644 index 2f44edb6e5..0000000000 Binary files a/resources/sprite/gradients/lightviolet-header.png and /dev/null differ diff --git a/resources/sprite/manifest/gradient.json b/resources/sprite/manifest/gradient.json deleted file mode 100644 index c7ae541df8..0000000000 --- a/resources/sprite/manifest/gradient.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "version" : 1, - "sprites" : { - "gradient-dark-grey-header" : { - "name" : "gradient-dark-grey-header", - "rule" : ".gradient-dark-grey-header", - "hash" : "e8762dd2849410a7e4fba8f972f946ff" - }, - "gradient-grey-header" : { - "name" : "gradient-grey-header", - "rule" : ".gradient-grey-header", - "hash" : "1c8f8d61984e3fc5a7e528b9bd4d484a" - }, - "gradient-lightblue-header" : { - "name" : "gradient-lightblue-header", - "rule" : ".gradient-lightblue-header", - "hash" : "e7753a6ce63c6822a559266eef9e255b" - }, - "gradient-lightgreen-header" : { - "name" : "gradient-lightgreen-header", - "rule" : ".gradient-lightgreen-header", - "hash" : "87b5c391ea4ea84dd8531fb0f199cbeb" - }, - "gradient-lightred-header" : { - "name" : "gradient-lightred-header", - "rule" : ".gradient-lightred-header", - "hash" : "a367ea9163aa15f52c105b5805cf493e" - }, - "gradient-lightviolet-header" : { - "name" : "gradient-lightviolet-header", - "rule" : ".gradient-lightviolet-header", - "hash" : "e17e05135e53e1258340cfc27f96f23f" - } - }, - "scales" : [ - 1 - ], - "header" : "\/**\n * @provides sprite-gradient-css\n * @generated\n *\/\n\n.sprite-gradient {\n background-image: url(\/rsrc\/image\/sprite-gradient.png);\n background-repeat: repeat-x;\n}\n\n\n", - "type" : "repeat-x" -} diff --git a/scripts/celerity/generate_sprites.php b/scripts/celerity/generate_sprites.php index 31ad4684c2..946ee6f3ce 100755 --- a/scripts/celerity/generate_sprites.php +++ b/scripts/celerity/generate_sprites.php @@ -29,7 +29,6 @@ $generator = new CeleritySpriteGenerator(); $sheets = array( 'menu' => $generator->buildMenuSheet(), 'tokens' => $generator->buildTokenSheet(), - 'gradient' => $generator->buildGradientSheet(), 'main-header' => $generator->buildMainHeaderSheet(), 'login' => $generator->buildLoginSheet(), 'projects' => $generator->buildProjectsSheet(), diff --git a/src/applications/celerity/CeleritySpriteGenerator.php b/src/applications/celerity/CeleritySpriteGenerator.php index a42fbfa4db..ac09e7e2ca 100644 --- a/src/applications/celerity/CeleritySpriteGenerator.php +++ b/src/applications/celerity/CeleritySpriteGenerator.php @@ -144,45 +144,6 @@ final class CeleritySpriteGenerator { return $sheet; } - public function buildGradientSheet() { - $gradients = $this->getDirectoryList('gradients'); - - $template = new PhutilSprite(); - - $unusual_heights = array( - 'breadcrumbs' => 31, - 'grey-header' => 70, - 'dark-grey-header' => 70, - 'lightblue-header' => 240, - 'lightgreen-header' => 240, - 'lightviolet-header' => 240, - 'lightred-header' => 240, - ); - - $sprites = array(); - foreach ($gradients as $gradient) { - $path = $this->getPath('gradients/'.$gradient.'.png'); - $sprite = id(clone $template) - ->setName('gradient-'.$gradient) - ->setSourceFile($path) - ->setTargetCSS('.gradient-'.$gradient); - - $sprite->setSourceSize(4, idx($unusual_heights, $gradient, 26)); - - $sprites[] = $sprite; - } - - $sheet = $this->buildSheet( - 'gradient', - false, - PhutilSpriteSheet::TYPE_REPEAT_X); - foreach ($sprites as $sprite) { - $sheet->addSprite($sprite); - } - - return $sheet; - } - public function buildMainHeaderSheet() { $gradients = $this->getDirectoryList('main_header'); $template = new PhutilSprite(); diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php index 95666874ef..79f34124ed 100644 --- a/src/applications/phriction/controller/PhrictionDocumentController.php +++ b/src/applications/phriction/controller/PhrictionDocumentController.php @@ -391,13 +391,13 @@ final class PhrictionDocumentController $list = array(); foreach ($children_dicts as $child) { - $list[] = hsprintf('