This is an automated email from the ASF dual-hosted git repository.
vnick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 15182b859682798595532d3b501649d3aa07bb80
Merge: bc83918 ab6f045
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Thu Feb 27 06:19:03 2020 -0500
Merge staging/1.2.0 changes back to master.
.../webapp/app/client/directives/guacViewport.js | 60 ++++++++++++----------
.../src/main/webapp/app/client/styles/keyboard.css | 5 --
.../main/webapp/app/client/styles/text-input.css | 26 ----------
.../src/main/webapp/app/client/styles/viewport.css | 2 +-
.../main/webapp/app/client/templates/client.html | 6 +--
.../webapp/app/textInput/directives/guacKey.js | 9 +++-
.../app/textInput/directives/guacTextInput.js | 26 ++--------
.../main/webapp/app/textInput/styles/textInput.css | 34 +++++++-----
.../webapp/app/textInput/templates/guacKey.html | 3 +-
.../app/textInput/templates/guacTextInput.html | 2 +-
10 files changed, 70 insertions(+), 103 deletions(-)
