safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 05:31:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-1170: Restructure and resize cursor keys. Space using flex layout.

Browse Source
This commit is contained in:
Michael Jumper
2015-04-28 21:37:21 -07:00
parent 5877848796
commit 9a276e1232
2 changed files with 60 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
guacamole/src/main/webapp/app/osk/styles/osk.css
View File

@@ -101,13 +101,50 @@
line-height: 0; line-height: 0;
} }
.guac-keyboard .guac-keyboard-group.guac-keyboard-main, .guac-keyboard .guac-keyboard-group.guac-keyboard-alpha,
.guac-keyboard .guac-keyboard-group.guac-keyboard-movement { .guac-keyboard .guac-keyboard-group.guac-keyboard-movement {
display: inline-block; display: inline-block;
text-align: center; text-align: center;
vertical-align: top; vertical-align: top;
} }
.guac-keyboard .guac-keyboard-group.guac-keyboard-main {
/* IE10 */
display: -ms-flexbox;
-ms-flex-align: stretch;
-ms-flex-direction: row;
/* Ancient Mozilla */
display: -moz-box;
-moz-box-align: stretch;
-moz-box-orient: horizontal;
/* Ancient WebKit */
display: -webkit-box;
-webkit-box-align: stretch;
-webkit-box-orient: horizontal;
/* Old WebKit */
display: -webkit-flex;
-webkit-align-items: stretch;
-webkit-flex-direction: row;
/* W3C */
display: flex;
align-items: stretch;
flex-direction: row;
}
.guac-keyboard .guac-keyboard-group.guac-keyboard-movement {
-ms-flex: 1 1 auto;
-moz-box-flex: 1;
-webkit-box-flex: 1;
-webkit-flex: 1 1 auto;
flex: 1 1 auto;
}
.guac-keyboard .guac-keyboard-gap { .guac-keyboard .guac-keyboard-gap {
display: inline-block; display: inline-block;
} }

42
guacamole/src/main/webapp/layouts/en-us-qwerty.json
View File

@@ -347,23 +347,25 @@
[ 0.1 ], [ 0.1 ],
{ {
"main" : [ "main" : {
"alpha" : [
[ "`", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "-", "=", "Back" ], [ "`", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "-", "=", "Back" ],
[ "Tab", "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "[", "]", "\\" ], [ "Tab", "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "[", "]", "\\" ],
[ "Caps", "a", "s", "d", "f", "g", "h", "j", "k", "l", ";", "'", "Enter" ], [ "Caps", "a", "s", "d", "f", "g", "h", "j", "k", "l", ";", "'", "Enter" ],
[ "LShift", "z", "x", "c", "v", "b", "n", "m", ",", ".", "/", "RShift" ], [ "LShift", "z", "x", "c", "v", "b", "n", "m", ",", ".", "/", "RShift" ],
[ "LCtrl", "Super", "LAlt", "Space", "RAlt", "Menu", "RCtrl" ] [ "LCtrl", "Super", "LAlt", "Space", "RAlt", "Menu", "RCtrl" ]
], ],
"movement" : [ "movement" : [
[ "Ins", "Home", "PgUp" ], [ "Ins", "Home", "PgUp" ],
[ "Del", "End", "PgDn" ], [ "Del", "End", "PgDn" ],
[ 0.5 ], [ 1 ],
[ "Up" ], [ "Up" ],
[ "Left", "Down", "Right" ] [ "Left", "Down", "Right" ]
] ]
}
} }
], ],
@@ -386,12 +388,12 @@
"Menu" : 1.6, "Menu" : 1.6,
"RCtrl" : 1.6, "RCtrl" : 1.6,
"Ins" : 1.75, "Ins" : 1.6,
"Home" : 1.75, "Home" : 1.6,
"PgUp" : 1.75, "PgUp" : 1.6,
"Del" : 1.75, "Del" : 1.6,
"End" : 1.75, "End" : 1.6,
"PgDn" : 1.75 "PgDn" : 1.6
} }