diff options
| author | Niels Weber <niels.weber@digia.com> | 2014-10-16 08:11:03 +0200 |
|---|---|---|
| committer | Niels Weber <niels.weber@digia.com> | 2014-10-16 09:49:12 +0200 |
| commit | b79471f393abe2e9e3fa1c4dfc61e0f19fb8cf9b (patch) | |
| tree | 7ec859ab9b393eba01607788f6aea790c2914975 | |
| parent | d96a2ad916ea85488834e21c3848b63727380473 (diff) | |
Home screen gets same font size as Presentation Details
Change-Id: I483056d24b79563fa99ac2fa68cda86299439e6d
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
| -rw-r--r-- | qml/components/HomeScreen.qml | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/qml/components/HomeScreen.qml b/qml/components/HomeScreen.qml index e52a1b9..cb189ee 100644 --- a/qml/components/HomeScreen.qml +++ b/qml/components/HomeScreen.qml @@ -134,6 +134,7 @@ Rectangle { } Text { + // upcoming events title id: labelUpcoming text: Theme.text.upcoming.arg(applicationClient.currentConferenceDetails.title).arg(upcomingItem.visibleDate) width: parent.width @@ -175,6 +176,7 @@ Rectangle { } } ListView { + // upcoming events list id: homeScreenListView anchors.top: labelUpcoming.bottom anchors.bottom: parent.bottom @@ -219,7 +221,8 @@ Rectangle { color: Theme.colors.white verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft - font.pointSize: Theme.fonts.six_pt + font.pointSize: Theme.fonts.eight_pt + } } Rectangle { @@ -242,14 +245,15 @@ Rectangle { text: topic verticalAlignment: Text.AlignVCenter elide: Text.ElideRight - font.pointSize: Theme.fonts.seven_pt + font.pointSize: Theme.fonts.eight_pt } Text { Layout.fillWidth: true text: Qt.formatTime(start, Qt.locale().timeFormat(Locale.ShortFormat)) + Theme.text.room_space.arg(location) verticalAlignment: Text.AlignVCenter elide: Text.ElideRight - font.pointSize: Theme.fonts.seven_pt + font.pointSize: Theme.fonts.eight_pt + color: Theme.colors.gray } } @@ -392,7 +396,8 @@ Rectangle { anchors.leftMargin: Theme.margins.ten anchors.bottom: parent.bottom text: "@" + model.user.screen_name - font.pointSize: Theme.fonts.seven_pt + font.pointSize: Theme.fonts.eight_pt + color: Theme.colors.gray textFormat: Text.StyledText MouseArea { @@ -407,7 +412,7 @@ Rectangle { anchors.rightMargin: Theme.margins.ten anchors.bottom: parent.bottom text: getElapsedTime() - font.pointSize: Theme.fonts.seven_pt + font.pointSize: Theme.fonts.eight_pt color: Theme.colors.gray textFormat: Text.StyledText MouseArea { @@ -451,7 +456,7 @@ Rectangle { text: insertLinks(model.text, model.entities) wrapMode: Text.WordWrap textFormat: Text.RichText - font.pointSize: Theme.fonts.seven_pt + font.pointSize: Theme.fonts.eight_pt color: Theme.colors.gray onLinkActivated: Qt.openUrlExternally(link) MouseArea { |