launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

William Grant has proposed merging lp:~wgrant/launchpad/icon-sprites.png into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/icon-sprites.png/+merge/97391

Rename icon-sprites to icon-sprites.png so ExportedFolder serves it with the correct Content-Type on launchpad.dev. Some browsers refuse to load application/octet-stream as an image.
-- 
https://code.launchpad.net/~wgrant/launchpad/icon-sprites.png/+merge/97391
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/icon-sprites.png into lp:launchpad.

=== modified file '.bzrignore'
--- .bzrignore	2012-02-03 20:07:04 +0000
+++ .bzrignore	2012-03-14 13:05:35 +0000
@@ -71,7 +71,7 @@
 doc/_build
 .idea
 run.gdb
-lib/canonical/launchpad/icing/icon-sprites
+lib/canonical/launchpad/icing/icon-sprites.png
 lib/canonical/launchpad/icing/icon-sprites.positioning
 lib/canonical/launchpad/icing/yui
 .emacs.desktop

=== modified file 'Makefile'
--- Makefile	2012-02-28 19:40:50 +0000
+++ Makefile	2012-03-14 13:05:35 +0000
@@ -169,9 +169,9 @@
 		${ICING}/icon-sprites.positioning
 	${SHHH} bin/sprite-util create-css
 
-sprite_image: ${ICING}/icon-sprites ${ICING}/icon-sprites.positioning
+sprite_image: ${ICING}/icon-sprites.png ${ICING}/icon-sprites.positioning
 
-${ICING}/icon-sprites.positioning ${ICING}/icon-sprites: bin/sprite-util \
+${ICING}/icon-sprites.positioning ${ICING}/icon-sprites.png: bin/sprite-util \
 		${ICING}/sprite.css.in
 	${SHHH} bin/sprite-util create-image
 

=== modified file 'buildout-templates/bin/sprite-util.in'
--- buildout-templates/bin/sprite-util.in	2011-03-18 22:47:24 +0000
+++ buildout-templates/bin/sprite-util.in	2012-03-14 13:05:35 +0000
@@ -27,7 +27,7 @@
         sys.exit(2)
 
 icing = ${buildout:directory/lib/canonical/launchpad/icing|path-repr}
-combined_image_file = os.path.join(icing, 'icon-sprites')
+combined_image_file = os.path.join(icing, 'icon-sprites.png')
 positioning_file = os.path.join(icing, 'icon-sprites.positioning')
 css_template_file = os.path.join(icing, 'sprite.css.in')
 css_file = os.path.join(icing, 'build/sprite.css')
@@ -42,6 +42,6 @@
     sprite_util.savePositioning(positioning_file)
 elif command == 'create-css':
     sprite_util.loadPositioning(positioning_file)
-    # The icing/icon-sprites file is relative to the css file
+    # The icing/icon-sprites.png file is relative to the css file
     # in the icing/build/ directory.
-    sprite_util.saveConvertedCSS(css_file, '../icon-sprites')
+    sprite_util.saveConvertedCSS(css_file, '../icon-sprites.png')