Merge lp:~canonical-isd-hackers/canonical-identity-provider/ubuntu-font into lp:canonical-identity-provider/release

Proposed by Łukasz Czyżykowski
Status: Merged
Approved by: David Owen
Approved revision: no longer in the source branch.
Merged at revision: 105
Proposed branch: lp:~canonical-isd-hackers/canonical-identity-provider/ubuntu-font
Merge into: lp:canonical-identity-provider/release
Diff against target: 23 lines (+2/-2)
2 files modified
identityprovider/media/launchpad/styles.css (+1/-1)
identityprovider/media/ubuntu/styles.css (+1/-1)
To merge this branch: bzr merge lp:~canonical-isd-hackers/canonical-identity-provider/ubuntu-font
Reviewer Review Type Date Requested Status
David Owen (community) Approve
Review via email: mp+33380@code.launchpad.net

Description of the change

Modified CSS stylesheets to use Ubuntu and UbuntuBeta fonts as defaults.

To post a comment you must log in.
Revision history for this message
David Owen (dsowen) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'identityprovider/media/launchpad/styles.css'
2--- identityprovider/media/launchpad/styles.css 2010-07-13 19:16:06 +0000
3+++ identityprovider/media/launchpad/styles.css 2010-08-23 13:24:46 +0000
4@@ -4,7 +4,7 @@
5 html {
6 background: #fff;
7 color: #000;
8- font-family: "Trebuchet MS", "DejaVu Sans Condensed", "Tahoma", sans-serif;
9+ font-family: UbuntuBeta, Ubuntu, "Bitstream Vera Sans", "DejaVu Sans", Tahoma, sans-serif;
10 } :link {
11 background: none;
12 color: #00c;
13
14=== modified file 'identityprovider/media/ubuntu/styles.css'
15--- identityprovider/media/ubuntu/styles.css 2010-07-15 13:35:31 +0000
16+++ identityprovider/media/ubuntu/styles.css 2010-08-23 13:24:46 +0000
17@@ -1,5 +1,5 @@
18 body {
19- font-family: "UbuntuBeta", "Bitstream Vera Sans", "DejaVu Sans", Tahoma, sans-serif;
20+ font-family: UbuntuBeta, Ubuntu, "Bitstream Vera Sans", "DejaVu Sans", Tahoma, sans-serif;
21 color: #333;
22 background: white url(/assets/identityprovider/ubuntu/body_bg.png);
23 font-size: 12px;