Merge lp:~sladen/unity-asset-pool/unity-asset-pool-icons-lp745555 into lp:unity-asset-pool

Proposed by Paul Sladen on 2011-04-12
Status: Merged
Merged at revision: 50
Proposed branch: lp:~sladen/unity-asset-pool/unity-asset-pool-icons-lp745555
Merge into: lp:unity-asset-pool
Diff against target: 42 lines (+11/-1)
1 file modified
unity-icon-theme/index.theme (+11/-1)
To merge this branch: bzr merge lp:~sladen/unity-asset-pool/unity-asset-pool-icons-lp745555
Reviewer Review Type Date Requested Status
Paul Sladen Resubmit on 2011-04-12
Didier Roche 2011-04-12 Pending
Review via email: mp+57307@code.launchpad.net

This proposal supersedes a proposal from 2011-04-11.

Description of the change

Glad the extra rename meta-data was useful rather than a delete/create :)

Resubmitting per-IRC since that's what's available.

Didrocks: I should note that in the massive-asset-dump there were 62 icons with no hint as to which ones actually needed replacing. If (in your opinion) the change between before and after is indistinguishable/imperceivable then there's a the opinion not to ship it on the basis that no "diff" of the priority changes was provided with the dump.

To post a comment you must log in.
Didier Roche (didrocks) wrote : Posted in a previous version of this proposal

renamed file 'unity-icon-theme/places/svg/group-mostused.svg' => 'unity-icon-theme/places/22/group-mostused.png'

All that will make a lot of changes in the places, change which should be coordinated and such.

Please, repropose a merge for the other contents (launcher/tile_arrow.png, panel/divider.png, unity-icon-theme/apps/48/workspace-switcher.png and unity-icon-theme/places/48/user-trash*) without those changes

review: Disapprove
51. By Paul Sladen on 2011-04-12

revert -r49 unity-icon-theme/places/svg/group-*.svg per IRC

Paul Sladen (sladen) :
review: Disapprove
Paul Sladen (sladen) wrote :

bzr revert -r49 unity-icon-theme/places/svg/group-*.svg per IRC

review: Resubmit
Didier Roche (didrocks) wrote : Posted in a previous version of this proposal

ok, launchpad is laggy to refresh the merge, taking the branch, all looks good now :) thanks Paul!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'launcher/tile_arrow.png'
2Binary files launcher/tile_arrow.png 2010-08-16 11:51:34 +0000 and launcher/tile_arrow.png 2011-04-12 11:43:34 +0000 differ
3=== modified file 'panel/divider.png'
4Binary files panel/divider.png 2010-09-13 14:53:28 +0000 and panel/divider.png 2011-04-12 11:43:34 +0000 differ
5=== added directory 'unity-icon-theme/apps/48'
6=== added file 'unity-icon-theme/apps/48/workspace-switcher.png'
7Binary files unity-icon-theme/apps/48/workspace-switcher.png 1970-01-01 00:00:00 +0000 and unity-icon-theme/apps/48/workspace-switcher.png 2011-04-12 11:43:34 +0000 differ
8=== modified file 'unity-icon-theme/index.theme'
9--- unity-icon-theme/index.theme 2010-08-31 13:32:29 +0000
10+++ unity-icon-theme/index.theme 2011-04-12 11:43:34 +0000
11@@ -6,7 +6,12 @@
12 Example=directory-x-normal
13
14 #Directory list
15-Directories=apps/128,places/22,search/16,web/48
16+Directories=apps/48,apps/128,places/22,places/48,places/svg,search/16,web/48
17+
18+[apps/48]
19+Size=48
20+Context=Apps
21+Type=Fixed
22
23 [apps/128]
24 Size=128
25@@ -23,6 +28,11 @@
26 Context=Places
27 Type=Scalable
28
29+[places/48]
30+Size=48
31+Context=Places
32+Type=Fixed
33+
34 [search/16]
35 Size=16
36 Context=Search
37
38=== added directory 'unity-icon-theme/places/48'
39=== added file 'unity-icon-theme/places/48/user-trash-full.png'
40Binary files unity-icon-theme/places/48/user-trash-full.png 1970-01-01 00:00:00 +0000 and unity-icon-theme/places/48/user-trash-full.png 2011-04-12 11:43:34 +0000 differ
41=== added file 'unity-icon-theme/places/48/user-trash.png'
42Binary files unity-icon-theme/places/48/user-trash.png 1970-01-01 00:00:00 +0000 and unity-icon-theme/places/48/user-trash.png 2011-04-12 11:43:34 +0000 differ

Subscribers

People subscribed via source and target branches

to all changes: