Merge lp:~stolowski/unity-scope-click/ubuntu-logo into lp:unity-scope-click/devel

Proposed by Paweł Stołowski
Status: Rejected
Rejected by: Alejandro J. Cura
Proposed branch: lp:~stolowski/unity-scope-click/ubuntu-logo
Merge into: lp:unity-scope-click/devel
Diff against target: 25 lines (+2/-1)
2 files modified
data/CMakeLists.txt (+1/-1)
data/clickscope.ini.in.in (+1/-0)
To merge this branch: bzr merge lp:~stolowski/unity-scope-click/ubuntu-logo
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Alejandro J. Cura (community) Needs Resubmitting
Review via email: mp+230472@code.launchpad.net

Commit message

Display Ubuntu logo in the header of apps scope.

Description of the change

Display Ubuntu logo in the header of apps scope.

To post a comment you must log in.
Revision history for this message
Alejandro J. Cura (alecu) wrote :

The png has to be 135px high, and this file has gray dots inside the circle of friends.

> +PageHeader.Background=color:///#FFFFFF

Why white? In the designs I can see the texturized grayish background showing thru, so I think this line is not needed, or it should be somehow set to "transparent".

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
398. By Paweł Stołowski

Don't specify background.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
399. By Paweł Stołowski

Updated logo.

400. By Paweł Stołowski

Merged devel.

Revision history for this message
Alejandro J. Cura (alecu) wrote :

I've tried this on the phone, and it looks too big.
So I'm adding some more spacing and will re-propose this branch.

review: Needs Resubmitting
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Unmerged revisions

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-08-11 19:08:16 +0000
3+++ data/CMakeLists.txt 2014-08-19 15:59:25 +0000
4@@ -35,7 +35,7 @@
5 )
6
7 install(
8- FILES clickscope-screenshot.jpg apps-scope.png
9+ FILES clickscope-screenshot.jpg apps-scope.png ubuntu-logo.png
10 DESTINATION "${APPS_DATA_DIR}"
11 )
12
13
14=== modified file 'data/clickscope.ini.in.in'
15--- data/clickscope.ini.in.in 2014-08-07 13:30:34 +0000
16+++ data/clickscope.ini.in.in 2014-08-19 15:59:25 +0000
17@@ -7,4 +7,5 @@
18 _SearchHint=Search apps
19
20 [Appearance]
21+PageHeader.Logo=@APPS_DATA_DIR@/ubuntu-logo.png
22 LogoOverlayColor=#ffffffff
23
24=== added file 'data/ubuntu-logo.png'
25Binary files data/ubuntu-logo.png 1970-01-01 00:00:00 +0000 and data/ubuntu-logo.png 2014-08-19 15:59:25 +0000 differ

Subscribers

People subscribed via source and target branches

to all changes: