From c29fd51188d94546080f2f9c6ff7460fd635991d Mon Sep 17 00:00:00 2001 From: Chad Little Date: Fri, 20 Feb 2015 10:47:33 -0800 Subject: [PATCH] Add Indigo header, fix colors and hovers Summary: This adds Phacility "Indigo" as well as uses rgba for colors and hovers improving icon colors. Test Plan: Tested each color and hover states. Set test instance to scootaloo. {F310660} Reviewers: btrahan, epriestley Reviewed By: epriestley Subscribers: Korvin, epriestley Differential Revision: https://secure.phabricator.com/D11836 --- resources/celerity/map.php | 12 +-- resources/sprite/main_header/indigo.png | Bin 0 -> 943 bytes resources/sprite/manifest/main-header.json | 87 +++++++++--------- .../css/application/base/main-menu-view.css | 15 ++- webroot/rsrc/css/sprite-main-header.css | 12 ++- webroot/rsrc/image/sprite-main-header.png | Bin 1956 -> 1988 bytes 6 files changed, 67 insertions(+), 59 deletions(-) create mode 100644 resources/sprite/main_header/indigo.png diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 84758d72d0..517be1d0d3 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => '64aeadfc', + 'core.pkg.css' => 'a605a99b', 'core.pkg.js' => '23d653bb', 'darkconsole.pkg.js' => '8ab24e01', 'differential.pkg.css' => '380f07e5', @@ -35,7 +35,7 @@ return array( 'rsrc/css/aphront/typeahead.css' => '0e403212', 'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af', 'rsrc/css/application/auth/auth.css' => '1e655982', - 'rsrc/css/application/base/main-menu-view.css' => '83766540', + 'rsrc/css/application/base/main-menu-view.css' => 'c32b228a', 'rsrc/css/application/base/notification-menu.css' => '6aa0a74b', 'rsrc/css/application/base/phabricator-application-launch-view.css' => '16ca323f', 'rsrc/css/application/base/standard-page-view.css' => '60d0df9a', @@ -151,7 +151,7 @@ return array( 'rsrc/css/phui/phui-workpanel-view.css' => 'e495a5cc', 'rsrc/css/sprite-gradient.css' => '4bdb98a7', 'rsrc/css/sprite-login.css' => 'a355d921', - 'rsrc/css/sprite-main-header.css' => '92720ee2', + 'rsrc/css/sprite-main-header.css' => '12c32a0b', 'rsrc/css/sprite-menu.css' => '9ef76324', 'rsrc/css/sprite-projects.css' => 'b0d9e24f', 'rsrc/css/sprite-tokens.css' => '1706b943', @@ -329,7 +329,7 @@ return array( 'rsrc/image/sprite-gradient.png' => 'ec15a417', 'rsrc/image/sprite-login-X2.png' => '5ae6de3a', 'rsrc/image/sprite-login.png' => '07f2c67c', - 'rsrc/image/sprite-main-header.png' => '83521873', + 'rsrc/image/sprite-main-header.png' => '2f8f4c8d', 'rsrc/image/sprite-menu-X2.png' => '1c90d7bc', 'rsrc/image/sprite-menu.png' => '619781ee', 'rsrc/image/sprite-projects-X2.png' => '8c91c839', @@ -729,7 +729,7 @@ return array( 'phabricator-hovercard-view-css' => '893f4783', 'phabricator-keyboard-shortcut' => '1ae869f2', 'phabricator-keyboard-shortcut-manager' => 'c1700f6f', - 'phabricator-main-menu-view' => '83766540', + 'phabricator-main-menu-view' => 'c32b228a', 'phabricator-nav-view-css' => '7aeaf435', 'phabricator-notification' => '0c6946e7', 'phabricator-notification-css' => '9c279160', @@ -824,7 +824,7 @@ return array( 'setup-issue-css' => '22270af2', 'sprite-gradient-css' => '4bdb98a7', 'sprite-login-css' => 'a355d921', - 'sprite-main-header-css' => '92720ee2', + 'sprite-main-header-css' => '12c32a0b', 'sprite-menu-css' => '9ef76324', 'sprite-projects-css' => 'b0d9e24f', 'sprite-tokens-css' => '1706b943', diff --git a/resources/sprite/main_header/indigo.png b/resources/sprite/main_header/indigo.png new file mode 100644 index 0000000000000000000000000000000000000000..ac38dfbdcd5db30ce2a871e8688432af345286f1 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/resources/sprite/manifest/main-header.json b/resources/sprite/manifest/main-header.json index 1660c55aa2..22afa41676 100644 --- a/resources/sprite/manifest/main-header.json +++ b/resources/sprite/manifest/main-header.json @@ -1,55 +1,60 @@ { - "version" : 1, - "sprites" : { - "main-header-applebloom" : { - "name" : "main-header-applebloom", - "rule" : ".main-header-applebloom", - "hash" : "64822776b129e724709983db1ac5a712" + "version": 1, + "sprites": { + "main-header-applebloom": { + "name": "main-header-applebloom", + "rule": ".main-header-applebloom", + "hash": "64822776b129e724709983db1ac5a712" }, - "main-header-blue" : { - "name" : "main-header-blue", - "rule" : ".main-header-blue", - "hash" : "b5dd317b7bd35e0592b3f4b66267437c" + "main-header-blue": { + "name": "main-header-blue", + "rule": ".main-header-blue", + "hash": "b5dd317b7bd35e0592b3f4b66267437c" }, - "main-header-dark" : { - "name" : "main-header-dark", - "rule" : ".main-header-dark", - "hash" : "817815d84c0c935b4875f6ecc7dbb526" + "main-header-dark": { + "name": "main-header-dark", + "rule": ".main-header-dark", + "hash": "817815d84c0c935b4875f6ecc7dbb526" }, - "main-header-fluttershy" : { - "name" : "main-header-fluttershy", - "rule" : ".main-header-fluttershy", - "hash" : "55d4e9f813cf354693290105cf83cf78" + "main-header-fluttershy": { + "name": "main-header-fluttershy", + "rule": ".main-header-fluttershy", + "hash": "55d4e9f813cf354693290105cf83cf78" }, - "main-header-green" : { - "name" : "main-header-green", - "rule" : ".main-header-green", - "hash" : "c230f09e307d167fab3ea0d8c3b33755" + "main-header-green": { + "name": "main-header-green", + "rule": ".main-header-green", + "hash": "c230f09e307d167fab3ea0d8c3b33755" }, - "main-header-nightmaremoon" : { - "name" : "main-header-nightmaremoon", - "rule" : ".main-header-nightmaremoon", - "hash" : "9e7cc7b18d2132d2dd47586ba0cd6400" + "main-header-indigo": { + "name": "main-header-indigo", + "rule": ".main-header-indigo", + "hash": "a27394ff1eff4d24398ec57e54d7f5fd" }, - "main-header-red" : { - "name" : "main-header-red", - "rule" : ".main-header-red", - "hash" : "3f12cc098afddb8e6c830ef761dcaa61" + "main-header-nightmaremoon": { + "name": "main-header-nightmaremoon", + "rule": ".main-header-nightmaremoon", + "hash": "9e7cc7b18d2132d2dd47586ba0cd6400" }, - "main-header-scootaloo" : { - "name" : "main-header-scootaloo", - "rule" : ".main-header-scootaloo", - "hash" : "8cedc359dccab1bbd49cbc69940f566a" + "main-header-red": { + "name": "main-header-red", + "rule": ".main-header-red", + "hash": "3f12cc098afddb8e6c830ef761dcaa61" }, - "main-header-yellow" : { - "name" : "main-header-yellow", - "rule" : ".main-header-yellow", - "hash" : "d920e70a6d2662cfb83e1d7e4b4000fd" + "main-header-scootaloo": { + "name": "main-header-scootaloo", + "rule": ".main-header-scootaloo", + "hash": "8cedc359dccab1bbd49cbc69940f566a" + }, + "main-header-yellow": { + "name": "main-header-yellow", + "rule": ".main-header-yellow", + "hash": "d920e70a6d2662cfb83e1d7e4b4000fd" } }, - "scales" : [ + "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" + "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/webroot/rsrc/css/application/base/main-menu-view.css b/webroot/rsrc/css/application/base/main-menu-view.css index 744feb22a4..c33d0da7fc 100644 --- a/webroot/rsrc/css/application/base/main-menu-view.css +++ b/webroot/rsrc/css/application/base/main-menu-view.css @@ -63,7 +63,7 @@ } .device-desktop .phabricator-main-menu-brand:hover { - background-color: rgba(0,0,0,.6); + background-color: rgba(0,0,0,.33); cursor: hand; } @@ -280,6 +280,10 @@ float: left; } +.alert-notifications .phui-icon-view { + color: rgba(200,200,200, .5); +} + .alert-notifications:hover .phui-icon-view { color: #fff; } @@ -416,7 +420,7 @@ font-size: 20px; height: 20px; width: 20px; - color: #d7d7d7; + color: rgba(255,255,255,.8); margin: 8px; text-align: center; vertical-align: middle; @@ -441,14 +445,9 @@ display: block; } -.device-desktop .main-header-dark .phabricator-application-menu - .core-menu-item.phui-list-item-view:hover { - background-color: rgba(0,0,0,.6); -} - .device-desktop .phabricator-application-menu .core-menu-item.phui-list-item-view:hover { - box-shadow: inset 0 5px 10px rgba(0,0,0,0.5); + background-color: rgba(0,0,0,.33); border-radius: 3px; color: #fff; } diff --git a/webroot/rsrc/css/sprite-main-header.css b/webroot/rsrc/css/sprite-main-header.css index 20af55aa9b..a2a91d1143 100644 --- a/webroot/rsrc/css/sprite-main-header.css +++ b/webroot/rsrc/css/sprite-main-header.css @@ -31,18 +31,22 @@ background-position: 0px -180px; } -.main-header-nightmaremoon { +.main-header-indigo { background-position: 0px -225px; } -.main-header-red { +.main-header-nightmaremoon { background-position: 0px -270px; } -.main-header-scootaloo { +.main-header-red { background-position: 0px -315px; } -.main-header-yellow { +.main-header-scootaloo { background-position: 0px -360px; } + +.main-header-yellow { + background-position: 0px -405px; +} diff --git a/webroot/rsrc/image/sprite-main-header.png b/webroot/rsrc/image/sprite-main-header.png index ff05c76b2b5bccfa414751c3e0b8e5eded9c6e7a..5babc9c0664209bc84af9786054c1fbb7baca834 100644 GIT binary patch delta 1987 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