From d905d3cb2ab268c36efbc02084bfe2bd4132c9e4 Mon Sep 17 00:00:00 2001 From: epriestley Date: Tue, 15 Jan 2013 15:49:48 -0800 Subject: [PATCH] Sprite menu label and hover states Summary: These can all fit into the gradient sprite. Test Plan: Looked at menu with selected item, hovered over menu. Reviewers: chad Reviewed By: chad CC: aran Differential Revision: https://secure.phabricator.com/D4453 --- resources/sprite/gradients/menu-hover.png | Bin 0 -> 1100 bytes .../sprite/gradients/menu-label.png | Bin resources/sprite/gradients/menu-selected.png | Bin 0 -> 1234 bytes resources/sprite/manifest/apps-large.json | 304 ++++++------- resources/sprite/manifest/apps-xlarge.json | 76 ++-- resources/sprite/manifest/apps.json | 76 ++-- resources/sprite/manifest/gradient.json | 37 +- resources/sprite/manifest/icon.json | 402 +++++++++--------- resources/sprite/manifest/menu.json | 18 +- src/__celerity_resource_map__.php | 249 ++++++----- .../celerity/CeleritySpriteGenerator.php | 24 +- .../css/layout/phabricator-side-menu-view.css | 14 - webroot/rsrc/css/sprite-gradient.css | 34 +- webroot/rsrc/image/menu_hover.png | Bin 2939 -> 0 bytes webroot/rsrc/image/menu_selected.png | Bin 3492 -> 0 bytes webroot/rsrc/image/sprite-gradient.png | Bin 970 -> 1384 bytes 16 files changed, 645 insertions(+), 589 deletions(-) create mode 100644 resources/sprite/gradients/menu-hover.png rename webroot/rsrc/image/menu_label.png => resources/sprite/gradients/menu-label.png (100%) create mode 100644 resources/sprite/gradients/menu-selected.png delete mode 100644 webroot/rsrc/image/menu_hover.png delete mode 100644 webroot/rsrc/image/menu_selected.png diff --git a/resources/sprite/gradients/menu-hover.png b/resources/sprite/gradients/menu-hover.png new file mode 100644 index 0000000000000000000000000000000000000000..e361e584f4dbb02cfea0cca180faa89b4d757fe7 GIT binary patch literal 1100 zcmaJ=TWHfz7!E3PPGm#Dscd?dDNeLa(=C~etFue0i#D@#Rjc47OHS9g=3;WTc2)55 z`>&@b+Olm? z$%+z!AQp+uLJY6-@K;eh2meQw_PoK%auiOWRx^n*vJHulYPLZj>T)}bL0RoSG6EY2 zV(w}!oqG9mlYozaGpyB=%;jNiHUAo$-ZFK{ADq#Zgoy zlksM1y{6qx(Sbm~)$sd07~yfc4J2nhhEtta5TK*jnuRpe0Is6kW_F?=i6i};f^N;q z8qQ3aaKWgoY*Dn==cbegO49$Kx;~3`Pz?Tw_n*Q}yxW3Q3_50~t>DHbt6f(X$JdTh0(Y>!Oz|gA7ASJ(Mfb<{-5B`xP86e0 zANJpRUYY5u7@ykS%Xm(dTs(STsQPqeN;s1`P(_P3BTQt)rQ}e0U77a&_}ae5Z@;%p z4wPP9zbiS~bvxZr)jvFSe$ynge=7H({K4M$)x(5QbZ-1!dScAI-(t8$xYcy%)GuDr BZEyep literal 0 HcmV?d00001 diff --git a/webroot/rsrc/image/menu_label.png b/resources/sprite/gradients/menu-label.png similarity index 100% rename from webroot/rsrc/image/menu_label.png rename to resources/sprite/gradients/menu-label.png diff --git a/resources/sprite/gradients/menu-selected.png b/resources/sprite/gradients/menu-selected.png new file mode 100644 index 0000000000000000000000000000000000000000..cb20ab0ba7a66e615a3be57488278f10cf3df94e GIT binary patch literal 1234 zcmeAS@N?(olHy`uVBq!ia0vp^EI=&7!2~2vign%xQjEnx?oJHr&dI!FU|?3s42dX- z@b$4u&d=3LOvz75)vL%Y0IFhOu(7WwNKDR7Em25HP0!4;ReHaBzmh^`img((sjq== zfpcm`rbks#YH*cbNODznvSo^ry`6$hg%!|%+|-gpg^Jvqyke^gTP3i$RzNmLSYJs2 ztfVB{R>=`$p+bajfP!;=QL2Kep0RGSfuW&-nVFuUiK&^Hp^k!)fuWJU0T7w#8k$&{ znpqi{D?ot~(6*wKG^-#NH>h1eo~=?wNlAf~zJ7Umxn8-kUVc%!zM-Y1CCCgTBVC{h z-Qvo;lEez#ykcdT2`;I{$wiq3C7Jno3Lp~`lk!VTY?Xj6g?J&i0B&qvF*KNf0j6J( zSfFpHX8`gNOrftYex&}`R-SpqC5d^-sh%#jNA{uO^qDQ4Gmq5oXlNJEiK$!oej(kOdQQ!V0vBhlS^|`^GaZPQxJL` zaq0ynhTH<6%`T}$nPsUdZbkXI3SduLWnyuQk(-gZrIV47sgVf|w?Oo!;C71zPPga- z9itD5TBN9k2?5g&hzU=)Kn^_Vr{)3Edl4{U2Wz|rKEv>EaktF-PS%yZ<2ufwqUgEz2%U^Kx9q zCd6FQxJE&VDbw3K(oI9_)C2`@j}QFSQ=go?``dBVUXQ5HpII|Ygxu9{{yf@H@q5CC z{?2oTdGZR&-seZzb1<*#tvz$YeQT`CZKoYOJF{-j*mt<$!DX#WcUoTEe|SvF>Fd

+ array( + 'hash' => 'f7cb4abeb73245fea4098a02fd784653', + 'uri' => '/res/f7cb4abe/rsrc/image/apps.png', + 'disk' => '/rsrc/image/apps.png', + 'type' => 'png', + ), + '/rsrc/image/appstatus_empty.png' => + array( + 'hash' => '2f8102e0a0f5a0980d87d4ab4ba8c8fd', + 'uri' => '/res/2f8102e0/rsrc/image/appstatus_empty.png', + 'disk' => '/rsrc/image/appstatus_empty.png', + 'type' => 'png', + ), + '/rsrc/image/appstatus_info.png' => + array( + 'hash' => '407de6daf2edc4a8b68e2e369f4fc8cb', + 'uri' => '/res/407de6da/rsrc/image/appstatus_info.png', + 'disk' => '/rsrc/image/appstatus_info.png', + 'type' => 'png', + ), + '/rsrc/image/appstatus_needs.png' => + array( + 'hash' => '2c1e193bc786ca4fca0b851ed9cd3d92', + 'uri' => '/res/2c1e193b/rsrc/image/appstatus_needs.png', + 'disk' => '/rsrc/image/appstatus_needs.png', + 'type' => 'png', + ), + '/rsrc/image/appstatus_okay.png' => + array( + 'hash' => 'd00e683ee1c61d0ccced1200775cdbb5', + 'uri' => '/res/d00e683e/rsrc/image/appstatus_okay.png', + 'disk' => '/rsrc/image/appstatus_okay.png', + 'type' => 'png', + ), '/rsrc/image/avatar.png' => array( 'hash' => '1c5f255071537f05406adee86717ff27', @@ -420,27 +455,6 @@ celerity_register_resource_map(array( 'disk' => '/rsrc/image/main_texture.png', 'type' => 'png', ), - '/rsrc/image/menu_hover.png' => - array( - 'hash' => 'af6ffd9df454413d99dbc2bbc7c10e4d', - 'uri' => '/res/af6ffd9d/rsrc/image/menu_hover.png', - 'disk' => '/rsrc/image/menu_hover.png', - 'type' => 'png', - ), - '/rsrc/image/menu_label.png' => - array( - 'hash' => 'bbdd2eef829f619ffa6f83c864727b42', - 'uri' => '/res/bbdd2eef/rsrc/image/menu_label.png', - 'disk' => '/rsrc/image/menu_label.png', - 'type' => 'png', - ), - '/rsrc/image/menu_selected.png' => - array( - 'hash' => '6845ed0fa531cbf2ac8ff516a8c48697', - 'uri' => '/res/6845ed0f/rsrc/image/menu_selected.png', - 'disk' => '/rsrc/image/menu_selected.png', - 'type' => 'png', - ), '/rsrc/image/menu_texture.png' => array( 'hash' => 'ad020b1529b3a3b3480ca9de1d5f1e40', @@ -492,8 +506,8 @@ celerity_register_resource_map(array( ), '/rsrc/image/sprite-gradient.png' => array( - 'hash' => '6666ab677f5dc4fd3fa14ba394f41d3c', - 'uri' => '/res/6666ab67/rsrc/image/sprite-gradient.png', + 'hash' => '92aebaab67dcc6baf2ea99294368d895', + 'uri' => '/res/92aebaab/rsrc/image/sprite-gradient.png', 'disk' => '/rsrc/image/sprite-gradient.png', 'type' => 'png', ), @@ -618,7 +632,7 @@ celerity_register_resource_map(array( ), 'aphront-form-view-css' => array( - 'uri' => '/res/ff83e503/rsrc/css/aphront/form-view.css', + 'uri' => '/res/bdc0b393/rsrc/css/aphront/form-view.css', 'type' => 'css', 'requires' => array( @@ -645,7 +659,7 @@ celerity_register_resource_map(array( ), 'aphront-list-filter-view-css' => array( - 'uri' => '/res/0f5ddaba/rsrc/css/aphront/list-filter-view.css', + 'uri' => '/res/7402821f/rsrc/css/aphront/list-filter-view.css', 'type' => 'css', 'requires' => array( @@ -814,7 +828,7 @@ celerity_register_resource_map(array( ), 'differential-revision-list-css' => array( - 'uri' => '/res/7659ad8d/rsrc/css/application/differential/revision-list.css', + 'uri' => '/res/fe6c4721/rsrc/css/application/differential/revision-list.css', 'type' => 'css', 'requires' => array( @@ -2393,9 +2407,18 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/css/layout/phabricator-action-list-view.css', ), + 'phabricator-app-buttons-css' => + array( + 'uri' => '/res/1a1f926e/rsrc/css/application/directory/phabricator-app-buttons.css', + 'type' => 'css', + 'requires' => + array( + ), + 'disk' => '/rsrc/css/application/directory/phabricator-app-buttons.css', + ), 'phabricator-application-launch-view-css' => array( - 'uri' => '/res/ddfc3af4/rsrc/css/application/base/phabricator-application-launch-view.css', + 'uri' => '/res/464720b1/rsrc/css/application/base/phabricator-application-launch-view.css', 'type' => 'css', 'requires' => array( @@ -2529,7 +2552,7 @@ celerity_register_resource_map(array( ), 'phabricator-filetree-view-css' => array( - 'uri' => '/res/0a9576e0/rsrc/css/layout/phabricator-filetree-view.css', + 'uri' => '/res/a81fc32b/rsrc/css/layout/phabricator-filetree-view.css', 'type' => 'css', 'requires' => array( @@ -2620,7 +2643,7 @@ celerity_register_resource_map(array( ), 'phabricator-nav-view-css' => array( - 'uri' => '/res/44a2e453/rsrc/css/aphront/phabricator-nav-view.css', + 'uri' => '/res/00ba5b11/rsrc/css/aphront/phabricator-nav-view.css', 'type' => 'css', 'requires' => array( @@ -2797,7 +2820,7 @@ celerity_register_resource_map(array( ), 'phabricator-side-menu-view-css' => array( - 'uri' => '/res/dec8c6c3/rsrc/css/layout/phabricator-side-menu-view.css', + 'uri' => '/res/84b87635/rsrc/css/layout/phabricator-side-menu-view.css', 'type' => 'css', 'requires' => array( @@ -3034,7 +3057,7 @@ celerity_register_resource_map(array( ), 'phabricator-zindex-css' => array( - 'uri' => '/res/81ca67ef/rsrc/css/core/z-index.css', + 'uri' => '/res/99eb34fd/rsrc/css/core/z-index.css', 'type' => 'css', 'requires' => array( @@ -3169,7 +3192,7 @@ celerity_register_resource_map(array( ), 'sprite-gradient-css' => array( - 'uri' => '/res/37b2a829/rsrc/css/sprite-gradient.css', + 'uri' => '/res/947de83c/rsrc/css/sprite-gradient.css', 'type' => 'css', 'requires' => array( @@ -3224,7 +3247,7 @@ celerity_register_resource_map(array( ), array( 'packages' => array( - '38f5403c' => + '3e6cc325' => array( 'name' => 'core.pkg.css', 'symbols' => @@ -3243,32 +3266,33 @@ celerity_register_resource_map(array( 11 => 'aphront-list-filter-view-css', 12 => 'phabricator-directory-css', 13 => 'phabricator-jump-nav', - 14 => 'phabricator-remarkup-css', - 15 => 'syntax-highlighting-css', - 16 => 'aphront-pager-view-css', - 17 => 'phabricator-transaction-view-css', - 18 => 'aphront-tooltip-css', - 19 => 'aphront-headsup-view-css', - 20 => 'phabricator-flag-css', - 21 => 'aphront-error-view-css', - 22 => 'sprite-icon-css', - 23 => 'sprite-gradient-css', - 24 => 'sprite-menu-css', - 25 => 'sprite-apps-large-css', - 26 => 'phabricator-main-menu-view', - 27 => 'phabricator-notification-css', - 28 => 'phabricator-notification-menu-css', - 29 => 'lightbox-attachment-css', - 30 => 'phabricator-header-view-css', - 31 => 'phabricator-form-view-css', - 32 => 'phabricator-filetree-view-css', - 33 => 'phabricator-nav-view-css', - 34 => 'phabricator-side-menu-view-css', - 35 => 'phabricator-crumbs-view-css', - 36 => 'phabricator-object-item-list-view-css', - 37 => 'global-drag-and-drop-css', + 14 => 'phabricator-app-buttons-css', + 15 => 'phabricator-remarkup-css', + 16 => 'syntax-highlighting-css', + 17 => 'aphront-pager-view-css', + 18 => 'phabricator-transaction-view-css', + 19 => 'aphront-tooltip-css', + 20 => 'aphront-headsup-view-css', + 21 => 'phabricator-flag-css', + 22 => 'aphront-error-view-css', + 23 => 'sprite-icon-css', + 24 => 'sprite-gradient-css', + 25 => 'sprite-menu-css', + 26 => 'sprite-apps-large-css', + 27 => 'phabricator-main-menu-view', + 28 => 'phabricator-notification-css', + 29 => 'phabricator-notification-menu-css', + 30 => 'lightbox-attachment-css', + 31 => 'phabricator-header-view-css', + 32 => 'phabricator-form-view-css', + 33 => 'phabricator-filetree-view-css', + 34 => 'phabricator-nav-view-css', + 35 => 'phabricator-side-menu-view-css', + 36 => 'phabricator-crumbs-view-css', + 37 => 'phabricator-object-item-list-view-css', + 38 => 'global-drag-and-drop-css', ), - 'uri' => '/res/pkg/38f5403c/core.pkg.css', + 'uri' => '/res/pkg/3e6cc325/core.pkg.css', 'type' => 'css', ), 'b239ff06' => @@ -3324,7 +3348,7 @@ celerity_register_resource_map(array( 'uri' => '/res/pkg/8edbada5/darkconsole.pkg.js', 'type' => 'js', ), - '20933a11' => + 'ec01d039' => array( 'name' => 'differential.pkg.css', 'symbols' => @@ -3344,7 +3368,7 @@ celerity_register_resource_map(array( 12 => 'differential-local-commits-view-css', 13 => 'inline-comment-summary-css', ), - 'uri' => '/res/pkg/20933a11/differential.pkg.css', + 'uri' => '/res/pkg/ec01d039/differential.pkg.css', 'type' => 'css', ), 'bbd79ca2' => @@ -3457,34 +3481,34 @@ celerity_register_resource_map(array( 'reverse' => array( 'aphront-attached-file-view-css' => 'ac211174', - 'aphront-crumbs-view-css' => '38f5403c', - 'aphront-dialog-view-css' => '38f5403c', - 'aphront-error-view-css' => '38f5403c', - 'aphront-form-view-css' => '38f5403c', - 'aphront-headsup-action-list-view-css' => '20933a11', - 'aphront-headsup-view-css' => '38f5403c', - 'aphront-list-filter-view-css' => '38f5403c', - 'aphront-pager-view-css' => '38f5403c', - 'aphront-panel-view-css' => '38f5403c', - 'aphront-table-view-css' => '38f5403c', - 'aphront-tokenizer-control-css' => '38f5403c', - 'aphront-tooltip-css' => '38f5403c', - 'aphront-typeahead-control-css' => '38f5403c', - 'differential-changeset-view-css' => '20933a11', - 'differential-core-view-css' => '20933a11', + 'aphront-crumbs-view-css' => '3e6cc325', + 'aphront-dialog-view-css' => '3e6cc325', + 'aphront-error-view-css' => '3e6cc325', + 'aphront-form-view-css' => '3e6cc325', + 'aphront-headsup-action-list-view-css' => 'ec01d039', + 'aphront-headsup-view-css' => '3e6cc325', + 'aphront-list-filter-view-css' => '3e6cc325', + 'aphront-pager-view-css' => '3e6cc325', + 'aphront-panel-view-css' => '3e6cc325', + 'aphront-table-view-css' => '3e6cc325', + 'aphront-tokenizer-control-css' => '3e6cc325', + 'aphront-tooltip-css' => '3e6cc325', + 'aphront-typeahead-control-css' => '3e6cc325', + 'differential-changeset-view-css' => 'ec01d039', + 'differential-core-view-css' => 'ec01d039', 'differential-inline-comment-editor' => 'bbd79ca2', - 'differential-local-commits-view-css' => '20933a11', - 'differential-results-table-css' => '20933a11', - 'differential-revision-add-comment-css' => '20933a11', - 'differential-revision-comment-css' => '20933a11', - 'differential-revision-comment-list-css' => '20933a11', - 'differential-revision-history-css' => '20933a11', - 'differential-revision-list-css' => '20933a11', - 'differential-table-of-contents-css' => '20933a11', + 'differential-local-commits-view-css' => 'ec01d039', + 'differential-results-table-css' => 'ec01d039', + 'differential-revision-add-comment-css' => 'ec01d039', + 'differential-revision-comment-css' => 'ec01d039', + 'differential-revision-comment-list-css' => 'ec01d039', + 'differential-revision-history-css' => 'ec01d039', + 'differential-revision-list-css' => 'ec01d039', + 'differential-table-of-contents-css' => 'ec01d039', 'diffusion-commit-view-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88', - 'global-drag-and-drop-css' => '38f5403c', - 'inline-comment-summary-css' => '20933a11', + 'global-drag-and-drop-css' => '3e6cc325', + 'inline-comment-summary-css' => 'ec01d039', 'javelin-aphlict' => 'b239ff06', 'javelin-behavior' => 'fbeded59', 'javelin-behavior-aphlict-dropdown' => 'b239ff06', @@ -3552,48 +3576,49 @@ celerity_register_resource_map(array( 'javelin-util' => 'fbeded59', 'javelin-vector' => 'fbeded59', 'javelin-workflow' => 'fbeded59', - 'lightbox-attachment-css' => '38f5403c', + 'lightbox-attachment-css' => '3e6cc325', 'maniphest-task-summary-css' => 'ac211174', 'maniphest-transaction-detail-css' => 'ac211174', + 'phabricator-app-buttons-css' => '3e6cc325', 'phabricator-busy' => 'b239ff06', - 'phabricator-content-source-view-css' => '20933a11', - 'phabricator-core-buttons-css' => '38f5403c', - 'phabricator-core-css' => '38f5403c', - 'phabricator-crumbs-view-css' => '38f5403c', - 'phabricator-directory-css' => '38f5403c', + 'phabricator-content-source-view-css' => 'ec01d039', + 'phabricator-core-buttons-css' => '3e6cc325', + 'phabricator-core-css' => '3e6cc325', + 'phabricator-crumbs-view-css' => '3e6cc325', + 'phabricator-directory-css' => '3e6cc325', 'phabricator-drag-and-drop-file-upload' => 'bbd79ca2', 'phabricator-dropdown-menu' => 'b239ff06', 'phabricator-file-upload' => 'b239ff06', - 'phabricator-filetree-view-css' => '38f5403c', - 'phabricator-flag-css' => '38f5403c', - 'phabricator-form-view-css' => '38f5403c', - 'phabricator-header-view-css' => '38f5403c', - 'phabricator-jump-nav' => '38f5403c', + 'phabricator-filetree-view-css' => '3e6cc325', + 'phabricator-flag-css' => '3e6cc325', + 'phabricator-form-view-css' => '3e6cc325', + 'phabricator-header-view-css' => '3e6cc325', + 'phabricator-jump-nav' => '3e6cc325', 'phabricator-keyboard-shortcut' => 'b239ff06', 'phabricator-keyboard-shortcut-manager' => 'b239ff06', - 'phabricator-main-menu-view' => '38f5403c', + 'phabricator-main-menu-view' => '3e6cc325', 'phabricator-menu-item' => 'b239ff06', - 'phabricator-nav-view-css' => '38f5403c', + 'phabricator-nav-view-css' => '3e6cc325', 'phabricator-notification' => 'b239ff06', - 'phabricator-notification-css' => '38f5403c', - 'phabricator-notification-menu-css' => '38f5403c', - 'phabricator-object-item-list-view-css' => '38f5403c', - 'phabricator-object-selector-css' => '20933a11', + 'phabricator-notification-css' => '3e6cc325', + 'phabricator-notification-menu-css' => '3e6cc325', + 'phabricator-object-item-list-view-css' => '3e6cc325', + 'phabricator-object-selector-css' => 'ec01d039', 'phabricator-paste-file-upload' => 'b239ff06', 'phabricator-prefab' => 'b239ff06', 'phabricator-project-tag-css' => 'ac211174', - 'phabricator-remarkup-css' => '38f5403c', + 'phabricator-remarkup-css' => '3e6cc325', 'phabricator-shaped-request' => 'bbd79ca2', - 'phabricator-side-menu-view-css' => '38f5403c', - 'phabricator-standard-page-view' => '38f5403c', + 'phabricator-side-menu-view-css' => '3e6cc325', + 'phabricator-standard-page-view' => '3e6cc325', 'phabricator-textareautils' => 'b239ff06', 'phabricator-tooltip' => 'b239ff06', - 'phabricator-transaction-view-css' => '38f5403c', - 'phabricator-zindex-css' => '38f5403c', - 'sprite-apps-large-css' => '38f5403c', - 'sprite-gradient-css' => '38f5403c', - 'sprite-icon-css' => '38f5403c', - 'sprite-menu-css' => '38f5403c', - 'syntax-highlighting-css' => '38f5403c', + 'phabricator-transaction-view-css' => '3e6cc325', + 'phabricator-zindex-css' => '3e6cc325', + 'sprite-apps-large-css' => '3e6cc325', + 'sprite-gradient-css' => '3e6cc325', + 'sprite-icon-css' => '3e6cc325', + 'sprite-menu-css' => '3e6cc325', + 'syntax-highlighting-css' => '3e6cc325', ), )); diff --git a/src/infrastructure/celerity/CeleritySpriteGenerator.php b/src/infrastructure/celerity/CeleritySpriteGenerator.php index 7e38b0ded4..d926b9885e 100644 --- a/src/infrastructure/celerity/CeleritySpriteGenerator.php +++ b/src/infrastructure/celerity/CeleritySpriteGenerator.php @@ -169,6 +169,9 @@ final class CeleritySpriteGenerator { $unusual_heights = array( 'dark-menu-label' => 25, 'breadcrumbs' => 31, + 'menu-hover' => 28, + 'menu-label' => 24, + 'menu-selected' => 28, ); // Reorder the sprites so less-specific rules generate earlier in the sheet. @@ -193,8 +196,17 @@ final class CeleritySpriteGenerator { 'button.grey_active, a.dropdown-open', 'green-dark' => ', button.green, a.green, a.green:visited', 'green-light' => ', button.green:active, a.green:active', - 'dark-menu-label' - => ', .phabricator-dark-menu .phabricator-menu-item-type-label', + 'dark-menu-label' => + ', .phabricator-dark-menu .phabricator-menu-item-type-label', + 'menu-label' => + ', .phabricator-side-menu .phabricator-menu-item-type-label', + 'menu-hover' => + ', .device-desktop .phabricator-side-menu '. + 'a.phabricator-menu-item-type-link:hover', + 'menu-selected' => + ', .phabricator-side-menu .phabricator-menu-item-selected, '. + '.device-desktop .phabricator-side-menu '. + 'a.phabricator-menu-item-selected:hover', ); $sprites = array(); @@ -215,7 +227,13 @@ final class CeleritySpriteGenerator { false, PhutilSpriteSheet::TYPE_REPEAT_X, ', button, a.button, a.button:visited, input.inputsubmit, '. - '.phabricator-dark-menu .phabricator-menu-item-type-label'); + '.phabricator-dark-menu .phabricator-menu-item-type-label, '. + '.phabricator-side-menu .phabricator-menu-item-type-label, '. + '.device-desktop .phabricator-side-menu '. + 'a.phabricator-menu-item-type-link:hover, '. + '.phabricator-side-menu .phabricator-menu-item-selected, '. + '.device-desktop .phabricator-side-menu '. + 'a.phabricator-menu-item-selected:hover '); foreach ($sprites as $sprite) { $sheet->addSprite($sprite); } diff --git a/webroot/rsrc/css/layout/phabricator-side-menu-view.css b/webroot/rsrc/css/layout/phabricator-side-menu-view.css index 0de4a36212..30226f068f 100644 --- a/webroot/rsrc/css/layout/phabricator-side-menu-view.css +++ b/webroot/rsrc/css/layout/phabricator-side-menu-view.css @@ -22,22 +22,8 @@ font-size: 12px; font-weight: bold; border-style: solid; - background-image: url(/rsrc/image/menu_label.png); - background-repeat: repeat-x; -} - -.phabricator-side-menu .phabricator-menu-item-type-spacer { - padding: 8px 0; } .device-desktop .phabricator-side-menu a.phabricator-menu-item-type-link:hover { text-decoration: none; - background-image: url(/rsrc/image/menu_hover.png); - background-repeat: repeat-x; -} - -.phabricator-side-menu .phabricator-menu-item-selected, -.device-desktop .phabricator-side-menu a.phabricator-menu-item-selected:hover { - background-image: url(/rsrc/image/menu_selected.png); - background-repeat: repeat-x; } diff --git a/webroot/rsrc/css/sprite-gradient.css b/webroot/rsrc/css/sprite-gradient.css index fe1c324d10..be9a1a9464 100644 --- a/webroot/rsrc/css/sprite-gradient.css +++ b/webroot/rsrc/css/sprite-gradient.css @@ -3,7 +3,7 @@ * @generated */ -.sprite-gradient, button, a.button, a.button:visited, input.inputsubmit, .phabricator-dark-menu .phabricator-menu-item-type-label { +.sprite-gradient, button, a.button, a.button:visited, input.inputsubmit, .phabricator-dark-menu .phabricator-menu-item-type-label, .phabricator-side-menu .phabricator-menu-item-type-label, .device-desktop .phabricator-side-menu a.phabricator-menu-item-type-link:hover, .phabricator-side-menu .phabricator-menu-item-selected, .device-desktop .phabricator-side-menu a.phabricator-menu-item-selected:hover { background-image: url(/rsrc/image/sprite-gradient.png); background-repeat: repeat-x; } @@ -12,41 +12,53 @@ .gradient-blue-dark, button, a.button, a.button:visited, input.inputsubmit { - background-position: 0px -26px; + background-position: 0px -51px; } .gradient-blue-light, button:active, a.button:active { - background-position: 0px -53px; + background-position: 0px -78px; } .gradient-black-dark, button.black, a.black, a.black:visited { - background-position: 0px -80px; + background-position: 0px -105px; } .gradient-black-light, button.black:active, a.black:active { - background-position: 0px -107px; + background-position: 0px -132px; } .gradient-breadcrumbs { - background-position: 0px -242px; + background-position: 0px -325px; } .gradient-dark-menu-label, .phabricator-dark-menu .phabricator-menu-item-type-label { - background-position: 0px 0px; + background-position: 0px -25px; } .gradient-green-dark, button.green, a.green, a.green:visited { - background-position: 0px -134px; + background-position: 0px -159px; } .gradient-green-light, button.green:active, a.green:active { - background-position: 0px -161px; + background-position: 0px -186px; } .gradient-grey-dark, button.grey, input.inputaux, a.grey, a.grey:visited, a.button.disabled, button[disabled], button.disabled { - background-position: 0px -188px; + background-position: 0px -213px; } .gradient-grey-light, button.grey:active, a.grey:active, button.grey_active, a.dropdown-open { - background-position: 0px -215px; + background-position: 0px -240px; +} + +.gradient-menu-hover, .device-desktop .phabricator-side-menu a.phabricator-menu-item-type-link:hover { + background-position: 0px -267px; +} + +.gradient-menu-label, .phabricator-side-menu .phabricator-menu-item-type-label { + background-position: 0px 0px; +} + +.gradient-menu-selected, .phabricator-side-menu .phabricator-menu-item-selected, .device-desktop .phabricator-side-menu a.phabricator-menu-item-selected:hover { + background-position: 0px -296px; } diff --git a/webroot/rsrc/image/menu_hover.png b/webroot/rsrc/image/menu_hover.png deleted file mode 100644 index a34c75222227dcc31bd9ba3ea6eedea98cb783af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2939 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 diff --git a/webroot/rsrc/image/menu_selected.png b/webroot/rsrc/image/menu_selected.png deleted file mode 100644 index 4407925b0b1fa32e6e8648bbf0b0889911539ce9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3492 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 delta 961 zcmV;y13vud3d#qN7k?561^@s6+6i<_000A#Nkl#avk!fSuCzzF>M6jlvQ|)Q0nyMBu|5lTg9KnC1N1qo0lHNSg@h=>LuQi+90m#mL}u4xmNS)~e*KLj>r8u0 zH*?RbErO;nDhU~64-9@pb?6wAj>%+~MC&Ffz+hi1QCg`KYPgfANA`Pev&G0TFq~xj zoc6BpE`L(d1jM33(7G~AkQz}8(0#p%rA01IOz9k$FetFhJs0$`sWNP&t-${A(+WZc z)m~eyyM!XXgZ8r4dbf!SS^Oe1Y_TP<5eIiTBKrgyUV3gJSUvj7M#d%3 zuz%8lp%uY@jtlMc3DZgnwy9GL`TD{DtWfe&x_XPN7YsO$wSY zUU8y*skh-jWga?EAyMg`l|l8b$@GhBNk=XY0bl8r7XVZPQcDVLHBa#cGP3o(G){OaKj` z$G>k-c^#Bx0UtH;?eD16kNrlzH0*n7T~9if9Ps;00000NkvXXu0mjfSB1rv