Merge lp:~doflah/ubuntu-calendar-app/ubuntu-calendar-app into lp:ubuntu-calendar-app

[Dennis O'Flaherty]

Color the padding dates in each month of the YearView gray to match the style of the MonthView.

Color the padding dates in each month of the YearView gray to match the style of the MonthView. It's a small change but it is combination of making things consistent and testing out the commit/merge proposal process.

[Olivier Tilloy (osomon)]

Looks good!
Note that there are new visual designs for all the views, which Kunal is currently working on. The year view, in particular, is being revamped. Still, this change makes sense in the meantime.

review: Approve

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

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~dennis-oflaherty/ubuntu-calendar-app/ubuntu-calendar-app/+merge/183554/+edit-commit-message

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/10/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/166
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-autolanding/10
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-autolanding/10
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/10
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/10

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/11/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/169
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-autolanding/11
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-autolanding/11
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/11
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/11

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'MonthComponent.qml'
--- MonthComponent.qml	2013-08-10 06:06:18 +0000
+++ MonthComponent.qml	2013-09-03 01:07:15 +0000
@@ -73,13 +73,14 @@
 
             property var day: parent.monthStart.addDays(index)
             property var isToday: day.isSameDay(intern.now)
+            property bool isPaddingDate: day.getMonth() != root.date.getMonth()
 
             text: day.getDate()
             horizontalAlignment: Text.AlignHCenter
             width: dummy.width
             height: dummy.height
             font.pointSize: dummy.font.pointSize
-            color: isToday ? Color.ubuntuOrange : dummy.color
+            color: isToday ? Color.ubuntuOrange : (isPaddingDate ? Color.warmGrey : dummy.color)
             scale: isToday ? 1.5 : 1.
         }
     }