Skip to content

GitLab

T
tangled
Commit 07b8fe1c authored by rsadam@google.com's avatar rsadam@google.com
Browse files
Options

Update Virtual Keybaord icons. 

BUG=364468
R=bshe@chromium.org

Review URL: https://codereview.chromium.org/252743002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266894 0039d316-1c4b-4281-b951-d872f2087c98
parent 92cb3959
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 106 deletions
ui/keyboard/keyboard_resources.grd
View file @ 07b8fe1c
......@@ -17,27 +17,27 @@
<includes>
<include name="IDR_KEYBOARD_FUNCTION_KEY_ROW" file="resources/layouts/function-key-row.html" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_BACK" file="resources/images/back.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_BACKSPACE" file="resources/images/backspace.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_BACKSPACE" file="resources/images/backspace.png" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_BRIGHTNESS_DOWN" file="resources/images/brightness-down.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_BRIGHTNESS_UP" file="resources/images/brightness-up.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_CHANGE_WINDOW" file="resources/images/change-window.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_DOWN" file="resources/images/down.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_FORWARD" file="resources/images/forward.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_FULLSCREEN" file="resources/images/fullscreen.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_HIDE_KEYBOARD" file="resources/images/hide-keyboard.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_HIDE_KEYBOARD" file="resources/images/hide-keyboard.png" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_KEYBOARD" file="resources/images/keyboard.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_LEFT" file="resources/images/left.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_MICROPHONE" file="resources/images/microphone.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_MICROPHONE_GREEN" file="resources/images/microphone-green.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_MUTE" file="resources/images/mute.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_RELOAD" file="resources/images/reload.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_RETURN" file="resources/images/return.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_RETURN" file="resources/images/return.png" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_RIGHT" file="resources/images/right.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_SEARCH" file="resources/images/search.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_SHIFT" file="resources/images/shift.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_SHIFT_FILLED" file="resources/images/shift-filled.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_SHUTDOWN" file="resources/images/shutdown.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_TAB" file="resources/images/tab.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_TAB" file="resources/images/tab.png" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_UP" file="resources/images/up.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_VOLUME_DOWN" file="resources/images/volume-down.svg" type="BINDATA" />
<include name="IDR_KEYBOARD_IMAGES_VOLUME_UP" file="resources/images/volume-up.svg" type="BINDATA" />
......
ui/keyboard/keyboard_util.cc
View file @ 07b8fe1c
......@@ -284,7 +284,7 @@ const GritResourceMap* GetKeyboardExtensionResources(size_t* size) {
static const GritResourceMap kKeyboardResources[] = {
{"keyboard/layouts/function-key-row.html", IDR_KEYBOARD_FUNCTION_KEY_ROW},
{"keyboard/images/back.svg", IDR_KEYBOARD_IMAGES_BACK},
{"keyboard/images/backspace.svg", IDR_KEYBOARD_IMAGES_BACKSPACE},
{"keyboard/images/backspace.png", IDR_KEYBOARD_IMAGES_BACKSPACE},
{"keyboard/images/brightness-down.svg",
IDR_KEYBOARD_IMAGES_BRIGHTNESS_DOWN},
{"keyboard/images/brightness-up.svg", IDR_KEYBOARD_IMAGES_BRIGHTNESS_UP},
......@@ -292,7 +292,7 @@ const GritResourceMap* GetKeyboardExtensionResources(size_t* size) {
{"keyboard/images/down.svg", IDR_KEYBOARD_IMAGES_DOWN},
{"keyboard/images/forward.svg", IDR_KEYBOARD_IMAGES_FORWARD},
{"keyboard/images/fullscreen.svg", IDR_KEYBOARD_IMAGES_FULLSCREEN},
{"keyboard/images/hide-keyboard.svg", IDR_KEYBOARD_IMAGES_HIDE_KEYBOARD},
{"keyboard/images/hide-keyboard.png", IDR_KEYBOARD_IMAGES_HIDE_KEYBOARD},
{"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD},
{"keyboard/images/left.svg", IDR_KEYBOARD_IMAGES_LEFT},
{"keyboard/images/microphone.svg", IDR_KEYBOARD_IMAGES_MICROPHONE},
......@@ -300,13 +300,13 @@ const GritResourceMap* GetKeyboardExtensionResources(size_t* size) {
IDR_KEYBOARD_IMAGES_MICROPHONE_GREEN},
{"keyboard/images/mute.svg", IDR_KEYBOARD_IMAGES_MUTE},
{"keyboard/images/reload.svg", IDR_KEYBOARD_IMAGES_RELOAD},
{"keyboard/images/return.svg", IDR_KEYBOARD_IMAGES_RETURN},
{"keyboard/images/return.png", IDR_KEYBOARD_IMAGES_RETURN},
{"keyboard/images/right.svg", IDR_KEYBOARD_IMAGES_RIGHT},
{"keyboard/images/search.svg", IDR_KEYBOARD_IMAGES_SEARCH},
{"keyboard/images/shift.svg", IDR_KEYBOARD_IMAGES_SHIFT},
{"keyboard/images/shift-filled.svg", IDR_KEYBOARD_IMAGES_SHIFT_FILLED},
{"keyboard/images/shutdown.svg", IDR_KEYBOARD_IMAGES_SHUTDOWN},
{"keyboard/images/tab.svg", IDR_KEYBOARD_IMAGES_TAB},
{"keyboard/images/tab.png", IDR_KEYBOARD_IMAGES_TAB},
{"keyboard/images/up.svg", IDR_KEYBOARD_IMAGES_UP},
{"keyboard/images/volume-down.svg", IDR_KEYBOARD_IMAGES_VOLUME_DOWN},
{"keyboard/images/volume-up.svg", IDR_KEYBOARD_IMAGES_VOLUME_UP},
......
ui/keyboard/resources/elements/kb-key.html
View file @ 07b8fe1c
......@@ -40,8 +40,7 @@
/* TODO(rsadam@): Remove when we fully switch to native shadow dom. */
/* TODO(rsadam@): Move shift key rules to kb-shift-key. */
kb-shift-key .key,
:host(kb-shift-key) .key,
:host([image]) .key {
:host(kb-shift-key) .key {
height: 70%;
width: auto;
}
......@@ -50,8 +49,8 @@
height: 85%;
}
:host([image].hide-keyboard) .key {
height: 100%;
:host([image]) .key {
height: 30%;
}
:host([image].search) .key {
......
ui/keyboard/resources/elements/kb-key.js
View file @ 07b8fe1c
......@@ -67,8 +67,11 @@ Polymer('kb-key', {
if (!this.image) {
this.$.key.style.backgroundImage = "none";
} else {
// If no extension provided, default to svg.
var image =
this.image.split('.').length > 1 ? this.image : this.image + ".svg";
this.$.key.style.backgroundImage =
"url(images/" + this.image + ".svg)";
"url(images/" + image + ")";
}
},
......
ui/keyboard/resources/images/backspace.svg deleted 100644 → 0
View file @ 92cb3959
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 17.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1"
id="svg6055" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" inkscape:version="0.48.3.1 r9886" sodipodi:docname="New document 14"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="48px" height="48px"
viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve">
<sodipodi:namedview showgrid="true" inkscape:cx="24" inkscape:zoom="7" id="base" borderopacity="1.0" pagecolor="#ffffff" bordercolor="#666666" inkscape:cy="24" inkscape:pageshadow="2" inkscape:current-layer="layer1" inkscape:window-width="534" inkscape:grid-bbox="true" inkscape:pageopacity="0.0" inkscape:document-units="px" inkscape:window-x="394" inkscape:window-maximized="0" inkscape:window-y="714" inkscape:window-height="401">
</sodipodi:namedview>
<g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
<g id="g1722" transform="matrix(1.25,0,0,-1.25,31.657411,29.649286)">
<path id="path1724" inkscape:connector-curvature="0" fill="#666666" d="M-0.626,0.41l-3.181,3.177l-3.176-3.18l-1.106,1.106
l3.179,3.181l-3.179,3.179l1.106,1.107l3.176-3.18l3.181,3.18l1.103-1.107L-2.7,4.692l3.177-3.18L-0.626,0.41z M-18.792,4.47
l6.248-6.231H6.54V10.8h-19.084L-18.792,4.47z"/>
</g>
</g>
</svg>
ui/keyboard/resources/images/hide-keyboard.svg deleted 100644 → 0
View file @ 92cb3959
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="48px" height="48px" viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve">
<symbol id="ic_x5F_keyboard_x0D_" viewBox="0 -24 24 24">
<path fill="#666666" d="M21-5H3C1.896-5,1.01-5.896,1.01-7L1-18c0-1.104,0.896-2,2-2h18c1.104,0,2,0.896,2,2v11
C23-5.896,22.104-5,21-5z M11-8h2v-2h-2V-8z M11-11h2v-2h-2V-11z M8-8h2v-2H8V-8z M8-11h2v-2H8V-11z M7-13H5v2h2V-13z M7-10H5v2h2
V-10z M16-17H8v2h8V-17z M16-13h-2v2h2V-13z M16-10h-2v2h2V-10z M19-13h-2v2h2V-13z M19-10h-2v2h2V-10z"/>
<polygon fill="none" points="24,-24 0,-24 0,0 24,0 "/>
</symbol>
<use xlink:href="#ic_x5F_keyboard_x0D_" width="24" height="24" id="XMLID_144_" y="-24" transform="matrix(1 0 0 -1 12 10)" overflow="visible"/>
<polygon fill="#666666" points="21,32 27,32 24,35 "/>
</svg>
ui/keyboard/resources/images/return.svg deleted 100644 → 0
View file @ 92cb3959
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1"
id="svg6103" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docname="New document 17" inkscape:version="0.48.3.1 r9886"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="48px" height="48px"
viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve">
<sodipodi:namedview inkscape:window-maximized="0" inkscape:window-y="547" inkscape:window-x="672" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:current-layer="layer1" inkscape:pageshadow="2" inkscape:window-height="401" inkscape:pageopacity="0.0" inkscape:window-width="534" showgrid="true" inkscape:cy="24" inkscape:cx="24" inkscape:zoom="7" borderopacity="1.0" bordercolor="#666666" pagecolor="#ffffff" id="base">
</sodipodi:namedview>
<g id="layer1" inkscape:groupmode="layer" inkscape:label="Layer 1">
<g id="g1718" transform="matrix(1.25,0,0,-1.25,39.764197,19.091786)">
<path id="path1720" inkscape:connector-curvature="0" fill="#666666" d="M0.457,0.572v-3.598h-18v6.295l-9.936-7.197l9.936-7.193
v6.295h19.8v5.398H0.457z"/>
</g>
</g>
</svg>
ui/keyboard/resources/images/tab.svg deleted 100644 → 0
View file @ 92cb3959
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1"
id="svg5223" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docname="New document 2" inkscape:version="0.48.3.1 r9886"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="48px" height="48px"
viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve">
<sodipodi:namedview inkscape:window-maximized="0" inkscape:window-y="308" inkscape:window-x="472" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:current-layer="layer1" inkscape:pageshadow="2" inkscape:window-height="401" inkscape:pageopacity="0.0" inkscape:window-width="534" showgrid="true" inkscape:cy="24" inkscape:cx="24" inkscape:zoom="2.4748737" borderopacity="1.0" bordercolor="#666666" pagecolor="#ffffff" id="base">
</sodipodi:namedview>
<g id="layer1" inkscape:groupmode="layer" inkscape:label="Layer 1">
<g id="g1736" transform="matrix(1.25,0,0,-1.25,38.01192,16.333282)">
<path id="path1738" inkscape:connector-curvature="0" fill="#666666" d="M1.422-0.841h-15.969v-5.077l-8.011,5.802l8.011,5.805
V0.611H1.422V-0.841z"/>
</g>
<g id="g1742" transform="matrix(1.25,0,0,-1.25,6.434791,29.565652)">
<path id="path1744" inkscape:connector-curvature="0" fill="#666666" d="M1.421-0.841h15.97v5.076l8.011-5.801L17.391-7.37v5.076
H1.421V-0.841z"/>
</g>
</g>
</svg>
ui/keyboard/resources/layouts/qwerty.html
View file @ 07b8fe1c
......@@ -9,13 +9,13 @@
<kb-row>
<kb-key-sequence keys="QWERTYUIOP" hintTexts="1234567890">
</kb-key-sequence>
<kb-key class="dark" char="&#x0008;" image="backspace"
<kb-key class="dark" char="&#x0008;" image="backspace.png"
repeat sound="keypress-delete" stretch weight="110"></kb-key>
</kb-row>
<kb-row align="right">
<kb-key-sequence keys="ASDFGHJKL"></kb-key-sequence>
<kb-key class="dark" char="&#x000A;" align="right"
image="return" sound="keypress-return" weight="175"></kb-key>
image="return.png" sound="keypress-return" weight="175"></kb-key>
</kb-row>
<kb-row>
<kb-shift-key weight="105" align="left"></kb-shift-key>
......@@ -28,10 +28,11 @@
<kb-key class="dark">_</kb-key>
<kb-key class="dark" stretch>/</kb-key>
<kb-key char=" " class="space" sound="keypress-spacebar" weight="540">
English (US)
</kb-key>
<kb-key class="dark">,</kb-key>
<kb-key class="dark">.</kb-key>
<kb-hide-keyboard-key image="hide-keyboard" stretch weight="105">
<kb-hide-keyboard-key image="hide-keyboard.png" stretch weight="105">
</kb-hide-keyboard-key>
</kb-row>
<kb-altkey-container hidden>
......@@ -43,12 +44,12 @@
<kb-key-sequence keys="qwertyuiop" hintTexts="1234567890">
</kb-key-sequence>
<kb-key class="dark" char="&#x0008;" repeat stretch align="right"
image="backspace" sound="keypress-delete" weight="110"></kb-key>
image="backspace.png" sound="keypress-delete" weight="110"></kb-key>
</kb-row>
<kb-row align="right">
<kb-key-sequence keys="asdfghjkl"></kb-key-sequence>
<kb-key class="dark" char="&#x000A;" align="right"
image="return" sound="keypress-return" weight="175"></kb-key>
image="return.png" sound="keypress-return" weight="175"></kb-key>
</kb-row>
<kb-row>
<kb-shift-key weight="105" align="left"></kb-shift-key>
......@@ -61,10 +62,11 @@
<kb-key class="dark">-</kb-key>
<kb-key class="dark" stretch>/</kb-key>
<kb-key char=" " class="space" sound="keypress-spacebar" weight="540">
English (US)
</kb-key>
<kb-key class="dark">,</kb-key>
<kb-key class="dark">.</kb-key>
<kb-hide-keyboard-key image="hide-keyboard" stretch weight="105">
<kb-hide-keyboard-key image="hide-keyboard.png" stretch weight="105">
</kb-hide-keyboard-key>
</kb-row>
<kb-altkey-container hidden>
......@@ -74,13 +76,13 @@
<kb-keyset id="qwerty-symbol" pitch="10 20">
<kb-row>
<kb-key-sequence keys="1234567890"></kb-key-sequence>
<kb-key class="dark" char="&#x0008;" align="right" image="backspace"
<kb-key class="dark" char="&#x0008;" align="right" image="backspace.png"
repeat sound="keypress-delete" stretch weight="110"></kb-key>
</kb-row>
<kb-row align="right">
<kb-key-sequence keys="@#$%&-+()"></kb-key-sequence>
<kb-key class="dark" char="&#x000A;" align="right"
image="return" sound="keypress-return" weight="175"></kb-key>
image="return.png" sound="keypress-return" weight="175"></kb-key>
</kb-row>
<kb-row>
<kb-key class="dark" toKeyset="down:more" char="Invalid" align="center"
......@@ -94,10 +96,11 @@
<kb-key class="dark">_</kb-key>
<kb-key class="dark" stretch>/</kb-key>
<kb-key char=" " class="space" sound="keypress-spacebar" weight="540">
English (US)
</kb-key>
<kb-key class="dark">,</kb-key>
<kb-key class="dark">.</kb-key>
<kb-hide-keyboard-key image="hide-keyboard" stretch weight="105">
<kb-hide-keyboard-key image="hide-keyboard.png" stretch weight="105">
</kb-hide-keyboard-key>
</kb-row>
<kb-altkey-container hidden>
......@@ -109,7 +112,7 @@
<kb-key-sequence
keys="~`|&#x2022;&radic;&Pi;&divide;&times;&para;&Delta;">
</kb-key-sequence>
<kb-key class="dark" align="right" char="&#x0008;" image="backspace"
<kb-key class="dark" align="right" char="&#x0008;" image="backspace.png"
repeat sound="keypress-delete" stretch weight="110"></kb-key>
</kb-row>
<kb-row align="right">
......@@ -117,7 +120,7 @@
keys="&pound;&#x00A2;&#x20AC;&yen;^&deg;={}">
</kb-key-sequence>
<kb-key class="dark" char="&#x000A;" align="right"
image="return" sound="keypress-return" weight="175"></kb-key>
image="return.png" sound="keypress-return" weight="175"></kb-key>
</kb-row>
<kb-row>
<kb-key class="dark" toKeyset="down:symbol" char="Invalid"
......@@ -133,10 +136,11 @@
<kb-key class="dark">&lt;</kb-key>
<kb-key class="dark" stretch>&gt;</kb-key>
<kb-key char=" " class="space" sound="keypress-spacebar" weight="540">
English (US)
</kb-key>
<kb-key class="dark">,</kb-key>
<kb-key class="dark">.</kb-key>
<kb-hide-keyboard-key image="hide-keyboard" stretch weight="105">
<kb-hide-keyboard-key image="hide-keyboard.png" stretch weight="105">
</kb-hide-keyboard-key>
</kb-row>
</kb-keyset>
......
ui/keyboard/resources/layouts/system-qwerty.html
View file @ 07b8fe1c
......@@ -9,12 +9,12 @@
<kb-key-sequence invert=true keys="`1234567890-="
hintTexts="~!@#$%^&*()_+"> </kb-key-sequence>
<kb-key class="dark" char="&#x0008;" repeat align="right"
image="backspace" sound="keypress-delete" stretch weight="190">
image="backspace.png" sound="keypress-delete" stretch weight="190">
</kb-key>
</kb-row>
<kb-row align="left">
<kb-key class="dark" char="&#x0009;" align="center"
image="tab" weight="155"></kb-key>
image="tab.png" weight="155"></kb-key>
<kb-key-sequence keys="QWERTYUIOP"></kb-key-sequence>
<kb-key-sequence invert=true keys="[]\"
hintTexts="{}|"></kb-key-sequence>
......@@ -26,7 +26,7 @@
<kb-key-sequence invert=true keys=";&apos;" hintTexts=':"'>
</kb-key-sequence>
<kb-key class="dark" char="&#x000A;" align="right"
image="return" sound="keypress-return" stretch weight="170"></kb-key>
image="return.png" sound="keypress-return" stretch weight="170"></kb-key>
</kb-row>
<kb-row>
<kb-shift-key weight="265" align="left"></kb-shift-key>
......@@ -41,6 +41,7 @@
<kb-modifier-key class="dark" stretch weight="150" char="Alt"
align="left">alt</kb-modifier-key>
<kb-key char=" " class="space" sound="keypress-spacebar" weight="760">
English (US)
</kb-key>
<kb-key class="cursor dark" repeat char="Arrow-Left" image="left"
weight="75"> </kb-key>
......@@ -50,7 +51,7 @@
weight="75"> </kb-key>
<kb-key class="cursor dark" repeat char="Arrow-Right" image="right"
weight="75"></kb-key>
<kb-hide-keyboard-key image="hide-keyboard" stretch>
<kb-hide-keyboard-key image="hide-keyboard.png" stretch>
</kb-hide-keyboard-key>
</kb-row>
<kb-altkey-container hidden>
......@@ -62,12 +63,12 @@
<kb-key-sequence keys="`1234567890-=" hintTexts="~!@#$%^&*()_+">
</kb-key-sequence>
<kb-key class="dark" weight="190" char="&#x0008;"
image="backspace" repeat sound="keypress-delete" stretch
image="backspace.png" repeat sound="keypress-delete" stretch
align="right"></kb-key>
</kb-row>
<kb-row align="left">
<kb-key class="dark" char="&#x0009;" align="center"
image="tab" weight="155"></kb-key>
image="tab.png" weight="155"></kb-key>
<kb-key-sequence keys="qwertyuiop"></kb-key-sequence>
<kb-key-sequence keys="[]\" hintTexts="{}|"></kb-key-sequence>
</kb-row>
......@@ -77,7 +78,8 @@
<kb-key-sequence keys="asdfghjkl"></kb-key-sequence>
<kb-key-sequence keys=";&apos;" hintTexts=':"'></kb-key-sequence>
<kb-key class="dark" char="&#x000A;" align="right"
image="return" sound="keypress-return" stretch weight="170"></kb-key>
image="return.png" sound="keypress-return" stretch weight="170">
</kb-key>
</kb-row>
<kb-row>
<kb-shift-key weight="265" align="left"></kb-shift-key>
......@@ -91,6 +93,7 @@
<kb-modifier-key class="symbol dark" stretch weight="150" char="Alt"
align="left">alt</kb-modifier-key>
<kb-key char=" " sound="keypress-spacebar" class="space" weight="760">
English (US)
</kb-key>
<kb-key class="cursor dark" repeat char="Arrow-Left" image="left"
weight="75"> </kb-key>
......@@ -100,7 +103,7 @@
weight="75"> </kb-key>
<kb-key class="cursor dark" repeat char="Arrow-Right" image="right"
weight="75"></kb-key>
<kb-hide-keyboard-key image="hide-keyboard" stretch>
<kb-hide-keyboard-key image="hide-keyboard.png" stretch>
</kb-hide-keyboard-key>
</kb-row>
<kb-altkey-container hidden>
......
ui/keyboard/resources/main.css
View file @ 07b8fe1c
......@@ -34,11 +34,6 @@ kb-keyboard.caps-locked kb-shift-key.dark /deep/
background-color: rgba(0, 0, 255, 0.5);
}
kb-keyboard.ctrl-active kb-modifier-key[char=Ctrl],
kb-keyboard.ctrl-active kb-modifier-key[char=Ctrl] {
color: blue;
}
.space,
.dark {
font-size: 70%;
......@@ -50,5 +45,5 @@ kb-keyboard.ctrl-active kb-modifier-key[char=Ctrl] {
}
.space {
color: bbbbbb;
color: #bbbbbb;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment