Merge lp:~martin-borho/ubuntu-weather-app/ScrollingBottomMarginAndGradientColorScheme into lp:ubuntu-weather-app/obsolete.trunk

[Martin Borho]

Added bottom margin to scrolling area in tabs and moved warm colors up the gradient color scheme

* added bottom margin to scrolling area in tabs (less interference with the toolbar)
* moved warm colors up the gradient color scheme

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:117
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/46/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/402
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/44
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/44
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/44
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/44

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/46/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

Looks good to me, thanks!

review: Approve

=== modified file 'components/CurrentWeather.qml'
--- components/CurrentWeather.qml	2013-09-14 11:46:25 +0000
+++ components/CurrentWeather.qml	2013-09-17 18:20:00 +0000
@@ -45,6 +45,7 @@
                 height: parent.height-units.gu(9.5)
                 width:parent.width
                 anchors.bottom: parent.bottom
+                anchors.bottomMargin: units.gu(2)
                 onClicked: {
                     mouse.accepted = true;
                     if(!wasHourlyScrolled) {

=== modified file 'components/GradientsMap.js'
--- components/GradientsMap.js	2013-08-28 13:55:53 +0000
+++ components/GradientsMap.js	2013-09-17 18:20:00 +0000
@@ -46,6 +46,8 @@
 }
 
 var getGradients = function(celsius) {
+    // move warm colors up
+    celsius -= 8
     // stay in range
     if(celsius < -30) celsius = -30;
     else if(celsius > 40) celsius = 40;