Merge lp:~mardy/ubuntu-system-settings-online-accounts/placeholder-1289433 into lp:ubuntu-system-settings-online-accounts

Proposed by Alberto Mardegan on 2015-11-12
Status: Merged
Approved by: David Barth on 2015-12-03
Approved revision: 309
Merged at revision: 317
Proposed branch: lp:~mardy/ubuntu-system-settings-online-accounts/placeholder-1289433
Merge into: lp:ubuntu-system-settings-online-accounts
Diff against target: 36 lines (+5/-2)
2 files modified
system-settings-plugin/MainPage.qml (+2/-2)
system-settings-plugin/NoAccountsPage.qml (+3/-0)
To merge this branch: bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/placeholder-1289433
Reviewer Review Type Date Requested Status
David Barth (community) 2015-11-12 Approve on 2015-11-16
PS Jenkins bot (community) continuous-integration Needs Fixing on 2015-11-12
Review via email: mp+277314@code.launchpad.net

Commit message

Fix label style and page scrolling

Description of the change

Fix label style and page scrolling

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'system-settings-plugin/MainPage.qml'
2--- system-settings-plugin/MainPage.qml 2015-10-22 08:33:20 +0000
3+++ system-settings-plugin/MainPage.qml 2015-11-12 08:13:32 +0000
4@@ -31,7 +31,7 @@
5
6 title: i18n.dtr(domain, "Accounts")
7
8- property Item flickable: accountsPage.visible ? accountsPage : noAccountsPage
9+ flickable: accountsPage.visible ? accountsPage : noAccountsPage
10
11 AccountServiceModel {
12 id: accountsModel
13@@ -50,6 +50,6 @@
14 id: noAccountsPage
15 anchors.fill: parent
16 accountsModel: accountsModel
17- visible:!accountsPage.visible
18+ visible: !accountsPage.visible
19 }
20 }
21
22=== modified file 'system-settings-plugin/NoAccountsPage.qml'
23--- system-settings-plugin/NoAccountsPage.qml 2015-10-22 08:33:20 +0000
24+++ system-settings-plugin/NoAccountsPage.qml 2015-11-12 08:13:32 +0000
25@@ -34,8 +34,11 @@
26 ListItem.Base {
27 Label {
28 text: i18n.dtr(domain, "No accounts")
29+ color: theme.palette.normal.backgroundText
30+ fontSize: "large"
31 anchors.centerIn: parent
32 }
33+ showDivider: false
34 }
35
36 AddAccountLabel {}

Subscribers

People subscribed via source and target branches