Unity Asset Pool

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

  1. unity-asset-pool-icons-lp745555
  2. Merge into trunk
Proposed by Paul Sladen
Status: Superseded
Proposed branch: lp:~sladen/unity-asset-pool/unity-asset-pool-icons-lp745555
Merge into: lp:unity-asset-pool
Diff against target: 50 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
Didier Roche-Tolomelli Approve
Review via email: mp+57247@code.launchpad.net

This proposal has been superseded by a proposal from 2011-04-12.

Description of the change

Add cropped + renamed icons from upstream
  Unity Design team asset dump. These are
  in bitmaps form, displacing the original
  .svg forms in some cases:
  + places/group-*
  + places/user-trash
  + places/user-trash-full
  + apps/workspace-switcher
  (LP: #741804, #745555, #745647)
* These icons are re-cropped/re-named to hopefully
  what they should be.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

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
lp:~sladen/unity-asset-pool/unity-asset-pool-icons-lp745555 updated
51. By Paul Sladen

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

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

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

review: Approve

Unmerged revisions

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-11 22:21:51 +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-11 22:21:51 +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-11 22:21:51 +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-11 22:21:51 +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=== renamed file 'unity-icon-theme/places/svg/group-downloads.svg' => 'unity-icon-theme/places/22/group-downloads.png'
39Binary files unity-icon-theme/places/svg/group-downloads.svg 2010-09-09 07:41:47 +0000 and unity-icon-theme/places/22/group-downloads.png 2011-04-11 22:21:51 +0000 differ
40=== renamed file 'unity-icon-theme/places/svg/group-favoritefolders.svg' => 'unity-icon-theme/places/22/group-favoritefolders.png'
41Binary files unity-icon-theme/places/svg/group-favoritefolders.svg 2010-09-09 07:41:47 +0000 and unity-icon-theme/places/22/group-favoritefolders.png 2011-04-11 22:21:51 +0000 differ
42=== renamed file 'unity-icon-theme/places/svg/group-installed.svg' => 'unity-icon-theme/places/22/group-installed.png'
43Binary files unity-icon-theme/places/svg/group-installed.svg 2010-09-09 07:41:47 +0000 and unity-icon-theme/places/22/group-installed.png 2011-04-11 22:21:51 +0000 differ
44=== renamed file 'unity-icon-theme/places/svg/group-mostused.svg' => 'unity-icon-theme/places/22/group-mostused.png'
45Binary files unity-icon-theme/places/svg/group-mostused.svg 2010-09-09 07:41:47 +0000 and unity-icon-theme/places/22/group-mostused.png 2011-04-11 22:21:51 +0000 differ
46=== added directory 'unity-icon-theme/places/48'
47=== added file 'unity-icon-theme/places/48/user-trash-full.png'
48Binary 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-11 22:21:51 +0000 differ
49=== added file 'unity-icon-theme/places/48/user-trash.png'
50Binary 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-11 22:21:51 +0000 differ

Subscribers

People subscribed via source and target branches

to all changes: