Andrea Corbellini has proposed merging
lp:~andrea.corbellini/launchpad/ubuntu-font-620537 into lp:launchpad/devel.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
Related bugs:
#620537 Use UbuntuBeta as font if it's available
https://bugs.launchpad.net/bugs/620537
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.
--
https://code.launchpad.net/~andrea.corbellini/launchpad/ubuntu-font-620537/+merge/33292
Your team Launchpad code reviewers is requested to review the proposed merge of
lp:~andrea.corbellini/launchpad/ubuntu-font-620537 into lp:launchpad/devel.
=== modified file 'lib/canonical/launchpad/icing/print.css'
--- lib/canonical/launchpad/icing/print.css 2009-10-13 20:59:13 +0000
+++ lib/canonical/launchpad/icing/print.css 2010-08-21 14:25:59 +0000
@@ -1,5 +1,5 @@
body {
- font-family: bitstream vera sans, dejavu sans, verdana, sans-serif;
+ font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
font-size: 12px;
color: #656565;
margin: 20px;
@@ -9,7 +9,7 @@
background-position: top center;
}
td {
- font-family: bitstream vera sans, dejavu sans, verdana, sans-serif;
+ font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
font-size: 11px;
color: #656565;
}
@@ -25,8 +25,8 @@
dt { }
dd { }
em { font-style: normal; }
- input, select {font-family: bitstream vera sans, dejavu sans, verdana, sans-serif; font-size: 10px; color: #656565; background-color: #FFFFFF; margin: 0;}
- textarea {font-family: bitstream vera sans, dejavu sans, verdana, sans-serif; font-size: 11px; color: #656565; background-color: #FFFFFF; margin: 0;}
+ input, select {font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif; font-size: 10px; color: #656565; background-color: #FFFFFF; margin: 0;}
+ textarea {font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif; font-size: 11px; color: #656565; background-color: #FFFFFF; margin: 0;}
a img { border: none; }
form { border: 0; margin: 0; padding: 0; }
@media print {
=== modified file 'lib/canonical/launchpad/icing/shipit.css'
--- lib/canonical/launchpad/icing/shipit.css 2009-10-13 20:59:13 +0000
+++ lib/canonical/launchpad/icing/shipit.css 2010-08-21 14:25:59 +0000
@@ -2,7 +2,7 @@
html {
position: relative;
- font-family: bitstream vera sans, dejavu sans, verdana, sans-serif;
+ font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
font-size: 12pt;
color: black;
background-color: #FFFFFF;
@@ -52,7 +52,7 @@
input, select, textarea {
background-color: #fff;
color: #656565;
- font-family: bitstream vera sans, dejavu sans, verdana, sans-serif;
+ font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
margin: 0;
}
input[type="text"], input[type="submit"], input[type="reset"], textarea {
=== modified file 'lib/canonical/launchpad/icing/style-3-0.css.in'
--- lib/canonical/launchpad/icing/style-3-0.css.in 2010-08-06 22:51:05 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css.in 2010-08-21 14:25:59 +0000
@@ -141,7 +141,7 @@
}
html, body {
- font-family: "dejavu sans", "bitstream vera sans", verdana, sans-serif;
+ font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
font-size: 93%;
}
body.private {
@@ -1749,7 +1749,7 @@
pre.changelog, table.diff,
.bug-comment, .bug-activity, .codereviewcomment {
font-size: 116%;
- font-family: monospace;
+ font-family: 'UbuntuBeta Mono', 'Ubuntu Mono', monospace;
}
.cloud-size-smallest {
font-size: 77%;
=== modified file 'lib/canonical/launchpad/icing/yui_2.7.0b/build/calendar/assets/skins/sam/calendar-skin.css'
--- lib/canonical/launchpad/icing/yui_2.7.0b/build/calendar/assets/skins/sam/calendar-skin.css 2009-10-13 20:59:13 +0000
+++ lib/canonical/launchpad/icing/yui_2.7.0b/build/calendar/assets/skins/sam/calendar-skin.css 2010-08-21 14:25:59 +0000
@@ -264,7 +264,7 @@
/* NAVIGATOR BOUNDING BOX */
.yui-skin-sam .yui-calcontainer .yui-cal-nav {
- font-family: bitstream vera sans, dejavu sans, verdana, sans-serif;
+ font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
font-size:93%;
border:1px solid #808080;
left:50%;
=== modified file 'lib/canonical/launchpad/templates/oops-veryplain.pt'
--- lib/canonical/launchpad/templates/oops-veryplain.pt 2009-10-13 20:59:13 +0000
+++ lib/canonical/launchpad/templates/oops-veryplain.pt 2010-08-21 14:25:59 +0000
@@ -11,7 +11,7 @@
<title>Oops!</title>
<style type="text/css">
html {
- font-family: bitstream vera sans, dejavu sans, verdana, sans-serif;
+ font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
font-size: 8pt;
}
h1 {background: none; color: #83ad23; font-size: 3em; font-weight: normal;}
=== modified file 'lib/canonical/launchpad/webapp/error.py'
--- lib/canonical/launchpad/webapp/error.py 2010-08-20 20:31:18 +0000
+++ lib/canonical/launchpad/webapp/error.py 2010-08-21 14:25:59 +0000
@@ -115,8 +115,9 @@
def inside_div(self, html):
"""Returns the given HTML inside a div of an appropriate class."""
- return ('<div class="highlighted" '
- 'style="font-family: monospace; font-size: smaller;">'
+ return ('<div class="highlighted" style="'
+ "font-family: 'UbuntuBeta Mono', 'Ubuntu', monospace;"
+ ' font-size: smaller;">'
'%s'
'</div>') % html
=== modified file 'lib/lp/app/templates/root-index.pt'
--- lib/lp/app/templates/root-index.pt 2010-07-16 20:55:50 +0000
+++ lib/lp/app/templates/root-index.pt 2010-08-21 14:25:59 +0000
@@ -20,6 +20,7 @@
border-bottom: 1px solid;
margin-top: 2em;
font-size: 167%;
+ padding-bottom: 2px;
}
.homepage-whatslaunchpad h2 {
font-size: 189%;
@@ -46,10 +47,8 @@
#homepage-blogposts {
padding-right: 4em;
}
- .homepage-getstarted h2 {
- border-bottom: 1px solid;
- margin-top: 1em;
- font-size: 161%;
+ #homepage-getstarted ul {
+ padding-top: 0.5em;
}
.featured-project-top h3 {
font-size: 131%;
=== modified file 'utilities/apidoc-index.pt'
--- utilities/apidoc-index.pt 2010-03-17 19:45:05 +0000
+++ utilities/apidoc-index.pt 2010-08-21 14:25:59 +0000
@@ -10,7 +10,7 @@
<style type="text/css">
body {
- font-family: sans-serif;
+ font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
font-size: 0.85em;
margin: 2em 8em;
}
_______________________________________________
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : launchpad-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help : https://help.launchpad.net/ListHelp
