From 465d0755c2648d4bd8c67042efdfa535f33e14f2 Mon Sep 17 00:00:00 2001 From: George Yatsev Date: Mon, 9 Jul 2018 17:28:55 +0200 Subject: [PATCH] changes to font size --- -f | 1 + nymea-app/ui/components/FancyHeader.qml | 8 ++++---- nymea-app/ui/components/GuhHeader.qml | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) create mode 160000 -f diff --git a/-f b/-f new file mode 160000 index 00000000..d91e9e5b --- /dev/null +++ b/-f @@ -0,0 +1 @@ +Subproject commit d91e9e5b81025acc4d25843a2871e72c8924a8fe diff --git a/nymea-app/ui/components/FancyHeader.qml b/nymea-app/ui/components/FancyHeader.qml index 432ab946..cc22e67e 100644 --- a/nymea-app/ui/components/FancyHeader.qml +++ b/nymea-app/ui/components/FancyHeader.qml @@ -28,9 +28,9 @@ ToolBar { Layout.fillHeight: true Layout.margins: app.margins verticalAlignment: Text.AlignVCenter - font.pixelSize: app.largeFont + font.pixelSize: app.mediumFont elide: Text.ElideRight - text: root.title + text: root.title.toLowerCase(); } HeaderButton { @@ -53,9 +53,9 @@ ToolBar { Layout.fillHeight: true Layout.margins: app.margins verticalAlignment: Text.AlignVCenter - font.pixelSize: app.largeFont + font.pixelSize: app.mediumFont elide: Text.ElideRight - text: qsTr("Menu") + text: qsTr("menu") } HeaderButton { diff --git a/nymea-app/ui/components/GuhHeader.qml b/nymea-app/ui/components/GuhHeader.qml index 41aea2ef..63c3daf2 100644 --- a/nymea-app/ui/components/GuhHeader.qml +++ b/nymea-app/ui/components/GuhHeader.qml @@ -38,9 +38,9 @@ ToolBar { Layout.fillWidth: true Layout.fillHeight: true verticalAlignment: Text.AlignVCenter - font.pixelSize: app.largeFont + font.pixelSize: app.mediumFont elide: Text.ElideRight - text: root.text.toUpperCase() + text: root.text.toLowerCase(); } } }