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
=== modified file 'common/Walkthrough/Slide3.qml'
--- common/Walkthrough/Slide3.qml 2015-01-20 05:05:57 +0000
+++ common/Walkthrough/Slide3.qml 2015-01-21 14:08:29 +0000
@@ -55,7 +55,7 @@
55 id: finalMessage55 id: finalMessage
56 anchors {56 anchors {
57 bottom: continueButton.top57 bottom: continueButton.top
58 bottomMargin: units.gu(4)58 bottomMargin: units.gu(7)
59 }59 }
60 fontSize: "large"60 fontSize: "large"
61 horizontalAlignment: Text.AlignHLeft61 horizontalAlignment: Text.AlignHLeft
@@ -68,7 +68,7 @@
68 id: continueButton68 id: continueButton
69 anchors {69 anchors {
70 bottom: parent.bottom70 bottom: parent.bottom
71 bottomMargin: units.gu(4)71 bottomMargin: units.gu(3)
72 horizontalCenter: parent.horizontalCenter72 horizontalCenter: parent.horizontalCenter
73 }73 }
74 color: UbuntuColors.green74 color: UbuntuColors.green
7575
=== modified file 'common/Walkthrough/Walkthrough.qml'
--- common/Walkthrough/Walkthrough.qml 2015-01-19 17:13:12 +0000
+++ common/Walkthrough/Walkthrough.qml 2015-01-21 14:08:29 +0000
@@ -75,7 +75,7 @@
75 Label {75 Label {
76 id: skipLabel76 id: skipLabel
7777
78 color: "grey"78 color: "white"
79 fontSize: "medium"79 fontSize: "medium"
80 objectName: "skipLabel"80 objectName: "skipLabel"
81 width: contentWidth81 width: contentWidth
@@ -110,7 +110,7 @@
110 antialiasing: true110 antialiasing: true
111 height: width111 height: width
112 source: listView.currentIndex == index ? "../../images/Ellipse@27.png" : "../../images/Ellipse_15_opacity@27.png"112 source: listView.currentIndex == index ? "../../images/Ellipse@27.png" : "../../images/Ellipse_15_opacity@27.png"
113 width: units.gu(2)113 width: units.gu(1.5)
114 }114 }
115 }115 }
116 }116 }

Subscribers

People subscribed via source and target branches