Ubuntu Music App

Merge lp:~ahayzen/music-app/remix-remove-blurred-background into lp:music-app/remix

  1. remix-remove-blurred-background
  2. Merge into remix
Proposed by Andrew Hayzen
Status: Merged
Approved by: Victor Thompson
Approved revision: 641
Merge reported by: Victor Thompson
Merged at revision: not available
Proposed branch: lp:~ahayzen/music-app/remix-remove-blurred-background
Merge into: lp:music-app/remix
Diff against target: 52 lines (+4/-9)
3 files modified
Style.qml (+1/-1)
common/BlurredBackground.qml (+1/-1)
music-app.qml (+2/-7)
To merge this branch: bzr merge lp:~ahayzen/music-app/remix-remove-blurred-background
Reviewer Review Type Date Requested Status
Victor Thompson Approve
Review via email: mp+236256@code.launchpad.net

Description of the change

* Remove blurred background

I know a few of the labels in certain places don't have the correct colour, but we sort them when we go over each page?

To post a comment you must log in.
Revision history for this message
Victor Thompson (vthompson) wrote :

Only one inline comment, otherwise looks as expected! Thanks!

review: Needs Fixing
Revision history for this message
Victor Thompson (vthompson) wrote :

LGTM!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Style.qml'
2--- Style.qml 2014-09-20 10:50:45 +0000
3+++ Style.qml 2014-09-30 01:04:44 +0000
4@@ -34,7 +34,7 @@
5 property QtObject common: QtObject {
6 property color black: "#000000";
7 property color white: "#FFFFFF";
8- property color music: "#333333";
9+ property color music: "#FFFFFF";
10 property color subtitle: "#666666";
11 property color expandedColor: "#000000";
12 property int albumSize: units.gu(10);
13
14=== modified file 'common/BlurredBackground.qml'
15--- common/BlurredBackground.qml 2014-09-20 15:41:33 +0000
16+++ common/BlurredBackground.qml 2014-09-30 01:04:44 +0000
17@@ -24,7 +24,7 @@
18 // Blurred background
19 Rectangle {
20 anchors.fill: parent
21- property string art: player.currentMetaFile === "" ? Qt.resolvedUrl("../images/music-app-cover@30.png") : player.currentMetaArt
22+ property string art // : player.currentMetaFile === "" ? Qt.resolvedUrl("../images/music-app-cover@30.png") : player.currentMetaArt
23
24 // the album art
25 Image {
26
27=== modified file 'music-app.qml'
28--- music-app.qml 2014-09-23 15:59:28 +0000
29+++ music-app.qml 2014-09-30 01:04:44 +0000
30@@ -40,9 +40,8 @@
31 id: mainView
32 useDeprecatedToolbar: false
33
34- // Use toolbar color for header
35- headerColor: styleMusic.toolbar.fullBackgroundColor
36- backgroundColor: styleMusic.toolbar.fullBackgroundColor
37+ backgroundColor: "#1e1e23"
38+ headerColor: "#1e1e23"
39
40 // Global keyboard shortcuts
41 focus: true
42@@ -867,10 +866,6 @@
43 id: searchSheet
44 }
45
46- // Blurred background
47- BlurredBackground {
48- }
49-
50 // Popover for tracks, queue and add to playlist, for example
51 Component {
52 id: trackPopoverComponent

Subscribers

People subscribed via source and target branches