Merge lp:~beuno/launchpad/sprite-issues-never-die into lp:launchpad/db-devel

Proposed by Martin Albisetti on 2010-01-12
Status: Merged
Approved by: Martin Albisetti on 2010-01-12
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~beuno/launchpad/sprite-issues-never-die
Merge into: lp:launchpad/db-devel
Diff against target: 38 lines (+3/-3)
3 files modified
lib/canonical/launchpad/icing/style-3-0.css (+1/-1)
lib/lp/registry/templates/products-index.pt (+1/-1)
lib/lp/registry/templates/projects-index.pt (+1/-1)
To merge this branch: bzr merge lp:~beuno/launchpad/sprite-issues-never-die
Reviewer Review Type Date Requested Status
Brad Crittenden (community) code 2010-01-12 Approve on 2010-01-12
Review via email: mp+17229@code.launchpad.net

Commit message

Fix extraneous sprite icons in error messages.

To post a comment you must log in.
Martin Albisetti (beuno) wrote :

This is a simple fix to avoid the problems with error messages (bug 487142), I just renamed the sprite class, and changed it in the only place that it currently seems in use.

Brad Crittenden (bac) wrote :

As we discussed on IRC, please change the use in projects-index.pt.

Thanks,
Brad

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/launchpad/icing/style-3-0.css'
2--- lib/canonical/launchpad/icing/style-3-0.css 2010-01-06 02:02:18 +0000
3+++ lib/canonical/launchpad/icing/style-3-0.css 2010-01-12 14:39:18 +0000
4@@ -893,7 +893,7 @@
5 .person-inactive-badge {background:url(icon-sprites-2) 0 -64px no-repeat;}
6 .mentoring {background:url(icon-sprites-2) 0 -96px no-repeat;}
7 .undecided {background:url(icon-sprites-2) 0 -128px no-repeat;}
8-.error {background:url(icon-sprites-2) 0 -160px no-repeat;}
9+.error-icon {background:url(icon-sprites-2) 0 -160px no-repeat;}
10 .cancel {background:url(icon-sprites-2) 0 -192px no-repeat;}
11 .confirm {background:url(icon-sprites-2) 0 -224px no-repeat;}
12 .flame {background:url(icon-sprites-2) 0 -256px no-repeat;}
13
14=== modified file 'lib/lp/registry/templates/products-index.pt'
15--- lib/lp/registry/templates/products-index.pt 2009-11-10 03:54:59 +0000
16+++ lib/lp/registry/templates/products-index.pt 2010-01-12 14:39:18 +0000
17@@ -93,7 +93,7 @@
18 </table>
19
20 <div id="application-summary">
21- <p class="sprite error"
22+ <p class="sprite error-icon"
23 tal:condition="not: view/search_results">
24 No projects matching
25 &#8220;<span tal:replace="view/search_string">moz</span>&#8221;
26
27=== modified file 'lib/lp/registry/templates/projects-index.pt'
28--- lib/lp/registry/templates/projects-index.pt 2009-11-10 05:05:49 +0000
29+++ lib/lp/registry/templates/projects-index.pt 2010-01-12 14:39:18 +0000
30@@ -57,7 +57,7 @@
31 </tbody>
32 </table>
33
34- <p class="sprite error application-summary"
35+ <p class="sprite error-icon application-summary"
36 tal:condition="not: view/search_results">
37 No project groups matching
38 &#8220;<span tal:replace="view/search_string">moz</span>&#8221;

Subscribers

People subscribed via source and target branches

to status/vote changes: