Merge lp:~larsu/humanity/all-sizes-for-draw-accept into lp:~ubuntu-art-pkg/humanity/release

[Lars Karlitski]

Provide folder-drag-accept in all sizes

status/folder-drag-accept is not available in sizes greater than 48, as that directory is not marked as scaling all the way up. Fix this by moving folder-drag-accept into scalable and removing the link in 48.

This fixes LP: #1462346 - nautilus picks the small version of the icon even when zoomed in.

Also remove redundant copies of gnome-fs-directory-accept.svg. That's not a name in the spec, but let's keep it around for backwards compatibility.

Provide folder-drag-accept in all sizes

status/folder-drag-accept is not available in sizes greater than 48, as that directory is not marked as scaling all the way up. Fix this by moving folder-drag-accept into scalable and removing the link in 48.

This fixes LP: #1462346 - nautilus picks the small version of the icon even when zoomed in.

Also remove redundant copies of gnome-fs-directory-accept.svg. That's not a name in the spec, but let's keep it around for backwards compatibility.

[Sebastien Bacher (seb128)]

nice, thanks for fixing that one ;-)

review: Approve

=== modified file 'Humanity/index.theme'
--- Humanity/index.theme	2015-03-26 17:52:46 +0000
+++ Humanity/index.theme	2015-07-06 08:18:55 +0000
@@ -6,7 +6,7 @@
 Example=directory-x-normal
 
 #Directory list
-Directories=actions/16,actions/22,actions/24,actions/32,actions/48,actions/64,actions/128,actions/symbolic,animations/16,animations/22,animations/24,animations/32,animations/48,apps/16,apps/22,apps/24,apps/32,apps/48,apps/64,apps/128,apps/192,categories/16,categories/22,categories/24,categories/32,categories/48,categories/64,categories/128,devices/16,devices/22,devices/24,devices/32,devices/48,devices/64,devices/128,emblems/16,emblems/22,emblems/24,emblems/32,emblems/48,mimes/16,mimes/22,mimes/24,mimes/32,mimes/48,mimes/64,mimes/128,mimes/256,places/16,places/22,places/24,places/32,places/48,places/64,places/128,status/16,status/22,status/24,status/32,status/48,status/64,status/128,stock/16,stock/22,stock/24,stock/32,stock/48,
+Directories=actions/16,actions/22,actions/24,actions/32,actions/48,actions/64,actions/128,actions/symbolic,animations/16,animations/22,animations/24,animations/32,animations/48,apps/16,apps/22,apps/24,apps/32,apps/48,apps/64,apps/128,apps/192,categories/16,categories/22,categories/24,categories/32,categories/48,categories/64,categories/128,devices/16,devices/22,devices/24,devices/32,devices/48,devices/64,devices/128,emblems/16,emblems/22,emblems/24,emblems/32,emblems/48,mimes/16,mimes/22,mimes/24,mimes/32,mimes/48,mimes/64,mimes/128,mimes/256,places/16,places/22,places/24,places/32,places/48,places/64,places/128,places/scalable,status/16,status/22,status/24,status/32,status/48,status/64,status/128,status/scalable,stock/16,stock/22,stock/24,stock/32,stock/48,
 
 [actions/16]
 Size=16
@@ -302,6 +302,13 @@
 Context=Places
 Type=Scalable
 
+[places/scalable]
+Size=16
+MinSize=8
+MaxSize=512
+Context=Status
+Type=Scalable
+
 [status/16]
 Size=16
 Context=Status
@@ -334,6 +341,15 @@
 
 [status/128]
 Size=128
+MinSize=64
+MaxSize=512
+Context=Status
+Type=Scalable
+
+[status/scalable]
+Size=16
+MinSize=8
+MaxSize=512
 Context=Status
 Type=Scalable
 

=== added directory 'Humanity/places/scalable'
=== renamed file 'Humanity/places/48/gnome-fs-directory-accept.svg' => 'Humanity/places/scalable/gnome-fs-directory-accept.svg'
=== removed symlink 'Humanity/status/24/gnome-fs-directory-accept.svg'
=== target was u'folder-drag-accept.svg'
=== removed symlink 'Humanity/status/48/folder-drag-accept.svg'
=== target was u'../../places/48/gnome-fs-directory-accept.svg'
=== removed symlink 'Humanity/status/48/gnome-fs-directory-accept.svg'
=== target was u'../../places/48/gnome-fs-directory-accept.svg'
=== added directory 'Humanity/status/scalable'
=== added symlink 'Humanity/status/scalable/folder-drag-accept.svg'
=== target is u'../../places/scalable/gnome-fs-directory-accept.svg'