@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.

[Redesign] Add back limited header-color options

Summary: Ref T8099. Adds back basic header color options, which change the logo color instead. Also RAINBOW.

Test Plan:
tested each of the new colors.

{F442284}

Reviewers: btrahan, epriestley

Reviewed By: epriestley

Subscribers: Korvin, epriestley

Maniphest Tasks: T8099

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

+136 -185
+5 -9
resources/celerity/map.php
··· 7 7 */ 8 8 return array( 9 9 'names' => array( 10 - 'core.pkg.css' => 'e5517713', 10 + 'core.pkg.css' => '75121d30', 11 11 'core.pkg.js' => '9db3e620', 12 12 'darkconsole.pkg.js' => 'e7393ebb', 13 13 'differential.pkg.css' => 'bb338e4b', ··· 153 153 'rsrc/css/phui/phui-workboard-view.css' => '720efdde', 154 154 'rsrc/css/phui/phui-workpanel-view.css' => '015a0cab', 155 155 'rsrc/css/sprite-login.css' => 'a3526809', 156 - 'rsrc/css/sprite-main-header.css' => '28d01b0b', 157 - 'rsrc/css/sprite-menu.css' => '02aa815a', 156 + 'rsrc/css/sprite-menu.css' => 'ab8f6356', 158 157 'rsrc/css/sprite-projects.css' => 'b0d9e24f', 159 158 'rsrc/css/sprite-tokens.css' => '1706b943', 160 159 'rsrc/externals/font/fontawesome/fontawesome-webfont.eot' => '5fb6fb0e', ··· 305 304 'rsrc/image/phrequent_inactive.png' => 'bfc15a69', 306 305 'rsrc/image/sprite-login-X2.png' => 'a15918f0', 307 306 'rsrc/image/sprite-login.png' => '8cee4f6e', 308 - 'rsrc/image/sprite-main-header.png' => '39419fa6', 309 - 'rsrc/image/sprite-menu-X2.png' => 'e8655658', 310 - 'rsrc/image/sprite-menu.png' => 'e7e02f73', 307 + 'rsrc/image/sprite-menu-X2.png' => 'dc41efa4', 308 + 'rsrc/image/sprite-menu.png' => '8848c09a', 311 309 'rsrc/image/sprite-projects-X2.png' => '8c91c839', 312 310 'rsrc/image/sprite-projects.png' => 'ef9dc9b5', 313 311 'rsrc/image/sprite-tokens-X2.png' => 'b4776580', ··· 808 806 'releeph-request-typeahead-css' => '667a48ae', 809 807 'setup-issue-css' => '631c4e92', 810 808 'sprite-login-css' => 'a3526809', 811 - 'sprite-main-header-css' => '28d01b0b', 812 - 'sprite-menu-css' => '02aa815a', 809 + 'sprite-menu-css' => 'ab8f6356', 813 810 'sprite-projects-css' => 'b0d9e24f', 814 811 'sprite-tokens-css' => '1706b943', 815 812 'syntax-highlighting-css' => '6b7b24d9', ··· 2070 2067 'phui-list-view-css', 2071 2068 'font-fontawesome', 2072 2069 'phui-font-icon-base-css', 2073 - 'sprite-main-header-css', 2074 2070 'phui-box-css', 2075 2071 'phui-object-box-css', 2076 2072 'phui-timeline-view-css',
-1
resources/celerity/packages.php
··· 125 125 126 126 'font-fontawesome', 127 127 'phui-font-icon-base-css', 128 - 'sprite-main-header-css', 129 128 'phui-box-css', 130 129 'phui-object-box-css', 131 130 'phui-timeline-view-css',
resources/sprite/main_header/applebloom.png

This is a binary file and will not be displayed.

resources/sprite/main_header/blindigo.png

This is a binary file and will not be displayed.

resources/sprite/main_header/blue.png

This is a binary file and will not be displayed.

resources/sprite/main_header/dark.png

This is a binary file and will not be displayed.

resources/sprite/main_header/fluttershy.png

This is a binary file and will not be displayed.

resources/sprite/main_header/green.png

This is a binary file and will not be displayed.

resources/sprite/main_header/indigo.png

This is a binary file and will not be displayed.

resources/sprite/main_header/nightmaremoon.png

This is a binary file and will not be displayed.

resources/sprite/main_header/red.png

This is a binary file and will not be displayed.

resources/sprite/main_header/scootaloo.png

This is a binary file and will not be displayed.

resources/sprite/main_header/yellow.png

This is a binary file and will not be displayed.

-65
resources/sprite/manifest/main-header.json
··· 1 - { 2 - "version": 1, 3 - "sprites": { 4 - "main-header-applebloom": { 5 - "name": "main-header-applebloom", 6 - "rule": ".main-header-applebloom", 7 - "hash": "64822776b129e724709983db1ac5a712" 8 - }, 9 - "main-header-blindigo": { 10 - "name": "main-header-blindigo", 11 - "rule": ".main-header-blindigo", 12 - "hash": "8c4f5b1f1f3faceb6ca6e8278a1b082f" 13 - }, 14 - "main-header-blue": { 15 - "name": "main-header-blue", 16 - "rule": ".main-header-blue", 17 - "hash": "b5dd317b7bd35e0592b3f4b66267437c" 18 - }, 19 - "main-header-dark": { 20 - "name": "main-header-dark", 21 - "rule": ".main-header-dark", 22 - "hash": "817815d84c0c935b4875f6ecc7dbb526" 23 - }, 24 - "main-header-fluttershy": { 25 - "name": "main-header-fluttershy", 26 - "rule": ".main-header-fluttershy", 27 - "hash": "55d4e9f813cf354693290105cf83cf78" 28 - }, 29 - "main-header-green": { 30 - "name": "main-header-green", 31 - "rule": ".main-header-green", 32 - "hash": "c230f09e307d167fab3ea0d8c3b33755" 33 - }, 34 - "main-header-indigo": { 35 - "name": "main-header-indigo", 36 - "rule": ".main-header-indigo", 37 - "hash": "a27394ff1eff4d24398ec57e54d7f5fd" 38 - }, 39 - "main-header-nightmaremoon": { 40 - "name": "main-header-nightmaremoon", 41 - "rule": ".main-header-nightmaremoon", 42 - "hash": "9e7cc7b18d2132d2dd47586ba0cd6400" 43 - }, 44 - "main-header-red": { 45 - "name": "main-header-red", 46 - "rule": ".main-header-red", 47 - "hash": "3f12cc098afddb8e6c830ef761dcaa61" 48 - }, 49 - "main-header-scootaloo": { 50 - "name": "main-header-scootaloo", 51 - "rule": ".main-header-scootaloo", 52 - "hash": "8cedc359dccab1bbd49cbc69940f566a" 53 - }, 54 - "main-header-yellow": { 55 - "name": "main-header-yellow", 56 - "rule": ".main-header-yellow", 57 - "hash": "d920e70a6d2662cfb83e1d7e4b4000fd" 58 - } 59 - }, 60 - "scales": [ 61 - 1 62 - ], 63 - "header": "\/**\n * @provides sprite-main-header-css\n * @generated\n *\/\n\n.sprite-main-header {\n background-image: url(\/rsrc\/image\/sprite-main-header.png);\n background-repeat: repeat-x;\n}\n\n\n", 64 - "type": "repeat-x" 65 - }
+58 -8
resources/sprite/manifest/menu.json
··· 1 1 { 2 2 "version": 1, 3 3 "sprites": { 4 - "eye": { 5 - "name": "eye", 6 - "rule": ".phabricator-main-menu-eye", 7 - "hash": "8848ce0f1d60278ba13a306805107d62" 4 + "blindigo-eye": { 5 + "name": "blindigo-eye", 6 + "rule": ".blindigo-eye", 7 + "hash": "fcd3eb2a8d2d8babf59a952b62783282" 8 + }, 9 + "blindigo-logo": { 10 + "name": "blindigo-logo", 11 + "rule": ".blindigo-logo", 12 + "hash": "a22978e621df5126471576510303222f" 13 + }, 14 + "blue-eye": { 15 + "name": "blue-eye", 16 + "rule": ".blue-eye", 17 + "hash": "f7505e56e452c5922f1a275a736d5326" 18 + }, 19 + "blue-logo": { 20 + "name": "blue-logo", 21 + "rule": ".blue-logo", 22 + "hash": "4c6240f153245d56a6bf02bb6796404f" 8 23 }, 9 - "logo": { 10 - "name": "logo", 11 - "rule": ".phabricator-main-menu-logo", 12 - "hash": "346032db9e1dbaafc9574664b9581b03" 24 + "dark-eye": { 25 + "name": "dark-eye", 26 + "rule": ".dark-eye", 27 + "hash": "c8112e52666fa1cb509ebb2cdf3a3df5" 28 + }, 29 + "dark-logo": { 30 + "name": "dark-logo", 31 + "rule": ".dark-logo", 32 + "hash": "e3425da87e8f6737d8db0063d064cd7d" 33 + }, 34 + "indigo-eye": { 35 + "name": "indigo-eye", 36 + "rule": ".indigo-eye", 37 + "hash": "497b57bc1709a88fa68b14dc88a2a253" 38 + }, 39 + "indigo-logo": { 40 + "name": "indigo-logo", 41 + "rule": ".indigo-logo", 42 + "hash": "c7223567a77c46fbab571170f0a76ae6" 43 + }, 44 + "rainbow-eye": { 45 + "name": "rainbow-eye", 46 + "rule": ".rainbow-eye", 47 + "hash": "2c63171eeb8ba6acb645219fdf2585b1" 48 + }, 49 + "rainbow-logo": { 50 + "name": "rainbow-logo", 51 + "rule": ".rainbow-logo", 52 + "hash": "eca0c685cb9524bff513a5f7eab7c6e5" 53 + }, 54 + "red-eye": { 55 + "name": "red-eye", 56 + "rule": ".red-eye", 57 + "hash": "97a9a11ecbeee1fbb8a7c8ea406e4be4" 58 + }, 59 + "red-logo": { 60 + "name": "red-logo", 61 + "rule": ".red-logo", 62 + "hash": "1126a79154d24242d3f72e868b95a445" 13 63 } 14 64 }, 15 65 "scales": [
resources/sprite/menu_1x/blindigo-eye.png

This is a binary file and will not be displayed.

resources/sprite/menu_1x/blindigo-logo.png

This is a binary file and will not be displayed.

resources/sprite/menu_1x/blue-eye.png

This is a binary file and will not be displayed.

resources/sprite/menu_1x/blue-logo.png

This is a binary file and will not be displayed.

resources/sprite/menu_1x/eye.png resources/sprite/menu_1x/dark-eye.png
resources/sprite/menu_1x/indigo-eye.png

This is a binary file and will not be displayed.

resources/sprite/menu_1x/indigo-logo.png

This is a binary file and will not be displayed.

resources/sprite/menu_1x/logo.png resources/sprite/menu_1x/dark-logo.png
resources/sprite/menu_1x/rainbow-eye.png

This is a binary file and will not be displayed.

resources/sprite/menu_1x/rainbow-logo.png

This is a binary file and will not be displayed.

resources/sprite/menu_1x/red-eye.png

This is a binary file and will not be displayed.

resources/sprite/menu_1x/red-logo.png

This is a binary file and will not be displayed.

resources/sprite/menu_2x/blindigo-eye.png

This is a binary file and will not be displayed.

resources/sprite/menu_2x/blindigo-logo.png

This is a binary file and will not be displayed.

resources/sprite/menu_2x/blue-eye.png

This is a binary file and will not be displayed.

resources/sprite/menu_2x/blue-logo.png

This is a binary file and will not be displayed.

resources/sprite/menu_2x/eye.png resources/sprite/menu_2x/dark-eye.png
resources/sprite/menu_2x/indigo-eye.png

This is a binary file and will not be displayed.

resources/sprite/menu_2x/indigo-logo.png

This is a binary file and will not be displayed.

resources/sprite/menu_2x/logo.png resources/sprite/menu_2x/dark-logo.png
resources/sprite/menu_2x/rainbow-eye.png

This is a binary file and will not be displayed.

resources/sprite/menu_2x/rainbow-logo.png

This is a binary file and will not be displayed.

resources/sprite/menu_2x/red-eye.png

This is a binary file and will not be displayed.

resources/sprite/menu_2x/red-logo.png

This is a binary file and will not be displayed.

-1
scripts/celerity/generate_sprites.php
··· 29 29 $sheets = array( 30 30 'menu' => $generator->buildMenuSheet(), 31 31 'tokens' => $generator->buildTokenSheet(), 32 - 'main-header' => $generator->buildMainHeaderSheet(), 33 32 'login' => $generator->buildLoginSheet(), 34 33 'projects' => $generator->buildProjectsSheet(), 35 34 );
+18 -34
src/applications/celerity/CeleritySpriteGenerator.php
··· 5 5 public function buildMenuSheet() { 6 6 $sprites = array(); 7 7 8 - $sources = array( 9 - 'logo' => array( 8 + $colors = array( 9 + 'dark', 10 + 'red', 11 + 'blue', 12 + 'indigo', 13 + 'blindigo', 14 + 'rainbow', 15 + ); 16 + 17 + $sources = array(); 18 + foreach ($colors as $color) { 19 + $sources[$color.'-logo'] = array( 10 20 'x' => 96, 11 21 'y' => 40, 12 - 'css' => '.phabricator-main-menu-logo', 13 - ), 14 - 'eye' => array( 22 + 'css' => '.'.$color.'-logo', 23 + ); 24 + $sources[$color.'-eye'] = array( 15 25 'x' => 40, 16 26 'y' => 40, 17 - 'css' => '.phabricator-main-menu-eye', 18 - ), 19 - ); 27 + 'css' => '.'.$color.'-eye', 28 + ); 29 + } 20 30 21 31 $scales = array( 22 32 '1x' => 1, ··· 137 147 138 148 $sheet = $this->buildSheet('login', true); 139 149 $sheet->setScales($scales); 140 - foreach ($sprites as $sprite) { 141 - $sheet->addSprite($sprite); 142 - } 143 - 144 - return $sheet; 145 - } 146 - 147 - public function buildMainHeaderSheet() { 148 - $gradients = $this->getDirectoryList('main_header'); 149 - $template = new PhutilSprite(); 150 - 151 - $sprites = array(); 152 - foreach ($gradients as $gradient) { 153 - $path = $this->getPath('main_header/'.$gradient.'.png'); 154 - $sprite = id(clone $template) 155 - ->setName('main-header-'.$gradient) 156 - ->setSourceFile($path) 157 - ->setTargetCSS('.main-header-'.$gradient); 158 - $sprite->setSourceSize(6, 44); 159 - $sprites[] = $sprite; 160 - } 161 - 162 - $sheet = $this->buildSheet('main-header', 163 - false, 164 - PhutilSpriteSheet::TYPE_REPEAT_X); 165 - 166 150 foreach ($sprites as $sprite) { 167 151 $sheet->addSprite($sprite); 168 152 }
+8 -6
src/applications/config/option/PhabricatorUIConfigOptions.php
··· 20 20 } 21 21 22 22 public function getOptions() { 23 - $manifest = PHUIIconView::getSheetManifest('main-header'); 24 23 $custom_header_example = 25 24 PhabricatorCustomHeaderConfigType::getExampleConfig(); 26 25 $experimental_link = 'https://secure.phabricator.com/T4214'; 27 26 28 - $options = array(); 29 - foreach (array_keys($manifest) as $sprite_name) { 30 - $key = substr($sprite_name, strlen('main-header-')); 31 - $options[$key] = $key; 32 - } 27 + $options = array( 28 + 'blindigo' => 'blindigo', 29 + 'blue' => 'blue', 30 + 'dark' => 'dark', 31 + 'indigo' => 'indigo', 32 + 'red' => 'red', 33 + 'rainbow' => 'rainbow', 34 + ); 33 35 34 36 $example = <<<EOJSON 35 37 [
+4 -2
src/view/page/menu/PhabricatorMainMenuView.php
··· 275 275 } 276 276 } 277 277 278 + $color = PhabricatorEnv::getEnvConfig('ui.header-color'); 279 + 278 280 return phutil_tag( 279 281 'a', 280 282 array( ··· 291 293 phutil_tag( 292 294 'span', 293 295 array( 294 - 'class' => 'sprite-menu phabricator-main-menu-eye', 296 + 'class' => 'sprite-menu phabricator-main-menu-eye '.$color.'-eye', 295 297 ), 296 298 ''), 297 299 phutil_tag( 298 300 'span', 299 301 array( 300 - 'class' => 'sprite-menu phabricator-main-menu-logo', 302 + 'class' => 'sprite-menu phabricator-main-menu-logo '.$color.'-logo', 301 303 'style' => $style_logo, 302 304 ), 303 305 ''),
-56
webroot/rsrc/css/sprite-main-header.css
··· 1 - /** 2 - * @provides sprite-main-header-css 3 - * @generated 4 - */ 5 - 6 - .sprite-main-header { 7 - background-image: url(/rsrc/image/sprite-main-header.png); 8 - background-repeat: repeat-x; 9 - } 10 - 11 - 12 - 13 - 14 - .main-header-applebloom { 15 - background-position: 0px 0px; 16 - } 17 - 18 - .main-header-blindigo { 19 - background-position: 0px -45px; 20 - } 21 - 22 - .main-header-blue { 23 - background-position: 0px -90px; 24 - } 25 - 26 - .main-header-dark { 27 - background-position: 0px -135px; 28 - } 29 - 30 - .main-header-fluttershy { 31 - background-position: 0px -180px; 32 - } 33 - 34 - .main-header-green { 35 - background-position: 0px -225px; 36 - } 37 - 38 - .main-header-indigo { 39 - background-position: 0px -270px; 40 - } 41 - 42 - .main-header-nightmaremoon { 43 - background-position: 0px -315px; 44 - } 45 - 46 - .main-header-red { 47 - background-position: 0px -360px; 48 - } 49 - 50 - .main-header-scootaloo { 51 - background-position: 0px -405px; 52 - } 53 - 54 - .main-header-yellow { 55 - background-position: 0px -450px; 56 - }
+43 -3
webroot/rsrc/css/sprite-menu.css
··· 13 13 only screen and (-webkit-min-device-pixel-ratio: 1.5) { 14 14 .sprite-menu { 15 15 background-image: url(/rsrc/image/sprite-menu-X2.png); 16 - background-size: 97px 82px; 16 + background-size: 194px 205px; 17 17 } 18 18 } 19 19 20 20 21 - .phabricator-main-menu-logo { 21 + .dark-logo { 22 22 background-position: 0px 0px; 23 23 } 24 24 25 - .phabricator-main-menu-eye { 25 + .dark-eye { 26 + background-position: 0px -82px; 27 + } 28 + 29 + .red-logo { 30 + background-position: -97px 0px; 31 + } 32 + 33 + .red-eye { 34 + background-position: -41px -82px; 35 + } 36 + 37 + .blue-logo { 26 38 background-position: 0px -41px; 27 39 } 40 + 41 + .blue-eye { 42 + background-position: -82px -82px; 43 + } 44 + 45 + .indigo-logo { 46 + background-position: -97px -41px; 47 + } 48 + 49 + .indigo-eye { 50 + background-position: -123px -82px; 51 + } 52 + 53 + .blindigo-logo { 54 + background-position: 0px -123px; 55 + } 56 + 57 + .blindigo-eye { 58 + background-position: -97px -123px; 59 + } 60 + 61 + .rainbow-logo { 62 + background-position: 0px -164px; 63 + } 64 + 65 + .rainbow-eye { 66 + background-position: -97px -164px; 67 + }
webroot/rsrc/image/sprite-main-header.png

This is a binary file and will not be displayed.

webroot/rsrc/image/sprite-menu-X2.png

This is a binary file and will not be displayed.

webroot/rsrc/image/sprite-menu.png

This is a binary file and will not be displayed.