Launchpad itself

Merge lp:~andrea.corbellini/launchpad/ubuntu-font-620537 into lp:launchpad

  1. ubuntu-font-620537
  2. Merge into devel
Proposed by Andrea Corbellini
Status: Merged
Approved by: Curtis Hovey
Approved revision: no longer in the source branch.
Merged at revision: 11416
Proposed branch: lp:~andrea.corbellini/launchpad/ubuntu-font-620537
Merge into: lp:launchpad
Diff against target: 154 lines (+17/-17)
8 files modified
lib/canonical/launchpad/icing/print.css (+4/-4)
lib/canonical/launchpad/icing/shipit.css (+2/-2)
lib/canonical/launchpad/icing/style-3-0.css.in (+2/-2)
lib/canonical/launchpad/icing/yui_2.7.0b/build/calendar/assets/skins/sam/calendar-skin.css (+1/-1)
lib/canonical/launchpad/templates/oops-veryplain.pt (+1/-1)
lib/canonical/launchpad/webapp/error.py (+3/-2)
lib/lp/app/templates/root-index.pt (+3/-4)
utilities/apidoc-index.pt (+1/-1)
To merge this branch: bzr merge lp:~andrea.corbellini/launchpad/ubuntu-font-620537
Reviewer Review Type Date Requested Status
Curtis Hovey (community) code + ui Approve
Review via email: mp+33292@code.launchpad.net

Description of the change

This branch makes Launchpad use the Ubuntu font when available, see bug #620537.

As Matthew said on the bug, there were some issues with Chromium. I've fixed the problems on the home page and I couldn't find other layout issues on other pages, so I think everything is OK.

To post a comment you must log in.
Revision history for this message
Curtis Hovey (sinzui) wrote :

Thanks for providing this fix and addressing Matthew's concerns Andrea. This branch is good to land and I will land it for you.

review: Approve (code + ui)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/launchpad/icing/print.css'
2--- lib/canonical/launchpad/icing/print.css 2009-10-13 20:59:13 +0000
3+++ lib/canonical/launchpad/icing/print.css 2010-08-21 16:25:59 +0000
4@@ -1,5 +1,5 @@
5 body {
6- font-family: bitstream vera sans, dejavu sans, verdana, sans-serif;
7+ font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
8 font-size: 12px;
9 color: #656565;
10 margin: 20px;
11@@ -9,7 +9,7 @@
12 background-position: top center;
13 }
14 td {
15- font-family: bitstream vera sans, dejavu sans, verdana, sans-serif;
16+ font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
17 font-size: 11px;
18 color: #656565;
19 }
20@@ -25,8 +25,8 @@
21 dt { }
22 dd { }
23 em { font-style: normal; }
24- input, select {font-family: bitstream vera sans, dejavu sans, verdana, sans-serif; font-size: 10px; color: #656565; background-color: #FFFFFF; margin: 0;}
25- textarea {font-family: bitstream vera sans, dejavu sans, verdana, sans-serif; font-size: 11px; color: #656565; background-color: #FFFFFF; margin: 0;}
26+ input, select {font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif; font-size: 10px; color: #656565; background-color: #FFFFFF; margin: 0;}
27+ textarea {font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif; font-size: 11px; color: #656565; background-color: #FFFFFF; margin: 0;}
28 a img { border: none; }
29 form { border: 0; margin: 0; padding: 0; }
30 @media print {
31
32=== modified file 'lib/canonical/launchpad/icing/shipit.css'
33--- lib/canonical/launchpad/icing/shipit.css 2009-10-13 20:59:13 +0000
34+++ lib/canonical/launchpad/icing/shipit.css 2010-08-21 16:25:59 +0000
35@@ -2,7 +2,7 @@
36
37 html {
38 position: relative;
39- font-family: bitstream vera sans, dejavu sans, verdana, sans-serif;
40+ font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
41 font-size: 12pt;
42 color: black;
43 background-color: #FFFFFF;
44@@ -52,7 +52,7 @@
45 input, select, textarea {
46 background-color: #fff;
47 color: #656565;
48- font-family: bitstream vera sans, dejavu sans, verdana, sans-serif;
49+ font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
50 margin: 0;
51 }
52 input[type="text"], input[type="submit"], input[type="reset"], textarea {
53
54=== modified file 'lib/canonical/launchpad/icing/style-3-0.css.in'
55--- lib/canonical/launchpad/icing/style-3-0.css.in 2010-08-06 22:51:05 +0000
56+++ lib/canonical/launchpad/icing/style-3-0.css.in 2010-08-21 16:25:59 +0000
57@@ -141,7 +141,7 @@
58 }
59
60 html, body {
61- font-family: "dejavu sans", "bitstream vera sans", verdana, sans-serif;
62+ font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
63 font-size: 93%;
64 }
65 body.private {
66@@ -1749,7 +1749,7 @@
67 pre.changelog, table.diff,
68 .bug-comment, .bug-activity, .codereviewcomment {
69 font-size: 116%;
70- font-family: monospace;
71+ font-family: 'UbuntuBeta Mono', 'Ubuntu Mono', monospace;
72 }
73 .cloud-size-smallest {
74 font-size: 77%;
75
76=== modified file 'lib/canonical/launchpad/icing/yui_2.7.0b/build/calendar/assets/skins/sam/calendar-skin.css'
77--- lib/canonical/launchpad/icing/yui_2.7.0b/build/calendar/assets/skins/sam/calendar-skin.css 2009-10-13 20:59:13 +0000
78+++ lib/canonical/launchpad/icing/yui_2.7.0b/build/calendar/assets/skins/sam/calendar-skin.css 2010-08-21 16:25:59 +0000
79@@ -264,7 +264,7 @@
80
81 /* NAVIGATOR BOUNDING BOX */
82 .yui-skin-sam .yui-calcontainer .yui-cal-nav {
83- font-family: bitstream vera sans, dejavu sans, verdana, sans-serif;
84+ font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
85 font-size:93%;
86 border:1px solid #808080;
87 left:50%;
88
89=== modified file 'lib/canonical/launchpad/templates/oops-veryplain.pt'
90--- lib/canonical/launchpad/templates/oops-veryplain.pt 2009-10-13 20:59:13 +0000
91+++ lib/canonical/launchpad/templates/oops-veryplain.pt 2010-08-21 16:25:59 +0000
92@@ -11,7 +11,7 @@
93 <title>Oops!</title>
94 <style type="text/css">
95 html {
96- font-family: bitstream vera sans, dejavu sans, verdana, sans-serif;
97+ font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
98 font-size: 8pt;
99 }
100 h1 {background: none; color: #83ad23; font-size: 3em; font-weight: normal;}
101
102=== modified file 'lib/canonical/launchpad/webapp/error.py'
103--- lib/canonical/launchpad/webapp/error.py 2010-08-20 20:31:18 +0000
104+++ lib/canonical/launchpad/webapp/error.py 2010-08-21 16:25:59 +0000
105@@ -115,8 +115,9 @@
106 def inside_div(self, html):
107 """Returns the given HTML inside a div of an appropriate class."""
108
109- return ('<div class="highlighted" '
110- 'style="font-family: monospace; font-size: smaller;">'
111+ return ('<div class="highlighted" style="'
112+ "font-family: 'UbuntuBeta Mono', 'Ubuntu Mono', monospace;"
113+ ' font-size: smaller;">'
114 '%s'
115 '</div>') % html
116
117
118=== modified file 'lib/lp/app/templates/root-index.pt'
119--- lib/lp/app/templates/root-index.pt 2010-07-16 20:55:50 +0000
120+++ lib/lp/app/templates/root-index.pt 2010-08-21 16:25:59 +0000
121@@ -20,6 +20,7 @@
122 border-bottom: 1px solid;
123 margin-top: 2em;
124 font-size: 167%;
125+ padding-bottom: 2px;
126 }
127 .homepage-whatslaunchpad h2 {
128 font-size: 189%;
129@@ -46,10 +47,8 @@
130 #homepage-blogposts {
131 padding-right: 4em;
132 }
133- .homepage-getstarted h2 {
134- border-bottom: 1px solid;
135- margin-top: 1em;
136- font-size: 161%;
137+ #homepage-getstarted ul {
138+ padding-top: 0.5em;
139 }
140 .featured-project-top h3 {
141 font-size: 131%;
142
143=== modified file 'utilities/apidoc-index.pt'
144--- utilities/apidoc-index.pt 2010-03-17 19:45:05 +0000
145+++ utilities/apidoc-index.pt 2010-08-21 16:25:59 +0000
146@@ -10,7 +10,7 @@
147
148 <style type="text/css">
149 body {
150- font-family: sans-serif;
151+ font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
152 font-size: 0.85em;
153 margin: 2em 8em;
154 }