Merge lp:~schwann/ubuntu-keyboard/keyboard-1-2-key-size into lp:ubuntu-keyboard

[Günter Schwann]

Use smaller font for 1/2 and 2/2 key fixes LP: #1227225

Use smaller font for 1/2 and 2/2 key fixes LP: #1227225

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:49
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/116/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-amd64-ci/117
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/116
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/116/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-i386-ci/116

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-keyboard-ci/116/rebuild

review: Approve (continuous-integration)

[Thomas Moenicke (thomas-moenicke)]

looks good

review: Approve

=== modified file 'qml/languages/Keyboard_symbols.qml'
--- qml/languages/Keyboard_symbols.qml	2013-09-11 12:56:54 +0000
+++ qml/languages/Keyboard_symbols.qml	2013-09-30 12:38:04 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.0
 import "../keys"
+import "../keys/key_constants.js" as UI
 
 KeyPad {
     anchors.fill: parent
@@ -67,7 +68,7 @@
             anchors.margins: 50;
             spacing: 0
 
-            OneTwoKey { label: "1/2"; shifted: "2/2"; fontSize: units.gu(3); }
+            OneTwoKey { label: "1/2"; shifted: "2/2"; fontSize: units.gu(UI.fontSize); }
             CharKey { label: "@"; shifted: "«"; }
             CharKey { label: "~"; shifted: "»"; }
             CharKey { label: "/"; shifted: "¨"; }