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' => 'e5517713', + 'core.pkg.css' => '75121d30', 'core.pkg.js' => '9db3e620', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => 'bb338e4b', @@ -153,8 +153,7 @@ 'rsrc/css/phui/phui-workboard-view.css' => '720efdde', 'rsrc/css/phui/phui-workpanel-view.css' => '015a0cab', 'rsrc/css/sprite-login.css' => 'a3526809', - 'rsrc/css/sprite-main-header.css' => '28d01b0b', - 'rsrc/css/sprite-menu.css' => '02aa815a', + 'rsrc/css/sprite-menu.css' => 'ab8f6356', 'rsrc/css/sprite-projects.css' => 'b0d9e24f', 'rsrc/css/sprite-tokens.css' => '1706b943', 'rsrc/externals/font/fontawesome/fontawesome-webfont.eot' => '5fb6fb0e', @@ -305,9 +304,8 @@ 'rsrc/image/phrequent_inactive.png' => 'bfc15a69', 'rsrc/image/sprite-login-X2.png' => 'a15918f0', 'rsrc/image/sprite-login.png' => '8cee4f6e', - 'rsrc/image/sprite-main-header.png' => '39419fa6', - 'rsrc/image/sprite-menu-X2.png' => 'e8655658', - 'rsrc/image/sprite-menu.png' => 'e7e02f73', + 'rsrc/image/sprite-menu-X2.png' => 'dc41efa4', + 'rsrc/image/sprite-menu.png' => '8848c09a', 'rsrc/image/sprite-projects-X2.png' => '8c91c839', 'rsrc/image/sprite-projects.png' => 'ef9dc9b5', 'rsrc/image/sprite-tokens-X2.png' => 'b4776580', @@ -808,8 +806,7 @@ 'releeph-request-typeahead-css' => '667a48ae', 'setup-issue-css' => '631c4e92', 'sprite-login-css' => 'a3526809', - 'sprite-main-header-css' => '28d01b0b', - 'sprite-menu-css' => '02aa815a', + 'sprite-menu-css' => 'ab8f6356', 'sprite-projects-css' => 'b0d9e24f', 'sprite-tokens-css' => '1706b943', 'syntax-highlighting-css' => '6b7b24d9', @@ -2070,7 +2067,6 @@ 'phui-list-view-css', 'font-fontawesome', 'phui-font-icon-base-css', - 'sprite-main-header-css', 'phui-box-css', 'phui-object-box-css', 'phui-timeline-view-css', diff --git a/resources/celerity/packages.php b/resources/celerity/packages.php --- a/resources/celerity/packages.php +++ b/resources/celerity/packages.php @@ -125,7 +125,6 @@ 'font-fontawesome', 'phui-font-icon-base-css', - 'sprite-main-header-css', 'phui-box-css', 'phui-object-box-css', 'phui-timeline-view-css', diff --git a/resources/sprite/main_header/applebloom.png b/resources/sprite/main_header/applebloom.png deleted file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@ $generator->buildMenuSheet(), 'tokens' => $generator->buildTokenSheet(), - 'main-header' => $generator->buildMainHeaderSheet(), 'login' => $generator->buildLoginSheet(), 'projects' => $generator->buildProjectsSheet(), ); diff --git a/src/applications/celerity/CeleritySpriteGenerator.php b/src/applications/celerity/CeleritySpriteGenerator.php --- a/src/applications/celerity/CeleritySpriteGenerator.php +++ b/src/applications/celerity/CeleritySpriteGenerator.php @@ -5,18 +5,28 @@ public function buildMenuSheet() { $sprites = array(); - $sources = array( - 'logo' => array( + $colors = array( + 'dark', + 'red', + 'blue', + 'indigo', + 'blindigo', + 'rainbow', + ); + + $sources = array(); + foreach ($colors as $color) { + $sources[$color.'-logo'] = array( 'x' => 96, 'y' => 40, - 'css' => '.phabricator-main-menu-logo', - ), - 'eye' => array( + 'css' => '.'.$color.'-logo', + ); + $sources[$color.'-eye'] = array( 'x' => 40, 'y' => 40, - 'css' => '.phabricator-main-menu-eye', - ), - ); + 'css' => '.'.$color.'-eye', + ); + } $scales = array( '1x' => 1, @@ -144,32 +154,6 @@ return $sheet; } - public function buildMainHeaderSheet() { - $gradients = $this->getDirectoryList('main_header'); - $template = new PhutilSprite(); - - $sprites = array(); - foreach ($gradients as $gradient) { - $path = $this->getPath('main_header/'.$gradient.'.png'); - $sprite = id(clone $template) - ->setName('main-header-'.$gradient) - ->setSourceFile($path) - ->setTargetCSS('.main-header-'.$gradient); - $sprite->setSourceSize(6, 44); - $sprites[] = $sprite; - } - - $sheet = $this->buildSheet('main-header', - false, - PhutilSpriteSheet::TYPE_REPEAT_X); - - foreach ($sprites as $sprite) { - $sheet->addSprite($sprite); - } - - return $sheet; - } - private function getPath($to_path = null) { $root = dirname(phutil_get_library_root('phabricator')); return $root.'/resources/sprite/'.$to_path; diff --git a/src/applications/config/option/PhabricatorUIConfigOptions.php b/src/applications/config/option/PhabricatorUIConfigOptions.php --- a/src/applications/config/option/PhabricatorUIConfigOptions.php +++ b/src/applications/config/option/PhabricatorUIConfigOptions.php @@ -20,16 +20,18 @@ } public function getOptions() { - $manifest = PHUIIconView::getSheetManifest('main-header'); $custom_header_example = PhabricatorCustomHeaderConfigType::getExampleConfig(); $experimental_link = 'https://secure.phabricator.com/T4214'; - $options = array(); - foreach (array_keys($manifest) as $sprite_name) { - $key = substr($sprite_name, strlen('main-header-')); - $options[$key] = $key; - } + $options = array( + 'blindigo' => 'blindigo', + 'blue' => 'blue', + 'dark' => 'dark', + 'indigo' => 'indigo', + 'red' => 'red', + 'rainbow' => 'rainbow', + ); $example = << 'sprite-menu phabricator-main-menu-eye', + 'class' => 'sprite-menu phabricator-main-menu-eye '.$color.'-eye', ), ''), phutil_tag( 'span', array( - 'class' => 'sprite-menu phabricator-main-menu-logo', + 'class' => 'sprite-menu phabricator-main-menu-logo '.$color.'-logo', 'style' => $style_logo, ), ''), diff --git a/webroot/rsrc/css/sprite-main-header.css b/webroot/rsrc/css/sprite-main-header.css deleted file mode 100644 --- a/webroot/rsrc/css/sprite-main-header.css +++ /dev/null @@ -1,56 +0,0 @@ -/** - * @provides sprite-main-header-css - * @generated - */ - -.sprite-main-header { - background-image: url(/rsrc/image/sprite-main-header.png); - background-repeat: repeat-x; -} - - - - -.main-header-applebloom { - background-position: 0px 0px; -} - -.main-header-blindigo { - background-position: 0px -45px; -} - -.main-header-blue { - background-position: 0px -90px; -} - -.main-header-dark { - background-position: 0px -135px; -} - -.main-header-fluttershy { - background-position: 0px -180px; -} - -.main-header-green { - background-position: 0px -225px; -} - -.main-header-indigo { - background-position: 0px -270px; -} - -.main-header-nightmaremoon { - background-position: 0px -315px; -} - -.main-header-red { - background-position: 0px -360px; -} - -.main-header-scootaloo { - background-position: 0px -405px; -} - -.main-header-yellow { - background-position: 0px -450px; -} diff --git a/webroot/rsrc/css/sprite-menu.css b/webroot/rsrc/css/sprite-menu.css --- a/webroot/rsrc/css/sprite-menu.css +++ b/webroot/rsrc/css/sprite-menu.css @@ -13,15 +13,55 @@ only screen and (-webkit-min-device-pixel-ratio: 1.5) { .sprite-menu { background-image: url(/rsrc/image/sprite-menu-X2.png); - background-size: 97px 82px; + background-size: 194px 205px; } } -.phabricator-main-menu-logo { +.dark-logo { background-position: 0px 0px; } -.phabricator-main-menu-eye { +.dark-eye { + background-position: 0px -82px; +} + +.red-logo { + background-position: -97px 0px; +} + +.red-eye { + background-position: -41px -82px; +} + +.blue-logo { background-position: 0px -41px; } + +.blue-eye { + background-position: -82px -82px; +} + +.indigo-logo { + background-position: -97px -41px; +} + +.indigo-eye { + background-position: -123px -82px; +} + +.blindigo-logo { + background-position: 0px -123px; +} + +.blindigo-eye { + background-position: -97px -123px; +} + +.rainbow-logo { + background-position: 0px -164px; +} + +.rainbow-eye { + background-position: -97px -164px; +} diff --git a/webroot/rsrc/image/sprite-main-header.png b/webroot/rsrc/image/sprite-main-header.png deleted file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@