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

Proposed by Alberto Mardegan
Status: Merged
Approved by: David Barth
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) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
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

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
David Barth (dbarth) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'system-settings-plugin/MainPage.qml'
--- system-settings-plugin/MainPage.qml 2015-10-22 08:33:20 +0000
+++ system-settings-plugin/MainPage.qml 2015-11-12 08:13:32 +0000
@@ -31,7 +31,7 @@
3131
32 title: i18n.dtr(domain, "Accounts")32 title: i18n.dtr(domain, "Accounts")
3333
34 property Item flickable: accountsPage.visible ? accountsPage : noAccountsPage34 flickable: accountsPage.visible ? accountsPage : noAccountsPage
3535
36 AccountServiceModel {36 AccountServiceModel {
37 id: accountsModel37 id: accountsModel
@@ -50,6 +50,6 @@
50 id: noAccountsPage50 id: noAccountsPage
51 anchors.fill: parent51 anchors.fill: parent
52 accountsModel: accountsModel52 accountsModel: accountsModel
53 visible:!accountsPage.visible53 visible: !accountsPage.visible
54 }54 }
55}55}
5656
=== modified file 'system-settings-plugin/NoAccountsPage.qml'
--- system-settings-plugin/NoAccountsPage.qml 2015-10-22 08:33:20 +0000
+++ system-settings-plugin/NoAccountsPage.qml 2015-11-12 08:13:32 +0000
@@ -34,8 +34,11 @@
34 ListItem.Base {34 ListItem.Base {
35 Label {35 Label {
36 text: i18n.dtr(domain, "No accounts")36 text: i18n.dtr(domain, "No accounts")
37 color: theme.palette.normal.backgroundText
38 fontSize: "large"
37 anchors.centerIn: parent39 anchors.centerIn: parent
38 }40 }
41 showDivider: false
39 }42 }
4043
41 AddAccountLabel {}44 AddAccountLabel {}

Subscribers

People subscribed via source and target branches