unity-scope-click

Merge lp:~alecu/unity-scope-click/revert-header-image into lp:unity-scope-click

  1. revert-header-image
  2. Merge into trunk
Proposed by Alejandro J. Cura
Status: Merged
Approved by: Alejandro J. Cura
Approved revision: 294
Merged at revision: 294
Proposed branch: lp:~alecu/unity-scope-click/revert-header-image
Merge into: lp:unity-scope-click
Diff against target: 41 lines (+2/-4)
3 files modified
data/CMakeLists.txt (+2/-2)
data/clickscope.ini.in.in (+0/-1)
data/com.canonical.scopes.clickstore.ini.in.in (+0/-1)
To merge this branch: bzr merge lp:~alecu/unity-scope-click/revert-header-image
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
dobey (community) Approve
Review via email: mp+240049@code.launchpad.net

Commit message

Remove the background image used in the scope headers

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:294
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/544/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4228/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-amd64-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/84
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/84/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3585/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4608
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4608/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/544/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/CMakeLists.txt'
2--- data/CMakeLists.txt 2014-10-07 13:04:15 +0000
3+++ data/CMakeLists.txt 2014-10-29 19:41:56 +0000
4@@ -30,12 +30,12 @@
5 )
6
7 install(
8- FILES clickscope-screenshot.jpg ubuntu-store-scope.png store-scope-icon.svg paper-white-bg-v2.png
9+ FILES clickscope-screenshot.jpg ubuntu-store-scope.png store-scope-icon.svg
10 DESTINATION "${STORE_DATA_DIR}"
11 )
12
13 install(
14- FILES clickscope-screenshot.jpg apps-scope.png ubuntu-logo.png paper-white-bg-v2.png
15+ FILES clickscope-screenshot.jpg apps-scope.png ubuntu-logo.png
16 DESTINATION "${APPS_DATA_DIR}"
17 )
18
19
20=== modified file 'data/clickscope.ini.in.in'
21--- data/clickscope.ini.in.in 2014-10-07 13:04:15 +0000
22+++ data/clickscope.ini.in.in 2014-10-29 19:41:56 +0000
23@@ -8,5 +8,4 @@
24
25 [Appearance]
26 PageHeader.Logo=@APPS_DATA_DIR@/ubuntu-logo.png
27-PageHeader.Background=@APPS_DATA_DIR@/paper-white-bg-v2.png
28 LogoOverlayColor=#ffffffff
29
30=== modified file 'data/com.canonical.scopes.clickstore.ini.in.in'
31--- data/com.canonical.scopes.clickstore.ini.in.in 2014-10-07 13:22:12 +0000
32+++ data/com.canonical.scopes.clickstore.ini.in.in 2014-10-29 19:41:56 +0000
33@@ -7,5 +7,4 @@
34 _SearchHint=Search store
35
36 [Appearance]
37-PageHeader.Background=@STORE_DATA_DIR@/paper-white-bg-v2.png
38 LogoOverlayColor=#26000000
39
40=== removed file 'data/paper-white-bg-v2.png'
41Binary files data/paper-white-bg-v2.png 2014-10-07 13:04:15 +0000 and data/paper-white-bg-v2.png 1970-01-01 00:00:00 +0000 differ

Subscribers

People subscribed via source and target branches