Merge lp:~mardy/ubuntu-system-settings-online-accounts/auth-scrolling-1561031 into lp:ubuntu-system-settings-online-accounts

Proposed by Alberto Mardegan
Status: Merged
Approved by: David Barth
Approved revision: 342
Merged at revision: 345
Proposed branch: lp:~mardy/ubuntu-system-settings-online-accounts/auth-scrolling-1561031
Merge into: lp:ubuntu-system-settings-online-accounts
Diff against target: 21 lines (+4/-0)
1 file modified
online-accounts-ui/qml/AuthorizationPage.qml (+4/-0)
To merge this branch: bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/auth-scrolling-1561031
Reviewer Review Type Date Requested Status
Online Accounts Pending
Review via email: mp+290039@code.launchpad.net

Commit message

Enable scrolling in authorization page.

Description of the change

Enable scrolling in authorization page.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'online-accounts-ui/qml/AuthorizationPage.qml'
2--- online-accounts-ui/qml/AuthorizationPage.qml 2016-02-18 09:29:27 +0000
3+++ online-accounts-ui/qml/AuthorizationPage.qml 2016-03-24 14:06:04 +0000
4@@ -32,6 +32,9 @@
5 signal denied
6 signal createAccount
7
8+ anchors.fill: parent
9+ contentHeight: bottomColumn.y + bottomColumn.height + bottomColumn.anchors.margins
10+
11 Column {
12 id: topColumn
13 anchors.left: parent.left
14@@ -113,6 +116,7 @@
15 }
16
17 Column {
18+ id: bottomColumn
19 anchors.top: topColumn.bottom
20 anchors.margins: units.gu(2)
21 anchors.left: parent.left

Subscribers

People subscribed via source and target branches