Merge lp:~vthompson/ubuntu-weather-app/reboot-white-bg into lp:ubuntu-weather-app

Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 34
Merged at revision: 34
Proposed branch: lp:~vthompson/ubuntu-weather-app/reboot-white-bg
Merge into: lp:ubuntu-weather-app
Diff against target: 32 lines (+10/-1)
2 files modified
app/ui/HomePage.qml (+9/-0)
po/com.ubuntu.weather.pot (+1/-1)
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/reboot-white-bg
Reviewer Review Type Date Requested Status
Andrew Hayzen Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+256762@code.launchpad.net

Commit message

* Add a white background to the PageWithBottomEdge

Description of the change

* Add a white background to the PageWithBottomEdge

This was done outside of the PageWithBottomEdge component to make it easier to sync changes from upstream.

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, the home page now has a white background :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/ui/HomePage.qml'
2--- app/ui/HomePage.qml 2015-03-18 00:05:43 +0000
3+++ app/ui/HomePage.qml 2015-04-19 21:12:57 +0000
4@@ -78,6 +78,15 @@
5 }
6
7 /*
8+ Background for the PageWithBottomEdge
9+ */
10+ Rectangle {
11+ id: pageBackground
12+ anchors.fill: parent
13+ color: "white"
14+ }
15+
16+ /*
17 Flickable to scroll the location vertically.
18 The respective contentHeight gets calculated after the Location is filled with data.
19 */
20
21=== modified file 'po/com.ubuntu.weather.pot'
22--- po/com.ubuntu.weather.pot 2015-04-11 00:27:59 +0000
23+++ po/com.ubuntu.weather.pot 2015-04-19 21:12:57 +0000
24@@ -8,7 +8,7 @@
25 msgstr ""
26 "Project-Id-Version: ubuntu-weather-app\n"
27 "Report-Msgid-Bugs-To: \n"
28-"POT-Creation-Date: 2015-04-11 02:27+0200\n"
29+"POT-Creation-Date: 2015-04-19 16:08-0500\n"
30 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
31 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
32 "Language-Team: LANGUAGE <LL@li.org>\n"

Subscribers

People subscribed via source and target branches

to all changes: