This is an automated email from the ASF dual-hosted git repository. mjumper pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 284d1b24f37f06d380312e149d24d96497dd9af4 Merge: 8cf8fb587 c90ae7dd3 Author: Mike Jumper <[email protected]> AuthorDate: Mon Nov 13 10:45:03 2023 -0800 Merge 1.5.4 changes back to master. .../frontend/src/app/settings/styles/history-player.css | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --cc guacamole/src/main/frontend/src/app/settings/styles/history-player.css index d9122b83d,d409cd9ad..55458dd51 --- a/guacamole/src/main/frontend/src/app/settings/styles/history-player.css +++ b/guacamole/src/main/frontend/src/app/settings/styles/history-player.css @@@ -104,93 -104,7 +104,85 @@@ transition: opacity 0.25s linear 0.25s; } - .settings.connectionHistoryPlayer .guac-player-controls.paused, - .settings.connectionHistoryPlayer .guac-player-controls.playing:hover { - opacity: 1; - -webkit-transition-delay: 0s; - -moz-transition-delay: 0s; - -o-transition-delay: 0s; - transition-delay: 0s; - } - - .settings.connectionHistoryPlayer guac-player.recent-mouse-movement .guac-player-controls.playing { + .settings.connectionHistoryPlayer .guac-player-controls:hover, + .settings.connectionHistoryPlayer guac-player.recent-mouse-movement .guac-player-controls { opacity: 1; } + +.settings.connectionHistoryPlayer .guac-player-controls .heat-map { + position: absolute; + width: 100%; +} + +.settings.connectionHistoryPlayer .guac-player-controls .heat-map svg { + position: absolute; + bottom: 7px; + height: 50px; + width: 100%; + z-index: 100; + pointer-events: none; + opacity: 0; + -webkit-transition: opacity 0.1s linear 0.1s; + -moz-transition: opacity 0.1s linear 0.1s; + -o-transition: opacity 0.1s linear 0.1s; + transition: opacity 0.1s linear 0.1s; +} + +.settings.connectionHistoryPlayer .guac-player-controls:hover .heat-map svg { + opacity: 1; +} + +.settings.connectionHistoryPlayer .guac-player-controls .heat-map .legend { + position: absolute; + display: flex; + flex-direction: column; + align-items: end; + bottom: 65px; + right: 10px; + z-index: 100; + background-color: rgba(0, 0, 0, 0.85); + padding-top: 3px; + padding-bottom: 3px; + padding-left: 6px; + border-radius: 5px; + opacity: 0; + -webkit-transition: opacity 0.1s linear 0.1s; + -moz-transition: opacity 0.1s linear 0.1s; + -o-transition: opacity 0.1s linear 0.1s; + transition: opacity 0.1s linear 0.1s; +} + +.settings.connectionHistoryPlayer .guac-player-controls:hover .heat-map .legend { + opacity: 1; +} + +.settings.connectionHistoryPlayer .guac-player-controls .heat-map .legend .key-events::after, +.settings.connectionHistoryPlayer .guac-player-controls .heat-map .legend .frame-events::after { + display: inline-block; + content: ''; + width: 25px; + height: 10px; + margin-left: 3px; + margin-right: 10px; + border-radius: 3px; +} + +.settings.connectionHistoryPlayer .guac-player-controls .heat-map .legend .key-events::after { + background-color: #5BA300; +} + +.settings.connectionHistoryPlayer .guac-player-controls .heat-map .legend .frame-events::after { + background-color: #888888; +} + +.settings.connectionHistoryPlayer .heat-map svg.key-events path { + + /* #5BA300 color at 50% opacity */ + fill: rgba(91, 163, 0, 0.5); +} + +.settings.connectionHistoryPlayer .heat-map svg.frame-events path { + + /* #888888 color at 75% opacity */ + fill: rgba(135, 135, 135, 0.75); +}
