[Merge] lp:~gcollura/content-hub/fix-1384490 into lp:content-hub

[Michael Sheldon]

Review: Needs Fixing

I think it's best if we pick up the colour from the Theme palette as this is how the developer should be customising colour throughout the app, however I think we need to do some extra things to match the way the UITK uses these properties, I'll have a bit of look into this and get back to you on what I find.

Aside from that it looks like you've got a couple of typos for Qt.rgba listed as Qt.rbga (g and b switched around), so dark layouts still get the white background. However, with these corrected the apps box for light backgrounds becomes gray, so we might need to think about that a bit more.

Diff comments:

> === modified file 'import/Ubuntu/Content/ContentPeerPicker10.qml'
> --- import/Ubuntu/Content/ContentPeerPicker10.qml	2014-10-10 15:28:39 +0000
> +++ import/Ubuntu/Content/ContentPeerPicker10.qml	2014-10-30 19:04:31 +0000
> @@ -40,7 +40,7 @@
>  
>      Rectangle {
>          anchors.fill: parent
> -        color: Theme.palette.normal.overlay
> +        color: Theme.palette.normal.background
>      }
>  
>      Header {
> @@ -160,7 +160,7 @@
>  
>      Rectangle {
>          id: apps
> -        color: "#FFFFFF"
> +        color: Qt.rbga(0.6, 0.6, 0.6, 0.1)

Should be rgba

>          clip: true
>          anchors {
>              left: parent.left
> 
> === modified file 'import/Ubuntu/Content/ContentPeerPicker11.qml'
> --- import/Ubuntu/Content/ContentPeerPicker11.qml	2014-10-10 15:28:39 +0000
> +++ import/Ubuntu/Content/ContentPeerPicker11.qml	2014-10-30 19:04:31 +0000
> @@ -41,7 +41,7 @@
>  
>      Rectangle {
>          anchors.fill: parent
> -        color: Theme.palette.normal.overlay
> +        color: Theme.palette.normal.background
>      }
>  
>      Header {
> @@ -177,7 +177,7 @@
>  
>      Rectangle {
>          id: apps
> -        color: "#FFFFFF"
> +        color: Qt.rbga(0.6, 0.6, 0.6, 0.1)

Should be rgba

>          clip: true
>          anchors {
>              left: parent.left
> 


-- 
https://code.launchpad.net/~gcollura/content-hub/fix-1384490/+merge/240156
Your team Ubuntu Phablet Team is subscribed to branch lp:content-hub.