diff --git a/resources/sprite/conpher_1x/conversation_off.png b/resources/sprite/conpher_1x/conversation_off.png new file mode 100644 index 0000000000..2a0310bca2 Binary files /dev/null and b/resources/sprite/conpher_1x/conversation_off.png differ diff --git a/resources/sprite/conpher_1x/conversation_on.png b/resources/sprite/conpher_1x/conversation_on.png new file mode 100644 index 0000000000..11e8437a0a Binary files /dev/null and b/resources/sprite/conpher_1x/conversation_on.png differ diff --git a/resources/sprite/manifest/conph.json b/resources/sprite/manifest/conph.json index f6cdb6dbb8..9554b39997 100644 --- a/resources/sprite/manifest/conph.json +++ b/resources/sprite/manifest/conph.json @@ -1,64 +1,74 @@ { "version" : 1, "sprites" : { - "conpher_calendar_off" : { + "conpher_calendar_off" : { "name" : "conpher_calendar_off", - "rule" : "conpher_calendar_off", + "rule" : ".conpher_calendar_off", "hash" : "a8228ab90fd90f4c2500d9285179bf26" }, - "conpher_calendar_on" : { + "conpher_calendar_on" : { "name" : "conpher_calendar_on", - "rule" : "conpher_calendar_on", + "rule" : ".conpher_calendar_on, .device-desktop .conpher_calendar_off:hover ", "hash" : "931243bc3c414782ddb2d1d9607908ba" }, - "conpher_files_off" : { + "conpher_conversation_off" : { + "name" : "conpher_conversation_off", + "rule" : ".conpher_conversation_off", + "hash" : "931abb0377898297a9a603a6d280b977" + }, + "conpher_conversation_on" : { + "name" : "conpher_conversation_on", + "rule" : ".conpher_conversation_on, .device-desktop .conpher_conversation_off:hover ", + "hash" : "0b8a39dc5019dac1975b7be2ca0ccbfa" + }, + "conpher_files_off" : { "name" : "conpher_files_off", - "rule" : "conpher_files_off", + "rule" : ".conpher_files_off", "hash" : "de1aee01b9b47b354e6ac280ae68bae1" }, - "conpher_files_on" : { + "conpher_files_on" : { "name" : "conpher_files_on", - "rule" : "conpher_files_on", + "rule" : ".conpher_files_on, .device-desktop .conpher_files_off:hover ", "hash" : "9ccbbd5e86fd4ec87a11aee0c9ec8c60" }, - "conpher_list_off" : { + "conpher_list_off" : { "name" : "conpher_list_off", - "rule" : "conpher_list_off", + "rule" : ".conpher_list_off", "hash" : "2611311d0c2aec04416433be74d3a30e" }, - "conpher_list_on" : { + "conpher_list_on" : { "name" : "conpher_list_on", - "rule" : "conpher_list_on", + "rule" : ".conpher_list_on, .device-desktop .conpher_list_off:hover ", "hash" : "cee6de0301c84b0d195282642642afa0" }, - "conpher_more_off" : { + "conpher_more_off" : { "name" : "conpher_more_off", - "rule" : "conpher_more_off", + "rule" : ".conpher_more_off", "hash" : "3b7099bdde20a13864b48552b11e92c3" }, - "conpher_more_on" : { + "conpher_more_on" : { "name" : "conpher_more_on", - "rule" : "conpher_more_on", + "rule" : ".conpher_more_on, .device-desktop .conpher_more_off:hover ", "hash" : "b146f0cff9c2e5f0b57f7ebcfe0704d3" }, - "conpher_people_off" : { + "conpher_people_off" : { "name" : "conpher_people_off", - "rule" : "conpher_people_off", + "rule" : ".conpher_people_off", "hash" : "641a6a21aa32a12416e85caf8a22e340" }, - "conpher_people_on" : { + "conpher_people_on" : { "name" : "conpher_people_on", - "rule" : "conpher_people_on", + "rule" : ".conpher_people_on, .device-desktop .conpher_people_off:hover ", "hash" : "f13745fd7036564eefb1c0ebc3502a92" }, - "conpher_settings_off" : { + "conpher_settings_off" : { "name" : "conpher_settings_off", - "rule" : "conpher_settings_off", + "rule" : ".conpher_settings_off", "hash" : "aa9ab000d9e33e3c50c2fe70367f30b4" }, - "conpher_settings_on" : { + "conpher_settings_on" : { "name" : "conpher_settings_on", - "rule" : "conpher_settings_on", + "rule" : ".conpher_settings_on, .device-desktop .conpher_settings_off:hover ", "hash" : "a5fe22965997f9559800ca7db5ea32c8" } }, diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 158c033447..47dff6fcbe 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -478,15 +478,15 @@ celerity_register_resource_map(array( ), '/rsrc/image/sprite-conph-X2.png' => array( - 'hash' => 'c80e0b09360be71addfeaee622ac4bf0', - 'uri' => '/res/c80e0b09/rsrc/image/sprite-conph-X2.png', + 'hash' => '8f79b9888577dab95d6019d1b7f2a204', + 'uri' => '/res/8f79b988/rsrc/image/sprite-conph-X2.png', 'disk' => '/rsrc/image/sprite-conph-X2.png', 'type' => 'png', ), '/rsrc/image/sprite-conph.png' => array( - 'hash' => '0b1d46b6c7369e09dc4b9e26010b74d6', - 'uri' => '/res/0b1d46b6/rsrc/image/sprite-conph.png', + 'hash' => 'a6329b4baa648b57c00de65f6758cbd2', + 'uri' => '/res/a6329b4b/rsrc/image/sprite-conph.png', 'disk' => '/rsrc/image/sprite-conph.png', 'type' => 'png', ), @@ -3316,7 +3316,7 @@ celerity_register_resource_map(array( ), 'sprite-conpher-css' => array( - 'uri' => '/res/14e5d74c/rsrc/css/sprite-conph.css', + 'uri' => '/res/f640f0c5/rsrc/css/sprite-conph.css', 'type' => 'css', 'requires' => array( diff --git a/src/infrastructure/celerity/CeleritySpriteGenerator.php b/src/infrastructure/celerity/CeleritySpriteGenerator.php index bc25743b83..4f9f4f26b7 100644 --- a/src/infrastructure/celerity/CeleritySpriteGenerator.php +++ b/src/infrastructure/celerity/CeleritySpriteGenerator.php @@ -194,7 +194,14 @@ final class CeleritySpriteGenerator { $sprite = id(clone $template) ->setName($prefix.$icon); - $sprite->setTargetCSS($prefix.$icon); + $tcss = array(); + $tcss[] = '.'.$prefix.$icon; + if ($color == 'on') { + $class = str_replace('_on', '_off', $prefix.$icon); + $tcss[] = '.device-desktop .'.$class.':hover '; + } + + $sprite->setTargetCSS(implode(', ', $tcss)); foreach ($scales as $scale_key => $scale) { $path = $this->getPath($prefix.$scale_key.'/'.$icon.'.png'); diff --git a/webroot/rsrc/css/sprite-conph.css b/webroot/rsrc/css/sprite-conph.css index 6b02619ebf..d11ae477c5 100644 --- a/webroot/rsrc/css/sprite-conph.css +++ b/webroot/rsrc/css/sprite-conph.css @@ -13,55 +13,63 @@ only screen and (min-device-pixel-ratio: 1.5), only screen and (-webkit-min-device-pixel-ratio: 1.5) { .sprite-conpher { background-image: url(/rsrc/image/sprite-conpher-X2.png); - background-size: 99px 132px; + background-size: 132px 132px; } } -conpher_calendar_off { +.conpher_calendar_off { background-position: 0px 0px; } -conpher_calendar_on { +.conpher_calendar_on, .device-desktop .conpher_calendar_off:hover { background-position: -33px 0px; } -conpher_files_off { +.conpher_conversation_off { background-position: -66px 0px; } -conpher_files_on { +.conpher_conversation_on, .device-desktop .conpher_conversation_off:hover { + background-position: -99px 0px; +} + +.conpher_files_off { background-position: 0px -33px; } -conpher_list_off { +.conpher_files_on, .device-desktop .conpher_files_off:hover { background-position: -33px -33px; } -conpher_list_on { +.conpher_list_off { background-position: -66px -33px; } -conpher_more_off { +.conpher_list_on, .device-desktop .conpher_list_off:hover { + background-position: -99px -33px; +} + +.conpher_more_off { background-position: 0px -66px; } -conpher_more_on { +.conpher_more_on, .device-desktop .conpher_more_off:hover { background-position: -33px -66px; } -conpher_people_off { +.conpher_people_off { background-position: -66px -66px; } -conpher_people_on { +.conpher_people_on, .device-desktop .conpher_people_off:hover { background-position: 0px -99px; } -conpher_settings_off { +.conpher_settings_off { background-position: -33px -99px; } -conpher_settings_on { +.conpher_settings_on, .device-desktop .conpher_settings_off:hover { background-position: -66px -99px; } diff --git a/webroot/rsrc/image/sprite-conph-X2.png b/webroot/rsrc/image/sprite-conph-X2.png index df789c68ef..ef32a410db 100644 Binary files a/webroot/rsrc/image/sprite-conph-X2.png and b/webroot/rsrc/image/sprite-conph-X2.png differ diff --git a/webroot/rsrc/image/sprite-conph.png b/webroot/rsrc/image/sprite-conph.png index 41d186ef5a..490f12d2c5 100644 Binary files a/webroot/rsrc/image/sprite-conph.png and b/webroot/rsrc/image/sprite-conph.png differ