Merge lp:~nigelbabu/launchpad/ubuntu-font-787798 into lp:launchpad

Proposed by Nigel Babu
Status: Merged
Approved by: Curtis Hovey
Approved revision: no longer in the source branch.
Merged at revision: 13888
Proposed branch: lp:~nigelbabu/launchpad/ubuntu-font-787798
Merge into: lp:launchpad
Diff against target: 18 lines (+7/-1)
1 file modified
lib/lp/app/templates/base-layout-macros.pt (+7/-1)
To merge this branch: bzr merge lp:~nigelbabu/launchpad/ubuntu-font-787798
Reviewer Review Type Date Requested Status
Brad Crittenden (community) code Approve
Curtis Hovey (community) ui Approve
Review via email: mp+73793@code.launchpad.net

Commit message

[r=bac][ui=sinzui][bug=787798] Use Google Web Fonts so Launchpad always displays in Ubuntu font

Description of the change

= Description =
Use Google Web Fonts so Launchpad always displays in Ubuntu font

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/app/templates/base-layout.pt

To post a comment you must log in.
Revision history for this message
Brad Crittenden (bac) wrote :

Hi Nigel,

Thanks a ton for taking on this fix. It'll be huge when it lands.

A couple of thoughts:

Since Launchpad serves up everything over HTTPS having a reference to an external HTTP resource causes security warnings to pop up on some browsers. Luckily the same resource can be found via HTTPS.

Secondly, I'm not sure the change to the page template is the right place to make it. I've noticed some text is not using the font (e.g. the "Search Launchpad" button on the home page) so there may be CSS fixes that need to be made.

Let's get Curtis' opinion on this fix before you proceed. I'll request a review from him.

review: Needs Fixing (code)
Revision history for this message
Curtis Hovey (sinzui) wrote :

I think this line belongs in the launchpad-stylesheet-3-0 section of base-layout-macros.pt. I expect it is required before the line that loads the combo font.

review: Approve (ui)
Revision history for this message
Brad Crittenden (bac) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
2--- lib/lp/app/templates/base-layout-macros.pt 2011-09-02 10:54:46 +0000
3+++ lib/lp/app/templates/base-layout-macros.pt 2011-09-06 15:33:18 +0000
4@@ -166,7 +166,13 @@
5 We can revisit this IE-only optimization if we remove SSL. Any changes that
6 affect IE should be tested using webpagetest.org. (See the dev.launchpad.net
7 wiki for details.)
8- </tal:comment>
9+ </tal:comment>
10+ <link
11+ type="text/css"
12+ rel="stylesheet"
13+ media="screen, print"
14+ href="https://fonts.googleapis.com/css?family=Ubuntu" />
15+
16 <link
17 type="text/css"
18 rel="stylesheet"