From 550793f9a4f01a8959dd679b96aa035bc8494d7b Mon Sep 17 00:00:00 2001 From: Chad Little Date: Mon, 18 Jan 2016 20:59:06 -0800 Subject: [PATCH] Remove header gradients for flat colors Summary: Removes header gradient images for flat, CSS controlled colors. I didn't convert the "pony" colors over, going with few options for easier theme-ability. Test Plan: Test each color choice. {F1063828} Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Differential Revision: https://secure.phabricator.com/D15052 --- resources/celerity/map.php | 19 ++--- resources/sprite/main_header/applebloom.png | Bin 174 -> 0 bytes resources/sprite/main_header/blindigo.png | Bin 1189 -> 0 bytes resources/sprite/main_header/blue.png | Bin 401 -> 0 bytes resources/sprite/main_header/dark.png | Bin 423 -> 0 bytes resources/sprite/main_header/fluttershy.png | Bin 171 -> 0 bytes resources/sprite/main_header/green.png | Bin 432 -> 0 bytes resources/sprite/main_header/indigo.png | Bin 943 -> 0 bytes resources/sprite/main_header/light.png | Bin 1033 -> 0 bytes .../sprite/main_header/nightmaremoon.png | Bin 269 -> 0 bytes resources/sprite/main_header/red.png | Bin 406 -> 0 bytes resources/sprite/main_header/scootaloo.png | Bin 153 -> 0 bytes resources/sprite/main_header/yellow.png | Bin 421 -> 0 bytes resources/sprite/manifest/main-header.json | 70 ------------------ scripts/celerity/generate_sprites.php | 1 - .../celerity/CeleritySpriteGenerator.php | 27 ------- .../option/PhabricatorUIConfigOptions.php | 15 ++-- .../page/menu/PhabricatorMainMenuView.php | 3 +- .../css/application/base/main-menu-view.css | 6 +- .../rsrc/css/application/base/phui-theme.css | 32 +++++++- webroot/rsrc/css/sprite-main-header.css | 60 --------------- webroot/rsrc/image/sprite-main-header.png | Bin 2014 -> 0 bytes 22 files changed, 50 insertions(+), 183 deletions(-) delete mode 100644 resources/sprite/main_header/applebloom.png delete mode 100644 resources/sprite/main_header/blindigo.png delete mode 100644 resources/sprite/main_header/blue.png delete mode 100644 resources/sprite/main_header/dark.png delete mode 100644 resources/sprite/main_header/fluttershy.png delete mode 100644 resources/sprite/main_header/green.png delete mode 100644 resources/sprite/main_header/indigo.png delete mode 100644 resources/sprite/main_header/light.png delete mode 100644 resources/sprite/main_header/nightmaremoon.png delete mode 100644 resources/sprite/main_header/red.png delete mode 100644 resources/sprite/main_header/scootaloo.png delete mode 100644 resources/sprite/main_header/yellow.png delete mode 100644 resources/sprite/manifest/main-header.json delete mode 100644 webroot/rsrc/css/sprite-main-header.css delete mode 100644 webroot/rsrc/image/sprite-main-header.png diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 7a4a3ce4eb..c5569127bb 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => '9d3a79f4', + 'core.pkg.css' => 'c61091b0', 'core.pkg.js' => '573e6664', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => '2de124c9', @@ -32,10 +32,10 @@ return array( 'rsrc/css/aphront/typeahead.css' => '0e403212', 'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af', 'rsrc/css/application/auth/auth.css' => '0877ed6e', - 'rsrc/css/application/base/main-menu-view.css' => '2f670a96', + 'rsrc/css/application/base/main-menu-view.css' => 'd00a795a', 'rsrc/css/application/base/notification-menu.css' => 'f31c0bde', 'rsrc/css/application/base/phabricator-application-launch-view.css' => '95351601', - 'rsrc/css/application/base/phui-theme.css' => '6b451f24', + 'rsrc/css/application/base/phui-theme.css' => '981a58f8', 'rsrc/css/application/base/standard-page-view.css' => '7b0d68d8', 'rsrc/css/application/chatlog/chatlog.css' => 'd295b020', 'rsrc/css/application/conduit/conduit-api.css' => '7bc725c4', @@ -155,7 +155,6 @@ return array( 'rsrc/css/phui/phui-workboard-view.css' => '95a54f74', 'rsrc/css/phui/phui-workpanel-view.css' => 'adec7699', 'rsrc/css/sprite-login.css' => '60e8560e', - 'rsrc/css/sprite-main-header.css' => 'f07bbb87', 'rsrc/css/sprite-menu.css' => '9dd65b92', 'rsrc/css/sprite-projects.css' => 'e5ad842a', 'rsrc/css/sprite-tokens.css' => '4f399012', @@ -336,7 +335,6 @@ return array( 'rsrc/image/phrequent_inactive.png' => 'bfc15a69', 'rsrc/image/sprite-login-X2.png' => 'e3991e37', 'rsrc/image/sprite-login.png' => '03d5af29', - 'rsrc/image/sprite-main-header.png' => '3673af44', 'rsrc/image/sprite-menu-X2.png' => 'cfd8fca5', 'rsrc/image/sprite-menu.png' => 'd7a99faa', 'rsrc/image/sprite-projects-X2.png' => '853552c7', @@ -753,7 +751,7 @@ return array( 'phabricator-hovercard-view-css' => '1239cd52', 'phabricator-keyboard-shortcut' => '1ae869f2', 'phabricator-keyboard-shortcut-manager' => 'c1700f6f', - 'phabricator-main-menu-view' => '2f670a96', + 'phabricator-main-menu-view' => 'd00a795a', 'phabricator-nav-view-css' => 'a24cb589', 'phabricator-notification' => 'ccf1cbf8', 'phabricator-notification-css' => '9c279160', @@ -829,7 +827,7 @@ return array( 'phui-status-list-view-css' => '888cedb8', 'phui-tag-view-css' => 'e60e227b', 'phui-text-css' => 'cf019f54', - 'phui-theme-css' => '6b451f24', + 'phui-theme-css' => '981a58f8', 'phui-timeline-view-css' => '2efceff8', 'phui-two-column-view-css' => '39ecafb1', 'phui-workboard-view-css' => '95a54f74', @@ -853,7 +851,6 @@ return array( 'releeph-request-typeahead-css' => '667a48ae', 'setup-issue-css' => 'db7e9c40', 'sprite-login-css' => '60e8560e', - 'sprite-main-header-css' => 'f07bbb87', 'sprite-menu-css' => '9dd65b92', 'sprite-projects-css' => 'e5ad842a', 'sprite-tokens-css' => '4f399012', @@ -1054,9 +1051,6 @@ return array( 'javelin-install', 'javelin-event', ), - '2f670a96' => array( - 'phui-theme-css', - ), '327a00d1' => array( 'javelin-behavior', 'javelin-stratcom', @@ -1852,6 +1846,9 @@ return array( 'javelin-workflow', 'phabricator-drag-and-drop-file-upload', ), + 'd00a795a' => array( + 'phui-theme-css', + ), 'd19198c8' => array( 'javelin-install', 'javelin-dom', diff --git a/resources/sprite/main_header/applebloom.png b/resources/sprite/main_header/applebloom.png deleted file mode 100644 index 29721ef8fd95bcd738be9dfc679a4c95456dd1b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^Y(T8T!2~2v&W!U1Qj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS>JiUK@c978H@C9Mp+knX^$^I!4;qcF3flg|JD!b`b=I~pI_ ze?9Zdzh~8diD$x@HWS|+de-qjq{Oz;vE!d^_!U5uW<@r7Gz*#WBB{e Vz|x4FPX=f8U}fi7AzZCsS=07??FOLn2Bde0{8v^K(3-T9Ob#X~hD#969RTqa;7NqJ2 zr55Lx79|7YBTX5m85nl>EdnV7y2i>SKe;qFHLt|e#a0O@qL-4HVr61vVeV|^=ICT$ zZeVEWYT{(IVYl&B{m2**QVo82cNPd0} zEcOC2@=NlIGx7@*oSnh3rJ&)Pn4Fmh64V3*Fx0)NMVV!(DQ-pixeDMAvdYBb3Ntqg zXEzHsOD97UH?R*Z%p6?}oh&R&Obkq2jEt3_dQ-6Y9;(+7r(S)aWAs7Mixk~3Az&H; zG2w|9$bl#S)I4CCF9IfR-g3z_1_nl9PZ!6Kid!K;orOmnIGp8Hd2_E+UAwrUq9(oi z+HZ!{?EioM-TeOf!op=Kwa3`62}@o09hY6*-u3GK8dJLv&Rm!IyUw<`T{#oFgKu+9 zp0mQ4Wq#|-wU*C_esyHC#i!7PZVxX^6%IaFv15i5r zVuV42?Lr|!VyQ6gR1eXu937(y>mr7pL=*8To3^^6GZYnvBTUicZ!>$5at3jvn}TEb z>NskaW=-CPB&J-aqt?t&tis9)KOG0x-b&$c2vh}52~D`gtawh$vh2}>-+GMGaZHJh zZ8*y9h-rCIm9oo{a*4Tw#kcd6eO+QH!?Bco6&bfTCu{eZ>u%j}@t{3Y{g2trdd$-i zH?8%nZDAAIG2nqj&mxoIVLcAV_o?bVc1ImJA+bAZ9h>!NiXLA}Q@c9W3+sE_zxV7H vvB6*Xp-`$^_+F|T|0-U8)&DvIPXPu1Bl#9LOr}f}00000NkvXXu0mjfZpW@L diff --git a/resources/sprite/main_header/dark.png b/resources/sprite/main_header/dark.png deleted file mode 100644 index f676a0d1b8754fbc335ef6a760dcfc7079fcd7f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 423 zcmV;Y0a*TtP)-*h<&}idC-0 z7tujfVd{0O5D{WoH1eZRwG8>oUFnVr>d4>tAQ0lfq`Ip&L=Y_+Uqpl*I~2qi5D4R^ zsv0Lz--x#vo6f|0=RU--0VG&GiQ$<(dE7~in@S?W03G`vrV^itJ>CHm_FuWZ;_6+i zoUiQmT)lOijc}A)raCG%^2Dd8|JYuyw5A~98j4u=5ybuU2!XJ-f8$Sp0RS2)N`jg2 RYRLcq002ovPDHLkV1nFKx<~*3 diff --git a/resources/sprite/main_header/fluttershy.png b/resources/sprite/main_header/fluttershy.png deleted file mode 100644 index 796158d39b1bf0d53f0440f3ed2cc1d7561ecd6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^Y(T8T!2~2v&W!U1Qj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS>JihMm?978H@C9Ul7OLt(^;rV~jMPi18M27%V)*t^VT2Zr( zev%LFV04x=>rJ`cv2vn^{lEYI>E#pOFZ`e4CKdL$vxo1Nny}H?LrN?H2@KDpb(R*Y S3vB`#%;4$j=d#Wzp$P!7GdRrv diff --git a/resources/sprite/main_header/green.png b/resources/sprite/main_header/green.png deleted file mode 100644 index 6c84d1deaa8e700665eb696aca98f1646f5cc700..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 432 zcmV;h0Z;ykP)vX# a0t^6V_A#{cbr?th0000 diff --git a/resources/sprite/main_header/indigo.png b/resources/sprite/main_header/indigo.png deleted file mode 100644 index ac38dfbdcd5db30ce2a871e8688432af345286f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 943 zcmaJ=-HOvd6wWHjvbf--3c`?ub%kvvN&k}2xNVch7B;nXBlb#mnoQf!O(rH&oAye) z^9jV4@C8J?UcB>4e2K+3aMEqMURV>7nK_*AJKy=4554a5{k=zf9LMc<+Gd}vciDHm zdyD-qKfQjzmWQ-8pl4)6=P1Tp!y`isIsqEvK1SZ+%_XjJ-0dUZ8PI`!s<|W(Q060~ zLB!A;S35}~jR(G`^RLRbXh#N~`0Ztk&z4=sT~1xq<4>M}TBPhoRC@Uvc`=LvQUv`#28T$JA_>1RqRa&CCP+Dz%W)-14lM;{V+2= zU7>7S>x2nKp^H1F&NCjt_dTs*DTbw3YEvp%lGG|Sl}e)}H5H{)63eDs%&{hMX8{gr zj`eP^jjh;hAcBZRHgW8~#hw+D0IU+%{Oww*Tlv;lZ@U&{D;6>_Fl+B$?aobXhO+Hu zc-dhy{y1baAG6{9`tz#IF2>`I*>KWd!{0wbT)%UA@4>keN diff --git a/resources/sprite/main_header/light.png b/resources/sprite/main_header/light.png deleted file mode 100644 index cd786082f039232153ec9f46c42f23c864c76a93..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1033 zcmaJ=Pixdb6b~(k6f53Dp)jPEDorx^x5`tb2&>&)ug}+e z{M)?0#Q#^H-t6<`3G;{SkdD{{7er{sG$f##;v>>0IG(<{B3pv6e4Y%3Y}k9{L^PFg zts_@y&e4LfwO!>nIwlN+8%Vsa$bp*WvqGtcYNy!j4^WPHNaY03BKoV9G5if~o;5B&%l2Le?hG z_*sFrqCp8F$J8CDfyEB#Ng@sc^2SGE~yEj%%h} zvOf7w<5ul*FwKe5CnY^CB3_TtdIRRUyW3H%$k{miMZ$}MPdpl(rX*us&lUNN94E08 zpuh@DXh2OjRMj_a+f#!;)7#MYcl>s%v2hy~S~f!Mz=xXMsTW<(TH6)0tHqZ1ixHWVP^FU8H%;9x0Od zBn}Fif?1ZGh{XjyzLC9omvRY@ByR{g znt>o`g_dOC5tLNbvL&RMp+r=hjEL2083q;=PEn~F=SCwnBHo?#_IfP%;d-!0#;2*^ zW3%!2^H)A{YhABBsD6dhzrWX(pT7-%2p2o`d-*|FdLUdpTn0ZMvCDcmyZ)Z{W#{er EKT+mA)&Kwi diff --git a/resources/sprite/main_header/nightmaremoon.png b/resources/sprite/main_header/nightmaremoon.png deleted file mode 100644 index 2e985507955cdf356c0c9ae570794d9a4d60b771..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 269 zcmV+o0rLKdP)`vTH9&?-7t*h6|Goa(5n3zt>91J&zLR+cf_!A2MjB_N6Xs|Em!PP z)L>{$M9Z2DT1E%7j0ve#B2vm@sFX`ASs;=sMbaQ5(g~6pZ(>antsk1rM}PqU3{>zC TERKm+00000NkvXXu0mjf;ah0& diff --git a/resources/sprite/main_header/red.png b/resources/sprite/main_header/red.png deleted file mode 100644 index 2620221ec655518287de1b8f4a2868d9bb7c3e1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmV;H0crk;P)sRQ=zK03QIE;X3q;k-;LTR zs^QW8jzD8uzs~qWY%ycGU1k28SmpUG*7_4*0AD`{XX+VU761SM07*qoM6N<$g0M2T AuK)l5 diff --git a/resources/sprite/main_header/scootaloo.png b/resources/sprite/main_header/scootaloo.png deleted file mode 100644 index 32e724ec5e50eed5a07a0ee1338d0823a288e169..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^Y(T8T!2~2v&W!U1Qj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS>JimW|d978H@C3Rl^oaDgj!z0nq`tX1Kq7cIi7j)J*NhBS~ zQn@c^vTb74vB_(@j=fuy<{+Fc#;kjmiNk<_$5hv&%&1o%Xbgj=tDnm{r-UW|4<;~# diff --git a/resources/sprite/main_header/yellow.png b/resources/sprite/main_header/yellow.png deleted file mode 100644 index a8a4d67f0ba9333444611b48287d8de0258b4a8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 421 zcmV;W0b2fvP)!b(Pd8;U3M)xpd?T$y*QgJ}hX!M5TK#cB+?A1`aPIC}_0;s(aq}3$P zPiio1Rg(B2XdK+TGlgd~;Hd6+?;C-4Z|Z^;s8nTdfp>J29#NCnx9n>wUig`X$T;0S z81W&%7K(<2rTX2Rsc6~YTxJTCSx12DEGZ>2u}%VV4sQ>*%wgwqp6g~!Kl=fmk)oAUjYUHKshK>m#Nv_ P00000NkvXXu0mjflZC*R diff --git a/resources/sprite/manifest/main-header.json b/resources/sprite/manifest/main-header.json deleted file mode 100644 index 0e3f6a4404..0000000000 --- a/resources/sprite/manifest/main-header.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "version": 1, - "sprites": { - "main-header-applebloom": { - "name": "main-header-applebloom", - "rule": ".phui-theme-applebloom .phabricator-main-menu-background", - "hash": "64822776b129e724709983db1ac5a712" - }, - "main-header-blindigo": { - "name": "main-header-blindigo", - "rule": ".phui-theme-blindigo .phabricator-main-menu-background", - "hash": "8c4f5b1f1f3faceb6ca6e8278a1b082f" - }, - "main-header-blue": { - "name": "main-header-blue", - "rule": ".phui-theme-blue .phabricator-main-menu-background", - "hash": "b5dd317b7bd35e0592b3f4b66267437c" - }, - "main-header-dark": { - "name": "main-header-dark", - "rule": ".phui-theme-dark .phabricator-main-menu-background", - "hash": "817815d84c0c935b4875f6ecc7dbb526" - }, - "main-header-fluttershy": { - "name": "main-header-fluttershy", - "rule": ".phui-theme-fluttershy .phabricator-main-menu-background", - "hash": "55d4e9f813cf354693290105cf83cf78" - }, - "main-header-green": { - "name": "main-header-green", - "rule": ".phui-theme-green .phabricator-main-menu-background", - "hash": "c230f09e307d167fab3ea0d8c3b33755" - }, - "main-header-indigo": { - "name": "main-header-indigo", - "rule": ".phui-theme-indigo .phabricator-main-menu-background", - "hash": "a27394ff1eff4d24398ec57e54d7f5fd" - }, - "main-header-light": { - "name": "main-header-light", - "rule": ".phui-theme-light .phabricator-main-menu-background", - "hash": "3c41fbfbe13cae2451467a1e307115aa" - }, - "main-header-nightmaremoon": { - "name": "main-header-nightmaremoon", - "rule": ".phui-theme-nightmaremoon .phabricator-main-menu-background", - "hash": "9e7cc7b18d2132d2dd47586ba0cd6400" - }, - "main-header-red": { - "name": "main-header-red", - "rule": ".phui-theme-red .phabricator-main-menu-background", - "hash": "3f12cc098afddb8e6c830ef761dcaa61" - }, - "main-header-scootaloo": { - "name": "main-header-scootaloo", - "rule": ".phui-theme-scootaloo .phabricator-main-menu-background", - "hash": "8cedc359dccab1bbd49cbc69940f566a" - }, - "main-header-yellow": { - "name": "main-header-yellow", - "rule": ".phui-theme-yellow .phabricator-main-menu-background", - "hash": "d920e70a6d2662cfb83e1d7e4b4000fd" - } - }, - "scales": [ - 1 - ], - "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", - "type": "repeat-x" -} diff --git a/scripts/celerity/generate_sprites.php b/scripts/celerity/generate_sprites.php index 97e3f70a19..0fbdff60ab 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(), - '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 b5c1ae1b9e..4825609fe6 100644 --- a/src/applications/celerity/CeleritySpriteGenerator.php +++ b/src/applications/celerity/CeleritySpriteGenerator.php @@ -150,33 +150,6 @@ final class CeleritySpriteGenerator extends Phobject { 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('.phui-theme-'.$gradient. - ' .phabricator-main-menu-background'); - $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 index 84a7b4be6b..6b94cf1795 100644 --- a/src/applications/config/option/PhabricatorUIConfigOptions.php +++ b/src/applications/config/option/PhabricatorUIConfigOptions.php @@ -20,15 +20,18 @@ final class PhabricatorUIConfigOptions } 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', + 'light' => 'light', + 'red' => 'red', + 'blue' => 'blue', + 'green' => 'green', + 'indigo' => 'indigo', + 'dark' => 'dark', + ); $example = <<user; require_celerity_resource('phabricator-main-menu-view'); - require_celerity_resource('sprite-main-header-css'); $header_id = celerity_generate_unique_node_id(); $menu_bar = array(); @@ -137,7 +136,7 @@ final class PhabricatorMainMenuView extends AphrontView { $application_menu = $this->renderApplicationMenu($bar_items); $classes = array(); - $classes[] = 'phabricator-main-menu sprite-main-header'; + $classes[] = 'phabricator-main-menu'; $classes[] = 'phabricator-main-menu-background'; return phutil_tag( diff --git a/webroot/rsrc/css/application/base/main-menu-view.css b/webroot/rsrc/css/application/base/main-menu-view.css index b70e0b7470..92385e6dc2 100644 --- a/webroot/rsrc/css/application/base/main-menu-view.css +++ b/webroot/rsrc/css/application/base/main-menu-view.css @@ -16,13 +16,11 @@ } .phabricator-main-menu-background { - min-height: 43px; - background-color: #ebecee; - border-bottom: 1px solid rgba(0,0,0,.1); + min-height: 44px; } .device-desktop .phabricator-main-menu { - height: 43px; + height: 44px; padding-right: 4px; } diff --git a/webroot/rsrc/css/application/base/phui-theme.css b/webroot/rsrc/css/application/base/phui-theme.css index 1d3d9210bd..03ccb8f38e 100644 --- a/webroot/rsrc/css/application/base/phui-theme.css +++ b/webroot/rsrc/css/application/base/phui-theme.css @@ -2,11 +2,39 @@ * @provides phui-theme-css */ - .phui-theme-light button.phabricator-main-menu-search-dropdown .caret:before { +/*--- Base Colors ------------------------------------------------------------*/ + +.phui-theme-blindigo .phabricator-main-menu-background { + background: #41506e; +} + +.phui-theme-dark .phabricator-main-menu-background { + background: #171c20; +} + +.phui-theme-indigo .phabricator-main-menu-background { + background: #4a2b85; +} + +.phui-theme-red .phabricator-main-menu-background { + background: #650404; +} + +.phui-theme-blue .phabricator-main-menu-background { + background: #004377; +} + +.phui-theme-green .phabricator-main-menu-background { + background: #124A1B; +} + +/*--- Light Colors -----------------------------------------------------------*/ + +.phui-theme-light button.phabricator-main-menu-search-dropdown .caret:before { color: {$lightbluetext}; } - .phui-theme-light .phabricator-main-menu-search +.phui-theme-light .phabricator-main-menu-search button.phabricator-main-menu-search-dropdown .phui-icon-view { color: {$lightbluetext}; text-shadow: {$whitetextshadow}; diff --git a/webroot/rsrc/css/sprite-main-header.css b/webroot/rsrc/css/sprite-main-header.css deleted file mode 100644 index de2ab7a694..0000000000 --- a/webroot/rsrc/css/sprite-main-header.css +++ /dev/null @@ -1,60 +0,0 @@ -/** - * @provides sprite-main-header-css - * @generated - */ - -.sprite-main-header { - background-image: url(/rsrc/image/sprite-main-header.png); - background-repeat: repeat-x; -} - - - - -.phui-theme-applebloom .phabricator-main-menu-background { - background-position: 0px 0px; -} - -.phui-theme-blindigo .phabricator-main-menu-background { - background-position: 0px -45px; -} - -.phui-theme-blue .phabricator-main-menu-background { - background-position: 0px -90px; -} - -.phui-theme-dark .phabricator-main-menu-background { - background-position: 0px -135px; -} - -.phui-theme-fluttershy .phabricator-main-menu-background { - background-position: 0px -180px; -} - -.phui-theme-green .phabricator-main-menu-background { - background-position: 0px -225px; -} - -.phui-theme-indigo .phabricator-main-menu-background { - background-position: 0px -270px; -} - -.phui-theme-light .phabricator-main-menu-background { - background-position: 0px -315px; -} - -.phui-theme-nightmaremoon .phabricator-main-menu-background { - background-position: 0px -360px; -} - -.phui-theme-red .phabricator-main-menu-background { - background-position: 0px -405px; -} - -.phui-theme-scootaloo .phabricator-main-menu-background { - background-position: 0px -450px; -} - -.phui-theme-yellow .phabricator-main-menu-background { - background-position: 0px -495px; -} diff --git a/webroot/rsrc/image/sprite-main-header.png b/webroot/rsrc/image/sprite-main-header.png deleted file mode 100644 index f0211bd79ef90e5418ca9d92e2bca916a4807b5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2014 zcmV<42O;>0P)$00006bW%=J00000 z003^L2ax~(2a`!eK~#7F?ODf`?79skDJaYzIOiO<&N=(NA9&7r=d^NM`e&WCBZ(B@ z0*cepgnMqEKJ7d@YN-GgssO4d^~68C?W5uTAsQYYDV&oM)w5WSQz7W}wDcU7s$M34 zW?xS=p;zqwvMm(7df*0Ep?utk4@wUE5br{)wi)kg* zxb$GVnwrA?0FLhoketPIJ8^a^q)1v;({}d&Ku4XMV}N3l-_87jk~&I6IZgnC zN5|H)=)OCx6pp1idd~>OJ1pq%p(C%j(NVEEAff~SX~At?3m=bXJE8Es89||A+a)+^ zbClhYW_v9iC+U_o&ubpLq_xV_cXQ6oG3TilNHj-nGrA*)Q~|IVp?-_(;4`kxaoUxnxoFiQg1* zkrSV-@~h)mbh+cxNBsC_zqqdJDISI)(dTHJmSyRCQLQ)u5Q^5Y%xgakAOIYHZdbgB zlWOSuepxb30EE)_-MY+FUY89DQmbxtH|?sXbzO$O=i>lC2zy;DYmNZ!SgZN@m00M= znE-OmBGQr1Ldc22?%=5IxPqvD09aVHF6#<9C;*4IT(t|av3e1VhyWm$B9c&_sSSXv zPoG2NGGNEI>1(>gJWrqK6CffjKv)RaRMMTqpfV6bOcX3CcHqw`iYwu zQ=3@{UUBcss%&r+^)vuNbM%fI;BzFs-I}9_&=H_Hmb)1N5T5yE_1ka#>=@JW!oRJ8 z>RGI7YhCbnN6_mzqVTdARsY3(T|SUr_|PO=^f>+nZ<7nP&it}^@2juJZRkc^*KM^z z^?2D9oI^KgP_eiyEb;6p``5Z7oM|cZAR`w5=4}=r%XU)$$n*X0Opyw^<4gsF(su*u zsXdo@>?U_?hV<5i73)yd9S4L0JeOtkKIXibqjR-6YGo4v6z~xMV7TNr#A*t8wizqf zyCog-t#?RADBKDVvZG9(05o~?I_y!ZK_PjYZ&3mOU2{YLPE&xRnLpv!O`H)XbPTxB z@s^JC;z5Ok+t^RHdB!>RH<(^Vxgj41vXe}31b?@y8qzJa!FR!_zoDZUO>$#}D;QQpH~mBvDhT-q2wwChddFw0w`G3vBa09I>Fh7j=hSoRId#qv|MJ(rU)S+D^_+VC zvikJ>eBEYHDsBQ_=njqhRn6*R^@^NfALm`38)5>X5eT9EvSmBxlh>l)J$A|x6 zYmR1QU^qE~Psi1Cp+!CiZH}A~7>>3pV6_f|19yy%KG7w=tZRXSh$6)1lD|8;uF{Z) z?P@m+6iUOe(XlKm`Ub1)yV~rUf&hZDEi1%0Y(fl2b_dXAy#L93;EaPZ=$j+>_jeVl z`d~&FcQ9I4oSpPGGFnGK7IYEHzM*#liBF7iM@JCah?JD_4$3(Z6d~L<=edHVexu5Y}|3jrKG;w{$>&suxx@uq7-{=dq!gaM? zdc5lq;#cx-$