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

Add gaps to layout, remove padding.

Browse Source
This commit is contained in:
Michael Jumper
2012-01-20 01:10:37 -08:00
parent c6a0109667
commit 24d22cc7a9
2 changed files with 101 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
guacamole/src/main/webapp/layouts/en-us-qwerty.xml
View File

@@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
--> -->
<keyboard lang="en_US" layout="qwerty" size="21"> <keyboard lang="en_US" layout="qwerty" size="22">
<row> <row>
<key> <key>
<cap keysym="0xFF1B">Esc</cap> <cap keysym="0xFF1B">Esc</cap>
@@ -27,12 +27,15 @@
<key> <key>
<cap keysym="0xFFBE">F1</cap> <cap keysym="0xFFBE">F1</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap keysym="0xFFBF">F2</cap> <cap keysym="0xFFBF">F2</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap keysym="0xFFC0">F3</cap> <cap keysym="0xFFC0">F3</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap keysym="0xFFC1">F4</cap> <cap keysym="0xFFC1">F4</cap>
</key> </key>
@@ -40,12 +43,15 @@
<key> <key>
<cap keysym="0xFFC2">F5</cap> <cap keysym="0xFFC2">F5</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap keysym="0xFFC3">F6</cap> <cap keysym="0xFFC3">F6</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap keysym="0xFFC4">F7</cap> <cap keysym="0xFFC4">F7</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap keysym="0xFFC5">F8</cap> <cap keysym="0xFFC5">F8</cap>
</key> </key>
@@ -53,12 +59,15 @@
<key> <key>
<cap keysym="0xFFC6">F9</cap> <cap keysym="0xFFC6">F9</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap keysym="0xFFC7">F10</cap> <cap keysym="0xFFC7">F10</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap keysym="0xFFC8">F11</cap> <cap keysym="0xFFC8">F11</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap keysym="0xFFC9">F12</cap> <cap keysym="0xFFC9">F12</cap>
</key> </key>
@@ -72,288 +81,354 @@
<cap>`</cap> <cap>`</cap>
<cap if="shift">~</cap> <cap if="shift">~</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>1</cap> <cap>1</cap>
<cap if="shift">!</cap> <cap if="shift">!</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>2</cap> <cap>2</cap>
<cap if="shift">@</cap> <cap if="shift">@</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>3</cap> <cap>3</cap>
<cap if="shift">#</cap> <cap if="shift">#</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>4</cap> <cap>4</cap>
<cap if="shift">$</cap> <cap if="shift">$</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>5</cap> <cap>5</cap>
<cap if="shift">%</cap> <cap if="shift">%</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>6</cap> <cap>6</cap>
<cap if="shift">^</cap> <cap if="shift">^</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>7</cap> <cap>7</cap>
<cap if="shift">&amp;</cap> <cap if="shift">&amp;</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>8</cap> <cap>8</cap>
<cap if="shift">*</cap> <cap if="shift">*</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>9</cap> <cap>9</cap>
<cap if="shift">(</cap> <cap if="shift">(</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>0</cap> <cap>0</cap>
<cap if="shift">)</cap> <cap if="shift">)</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>-</cap> <cap>-</cap>
<cap if="shift">_</cap> <cap if="shift">_</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>=</cap> <cap>=</cap>
<cap if="shift">+</cap> <cap if="shift">+</cap>
</key> </key>
<gap size="0.1"/>
<key size="2"> <key size="2">
<cap keysym="0xFF08">Back</cap> <cap keysym="0xFF08">Back</cap>
</key> </key>
</row> </row>
<row><gap size="0.1"/></row>
<row> <row>
<key size="1.5"> <key size="1.5">
<cap keysym="0xFF09">Tab</cap> <cap keysym="0xFF09">Tab</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>q</cap> <cap>q</cap>
<cap if="caps">Q</cap> <cap if="caps">Q</cap>
<cap if="shift">Q</cap> <cap if="shift">Q</cap>
<cap if="caps,shift">q</cap> <cap if="caps,shift">q</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>w</cap> <cap>w</cap>
<cap if="caps">W</cap> <cap if="caps">W</cap>
<cap if="shift">W</cap> <cap if="shift">W</cap>
<cap if="caps,shift">w</cap> <cap if="caps,shift">w</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>e</cap> <cap>e</cap>
<cap if="caps">E</cap> <cap if="caps">E</cap>
<cap if="shift">E</cap> <cap if="shift">E</cap>
<cap if="caps,shift">e</cap> <cap if="caps,shift">e</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>r</cap> <cap>r</cap>
<cap if="caps">R</cap> <cap if="caps">R</cap>
<cap if="shift">R</cap> <cap if="shift">R</cap>
<cap if="caps,shift">r</cap> <cap if="caps,shift">r</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>t</cap> <cap>t</cap>
<cap if="caps">T</cap> <cap if="caps">T</cap>
<cap if="shift">T</cap> <cap if="shift">T</cap>
<cap if="caps,shift">t</cap> <cap if="caps,shift">t</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>y</cap> <cap>y</cap>
<cap if="caps">Y</cap> <cap if="caps">Y</cap>
<cap if="shift">Y</cap> <cap if="shift">Y</cap>
<cap if="caps,shift">y</cap> <cap if="caps,shift">y</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>u</cap> <cap>u</cap>
<cap if="caps">U</cap> <cap if="caps">U</cap>
<cap if="shift">U</cap> <cap if="shift">U</cap>
<cap if="caps,shift">u</cap> <cap if="caps,shift">u</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>i</cap> <cap>i</cap>
<cap if="caps">I</cap> <cap if="caps">I</cap>
<cap if="shift">I</cap> <cap if="shift">I</cap>
<cap if="caps,shift">i</cap> <cap if="caps,shift">i</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>o</cap> <cap>o</cap>
<cap if="caps">O</cap> <cap if="caps">O</cap>
<cap if="shift">O</cap> <cap if="shift">O</cap>
<cap if="caps,shift">o</cap> <cap if="caps,shift">o</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>p</cap> <cap>p</cap>
<cap if="caps">P</cap> <cap if="caps">P</cap>
<cap if="shift">P</cap> <cap if="shift">P</cap>
<cap if="caps,shift">p</cap> <cap if="caps,shift">p</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>[</cap> <cap>[</cap>
<cap if="shift">{</cap> <cap if="shift">{</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>]</cap> <cap>]</cap>
<cap if="shift">}</cap> <cap if="shift">}</cap>
</key> </key>
<gap size="0.1"/>
<key size="1.5"> <key size="1.5">
<cap>\</cap> <cap>\</cap>
<cap if="shift">|</cap> <cap if="shift">|</cap>
</key> </key>
</row> </row>
<row><gap size="0.1"/></row>
<row> <row>
<key size="1.75"> <key size="1.85">
<cap modifier="caps" keysym="0xFFE5" sticky="true">Caps</cap> <cap modifier="caps" keysym="0xFFE5" sticky="true">Caps</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>a</cap> <cap>a</cap>
<cap if="caps">A</cap> <cap if="caps">A</cap>
<cap if="shift">A</cap> <cap if="shift">A</cap>
<cap if="caps,shift">a</cap> <cap if="caps,shift">a</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>s</cap> <cap>s</cap>
<cap if="caps">S</cap> <cap if="caps">S</cap>
<cap if="shift">S</cap> <cap if="shift">S</cap>
<cap if="caps,shift">s</cap> <cap if="caps,shift">s</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>d</cap> <cap>d</cap>
<cap if="caps">D</cap> <cap if="caps">D</cap>
<cap if="shift">D</cap> <cap if="shift">D</cap>
<cap if="caps,shift">d</cap> <cap if="caps,shift">d</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>f</cap> <cap>f</cap>
<cap if="caps">F</cap> <cap if="caps">F</cap>
<cap if="shift">F</cap> <cap if="shift">F</cap>
<cap if="caps,shift">f</cap> <cap if="caps,shift">f</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>g</cap> <cap>g</cap>
<cap if="caps">G</cap> <cap if="caps">G</cap>
<cap if="shift">G</cap> <cap if="shift">G</cap>
<cap if="caps,shift">g</cap> <cap if="caps,shift">g</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>h</cap> <cap>h</cap>
<cap if="caps">H</cap> <cap if="caps">H</cap>
<cap if="shift">H</cap> <cap if="shift">H</cap>
<cap if="caps,shift">h</cap> <cap if="caps,shift">h</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>j</cap> <cap>j</cap>
<cap if="caps">J</cap> <cap if="caps">J</cap>
<cap if="shift">J</cap> <cap if="shift">J</cap>
<cap if="caps,shift">j</cap> <cap if="caps,shift">j</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>k</cap> <cap>k</cap>
<cap if="caps">K</cap> <cap if="caps">K</cap>
<cap if="shift">K</cap> <cap if="shift">K</cap>
<cap if="caps,shift">k</cap> <cap if="caps,shift">k</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>l</cap> <cap>l</cap>
<cap if="caps">L</cap> <cap if="caps">L</cap>
<cap if="shift">L</cap> <cap if="shift">L</cap>
<cap if="caps,shift">l</cap> <cap if="caps,shift">l</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>;</cap> <cap>;</cap>
<cap if="shift">:</cap> <cap if="shift">:</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>'</cap> <cap>'</cap>
<cap if="shift">"</cap> <cap if="shift">"</cap>
</key> </key>
<gap size="0.1"/>
<key size="2.25"> <key size="2.25">
<cap keysym="0xFF0D">Enter</cap> <cap keysym="0xFF0D">Enter</cap>
</key> </key>
</row> </row>
<row><gap size="0.1"/></row>
<row> <row>
<key size="2"> <key size="2.1">
<cap modifier="shift" keysym="0xFFE1">Shift</cap> <cap modifier="shift" keysym="0xFFE1">Shift</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>z</cap> <cap>z</cap>
<cap if="caps">Z</cap> <cap if="caps">Z</cap>
<cap if="shift">Z</cap> <cap if="shift">Z</cap>
<cap if="caps,shift">z</cap> <cap if="caps,shift">z</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>x</cap> <cap>x</cap>
<cap if="caps">X</cap> <cap if="caps">X</cap>
<cap if="shift">X</cap> <cap if="shift">X</cap>
<cap if="caps,shift">x</cap> <cap if="caps,shift">x</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>c</cap> <cap>c</cap>
<cap if="caps">C</cap> <cap if="caps">C</cap>
<cap if="shift">C</cap> <cap if="shift">C</cap>
<cap if="caps,shift">c</cap> <cap if="caps,shift">c</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>v</cap> <cap>v</cap>
<cap if="caps">V</cap> <cap if="caps">V</cap>
<cap if="shift">V</cap> <cap if="shift">V</cap>
<cap if="caps,shift">v</cap> <cap if="caps,shift">v</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>b</cap> <cap>b</cap>
<cap if="caps">B</cap> <cap if="caps">B</cap>
<cap if="shift">B</cap> <cap if="shift">B</cap>
<cap if="caps,shift">b</cap> <cap if="caps,shift">b</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>n</cap> <cap>n</cap>
<cap if="caps">N</cap> <cap if="caps">N</cap>
<cap if="shift">N</cap> <cap if="shift">N</cap>
<cap if="caps,shift">n</cap> <cap if="caps,shift">n</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>m</cap> <cap>m</cap>
<cap if="caps">M</cap> <cap if="caps">M</cap>
<cap if="shift">M</cap> <cap if="shift">M</cap>
<cap if="caps,shift">m</cap> <cap if="caps,shift">m</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>,</cap> <cap>,</cap>
<cap if="shift">&lt;</cap> <cap if="shift">&lt;</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>.</cap> <cap>.</cap>
<cap if="shift">&gt;</cap> <cap if="shift">&gt;</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap>/</cap> <cap>/</cap>
<cap if="shift">?</cap> <cap if="shift">?</cap>
</key> </key>
<key size="3"> <gap size="0.1"/>
<key size="3.1">
<cap modifier="shift" keysym="0xFFE2">Shift</cap> <cap modifier="shift" keysym="0xFFE2">Shift</cap>
</key> </key>
</row> </row>
<row><gap size="0.1"/></row>
<row> <row>
<key size="1.5"> <key size="1.6">
<cap modifier="control" keysym="0xFFE3">Ctrl</cap> <cap modifier="control" keysym="0xFFE3">Ctrl</cap>
</key> </key>
<key size="1.5"> <gap size="0.1"/>
<key size="1.6">
<cap modifier="super" keysym="0xFFEB">Super</cap> <cap modifier="super" keysym="0xFFEB">Super</cap>
</key> </key>
<key size="1.5"> <gap size="0.1"/>
<key size="1.6">
<cap modifier="alt" keysym="0xFFE9">Alt</cap> <cap modifier="alt" keysym="0xFFE9">Alt</cap>
</key> </key>
<key size="6"> <gap size="0.1"/>
<key size="6.1">
<cap> </cap> <cap> </cap>
</key> </key>
<key size="1.5"> <gap size="0.1"/>
<key size="1.6">
<cap modifier="alt" keysym="0xFFE3">Alt</cap> <cap modifier="alt" keysym="0xFFE3">Alt</cap>
</key> </key>
<key size="1.5"> <gap size="0.1"/>
<key size="1.6">
<cap modifier="super" keysym="0xFF67">Menu</cap> <cap modifier="super" keysym="0xFF67">Menu</cap>
</key> </key>
<key size="1.5"> <gap size="0.1"/>
<key size="1.6">
<cap modifier="control" keysym="0xFFE4">Ctrl</cap> <cap modifier="control" keysym="0xFFE4">Ctrl</cap>
</key> </key>
</row> </row>
@@ -368,20 +443,25 @@
<key size="1.75"> <key size="1.75">
<cap keysym="0xFF63">Ins</cap> <cap keysym="0xFF63">Ins</cap>
</key> </key>
<gap size="0.1"/>
<key size="1.75"> <key size="1.75">
<cap keysym="0xFF50">Home</cap> <cap keysym="0xFF50">Home</cap>
</key> </key>
<gap size="0.1"/>
<key size="1.75"> <key size="1.75">
<cap keysym="0xFF55">PgUp</cap> <cap keysym="0xFF55">PgUp</cap>
</key> </key>
</row> </row>
<row><gap size="0.1"/></row>
<row> <row>
<key size="1.75"> <key size="1.75">
<cap keysym="0xFFFF">Del</cap> <cap keysym="0xFFFF">Del</cap>
</key> </key>
<gap size="0.1"/>
<key size="1.75"> <key size="1.75">
<cap keysym="0xFF57">End</cap> <cap keysym="0xFF57">End</cap>
</key> </key>
<gap size="0.1"/>
<key size="1.75"> <key size="1.75">
<cap keysym="0xFF56">PgDn</cap> <cap keysym="0xFF56">PgDn</cap>
</key> </key>
@@ -394,13 +474,16 @@
<cap keysym="0xFF52">&#x2191;</cap> <cap keysym="0xFF52">&#x2191;</cap>
</key> </key>
</row> </row>
<row><gap size="0.1"/></row>
<row> <row>
<key> <key>
<cap keysym="0xFF51">&#x2190;</cap> <cap keysym="0xFF51">&#x2190;</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap keysym="0xFF54">&#x2193;</cap> <cap keysym="0xFF54">&#x2193;</cap>
</key> </key>
<gap size="0.1"/>
<key> <key>
<cap keysym="0xFF53">&#x2192;</cap> <cap keysym="0xFF53">&#x2192;</cap>
</key> </key>

8
guacamole/src/main/webapp/styles/keyboard.css
View File

@@ -25,7 +25,7 @@
bottom: 0; bottom: 0;
width: 100%; width: 100%;
margin: 0; margin: 0;
padding: 0.5em; padding: 0;
border-top: 1px solid black; border-top: 1px solid black;
background: #222; background: #222;
@@ -38,6 +38,7 @@
.guacamole-keyboard { .guacamole-keyboard {
display: inline-block; display: inline-block;
width: 100%; width: 100%;
margin: 0; margin: 0;
padding: 0; padding: 0;
cursor: default; cursor: default;
@@ -84,9 +85,14 @@
border-color: #DD4; border-color: #DD4;
} }
.guacamole-keyboard .guacamole-keyboard-row {
line-height: 0;
}
.guacamole-keyboard .guacamole-keyboard-column { .guacamole-keyboard .guacamole-keyboard-column {
display: inline-block; display: inline-block;
text-align: center; text-align: center;
vertical-align: top;
} }
.guacamole-keyboard .guacamole-keyboard-gap { .guacamole-keyboard .guacamole-keyboard-gap {