Launchpad itself

Merge lp:~salgado/launchpad/no-more-style-slimmer into lp:launchpad

  1. no-more-style-slimmer
  2. Merge into devel
Proposed by Guilherme Salgado
Status: Merged
Approved by: Aaron Bentley
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~salgado/launchpad/no-more-style-slimmer
Merge into: lp:launchpad
Diff against target: 38 lines (+3/-3)
3 files modified
lib/canonical/launchpad/offline-maintenance.html (+1/-1)
lib/canonical/launchpad/offline-unplanned.html (+1/-1)
lib/canonical/launchpad/templates/oops.pt (+1/-1)
To merge this branch: bzr merge lp:~salgado/launchpad/no-more-style-slimmer
Reviewer Review Type Date Requested Status
Aaron Bentley (community) code Approve
Review via email: mp+16777@code.launchpad.net

Commit message

Fix remaining templates that were using +style-slimmer.css to use combo.css

To post a comment you must log in.
Revision history for this message
Guilherme Salgado (salgado) wrote :

+style-slimmer.css is now gone as we have a single file (combo.css) containing all our stylesheets, but I'd forgotten to update a few templates (which don't use the main_template macro) to use combo.css instead of +style-slimmer.css. This branch does just that.

Revision history for this message
Aaron Bentley (abentley) :
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/offline-maintenance.html'
2--- lib/canonical/launchpad/offline-maintenance.html 2008-06-11 20:59:16 +0000
3+++ lib/canonical/launchpad/offline-maintenance.html 2010-01-04 13:03:16 +0000
4@@ -3,7 +3,7 @@
5 <head>
6 <title>Launchpad is offline for maintenance</title>
7 <style type="text/css" media="screen, print">
8- @import url(https://launchpad.net/+icing/rev5/+style-slimmer.css);
9+ @import url(https://launchpad.net/+icing/rev5/+combo.css);
10 </style>
11 </head>
12 <body>
13
14=== modified file 'lib/canonical/launchpad/offline-unplanned.html'
15--- lib/canonical/launchpad/offline-unplanned.html 2008-06-11 20:59:16 +0000
16+++ lib/canonical/launchpad/offline-unplanned.html 2010-01-04 13:03:16 +0000
17@@ -3,7 +3,7 @@
18 <head>
19 <title>Please try again</title>
20 <style type="text/css" media="screen, print">
21- @import url(https://launchpad.net/+icing/rev5/+style-slimmer.css);
22+ @import url(https://launchpad.net/+icing/rev5/combo.css);
23 </style>
24 </head>
25 <body>
26
27=== modified file 'lib/canonical/launchpad/templates/oops.pt'
28--- lib/canonical/launchpad/templates/oops.pt 2009-07-17 17:59:07 +0000
29+++ lib/canonical/launchpad/templates/oops.pt 2010-01-04 13:03:16 +0000
30@@ -7,7 +7,7 @@
31 <head>
32 <title>Oops!</title>
33 <style type="text/css" media="screen, print">
34- @import url(/+icing/rev5/+style-slimmer.css);
35+ @import url(/+icing/rev5/combo.css);
36 </style>
37 </head>
38 <body>