Merge lp:~vthompson/music-app/align-last-slide-text into lp:music-app/remix

Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 801
Merged at revision: 801
Proposed branch: lp:~vthompson/music-app/align-last-slide-text
Merge into: lp:music-app/remix
Diff against target: 43 lines (+4/-4)
2 files modified
common/Walkthrough/Slide3.qml (+2/-2)
common/Walkthrough/Walkthrough.qml (+2/-2)
To merge this branch: bzr merge lp:~vthompson/music-app/align-last-slide-text
Reviewer Review Type Date Requested Status
Andrew Hayzen Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+247147@code.launchpad.net

Commit message

* Align the text on the last slide of the walkthrough
* Make the ellipses a bit smaller
* Change the "Skip" text to white

Description of the change

* Align the text on the last slide of the walkthrough
* Make the ellipses a bit smaller
* Change the "Skip" text to white

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

LGTM :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'common/Walkthrough/Slide3.qml'
2--- common/Walkthrough/Slide3.qml 2015-01-20 05:05:57 +0000
3+++ common/Walkthrough/Slide3.qml 2015-01-21 14:08:29 +0000
4@@ -55,7 +55,7 @@
5 id: finalMessage
6 anchors {
7 bottom: continueButton.top
8- bottomMargin: units.gu(4)
9+ bottomMargin: units.gu(7)
10 }
11 fontSize: "large"
12 horizontalAlignment: Text.AlignHLeft
13@@ -68,7 +68,7 @@
14 id: continueButton
15 anchors {
16 bottom: parent.bottom
17- bottomMargin: units.gu(4)
18+ bottomMargin: units.gu(3)
19 horizontalCenter: parent.horizontalCenter
20 }
21 color: UbuntuColors.green
22
23=== modified file 'common/Walkthrough/Walkthrough.qml'
24--- common/Walkthrough/Walkthrough.qml 2015-01-19 17:13:12 +0000
25+++ common/Walkthrough/Walkthrough.qml 2015-01-21 14:08:29 +0000
26@@ -75,7 +75,7 @@
27 Label {
28 id: skipLabel
29
30- color: "grey"
31+ color: "white"
32 fontSize: "medium"
33 objectName: "skipLabel"
34 width: contentWidth
35@@ -110,7 +110,7 @@
36 antialiasing: true
37 height: width
38 source: listView.currentIndex == index ? "../../images/Ellipse@27.png" : "../../images/Ellipse_15_opacity@27.png"
39- width: units.gu(2)
40+ width: units.gu(1.5)
41 }
42 }
43 }

Subscribers

People subscribed via source and target branches