← Back to branch summary

~mihirsoni/ubuntu-calendar-app/1291906

« back to all changes in this revision

Viewing changes to TimeLineHeaderComponent.qml

  • Committer: Kunal Parmar
  • Date: 2014-05-24 07:00:58 UTC
  • mfrom: (297 ubuntu-calendar-app)
  • mto: This revision was merged to the branch mainline in revision 312.
  • Revision ID: pkunal.parmar@gmail.com-20140524070058-huxlv1g6uflil4f9
merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
TimeLineHeaderComponent.qml
32
32
 
33
33
            dateColor: {
34
34
                if( type == ViewType.ViewTypeWeek && date.isSameDay(DateExt.today())){
35
 
                    "white"
36
 
                } else if( type == ViewType.ViewTypeDay && root.isCurrentItem ) {
37
 
                    "white"
 
35
                    "#5D5D5D"
 
36
                } else if( type == ViewType.ViewTypeDay && header.isCurrentItem ) {
 
37
                    "#5D5D5D"
38
38
                } else {
39
39
                    "#AEA79F"
40
40
                }