launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #05838
[Merge] lp:~mbp/launchpad/714831-beta-font into lp:launchpad
Martin Pool has proposed merging lp:~mbp/launchpad/714831-beta-font into lp:launchpad.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~mbp/launchpad/714831-beta-font/+merge/84716
This removes references to the UbuntuBeta font per bug 714831: fairly trivial
but fairly easy to fix:
* some of the names were wrong and pointed to fonts that never existed
* the beta is now over
* the existing code prefers the beta fonts to the release fonts, if someone
does have the beta still installed, which seems bad
* old clients ought to get the Ubuntu release fonts from web fonts anyhow
--
https://code.launchpad.net/~mbp/launchpad/714831-beta-font/+merge/84716
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~mbp/launchpad/714831-beta-font into lp:launchpad.
=== modified file 'lib/canonical/launchpad/icing/css/base.css'
--- lib/canonical/launchpad/icing/css/base.css 2011-11-18 05:32:00 +0000
+++ lib/canonical/launchpad/icing/css/base.css 2011-12-07 05:07:12 +0000
@@ -1,5 +1,5 @@
body {
- font-family: 'UbuntuBeta Regular', Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
font-size: 12px;
line-height: 18px; /* The same as the sprite height. */
color: #333;
=== modified file 'lib/canonical/launchpad/icing/css/forms.css'
--- lib/canonical/launchpad/icing/css/forms.css 2011-11-18 05:15:52 +0000
+++ lib/canonical/launchpad/icing/css/forms.css 2011-12-07 05:07:12 +0000
@@ -232,7 +232,7 @@
}
.lazr-multiline-edit .clearfix h3 {
/* Undo the damage done by lazr. */
- font-family: 'UbuntuBeta Regular', Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
line-height: 12px;
}
.widget-hd.js-action {
=== modified file 'lib/canonical/launchpad/icing/css/modifiers.css'
--- lib/canonical/launchpad/icing/css/modifiers.css 2011-11-18 05:15:52 +0000
+++ lib/canonical/launchpad/icing/css/modifiers.css 2011-12-07 05:07:12 +0000
@@ -119,7 +119,7 @@
}
pre.changelog, table.diff,
.bug-comment, .bug-activity, .codereviewcomment {
- font-family: 'UbuntuBeta Mono', 'Ubuntu Mono', monospace;
+ font-family: 'Ubuntu Mono', monospace;
}
.cloud-size-smallest {
font-size: 10px;
=== modified file 'lib/canonical/launchpad/icing/css/typography.css'
--- lib/canonical/launchpad/icing/css/typography.css 2011-11-18 05:15:52 +0000
+++ lib/canonical/launchpad/icing/css/typography.css 2011-12-07 05:07:12 +0000
@@ -38,7 +38,7 @@
width: 60em;
}
pre, code, samp, tt, .console {
- font-family: 'UbuntuBeta Mono', 'Ubuntu Mono', monospace;
+ font-family: 'Ubuntu Mono', monospace;
margin-bottom: 0.8em;
}
pre.wrap {
=== modified file 'lib/canonical/launchpad/icing/shipit.css'
--- lib/canonical/launchpad/icing/shipit.css 2010-08-21 13:28:33 +0000
+++ lib/canonical/launchpad/icing/shipit.css 2011-12-07 05:07:12 +0000
@@ -2,7 +2,7 @@
html {
position: relative;
- font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
+ font-family: 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: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
+ font-family: 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.css'
--- lib/canonical/launchpad/icing/style.css 2011-11-30 06:12:55 +0000
+++ lib/canonical/launchpad/icing/style.css 2011-12-07 05:07:12 +0000
@@ -27,7 +27,7 @@
*/
div#edit-description,
div#edit-commit_message {
- font-family: 'UbuntuBeta Mono', 'Ubuntu Mono', monospace;
+ font-family: 'Ubuntu Mono', monospace;
margin: 1em 0;
}
@@ -461,7 +461,7 @@
padding: 5px;
border: solid gray;
border-width: 1px;
- font-family: 'UbuntuBeta Mono', 'Ubuntu Mono', monospace;
+ font-family: 'Ubuntu Mono', monospace;
-moz-border-radius: 5px;
-o-border-radius: 5px;
-webkit-border-radius: 5px;
=== 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 2010-08-21 13:28:33 +0000
+++ lib/canonical/launchpad/icing/yui_2.7.0b/build/calendar/assets/skins/sam/calendar-skin.css 2011-12-07 05:07:12 +0000
@@ -264,7 +264,7 @@
/* NAVIGATOR BOUNDING BOX */
.yui-skin-sam .yui-calcontainer .yui-cal-nav {
- font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
font-size:93%;
border:1px solid #808080;
left:50%;
=== modified file 'lib/canonical/launchpad/offline-maintenance-haproxy.html'
--- lib/canonical/launchpad/offline-maintenance-haproxy.html 2010-12-16 22:42:28 +0000
+++ lib/canonical/launchpad/offline-maintenance-haproxy.html 2011-12-07 05:07:12 +0000
@@ -7,7 +7,7 @@
<title>Launchpad is offline for maintenance</title>
<style type="text/css" media="screen, print">
html, body {
- font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
}
.offline {
text-align: center;
=== modified file 'lib/canonical/launchpad/offline-maintenance.html'
--- lib/canonical/launchpad/offline-maintenance.html 2010-12-16 17:04:22 +0000
+++ lib/canonical/launchpad/offline-maintenance.html 2011-12-07 05:07:12 +0000
@@ -4,7 +4,7 @@
<title>Launchpad is offline for maintenance</title>
<style type="text/css" media="screen, print">
html, body {
- font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
}
.offline {
text-align: center;
=== modified file 'lib/canonical/launchpad/offline-staging-code-update.html'
--- lib/canonical/launchpad/offline-staging-code-update.html 2010-12-16 17:04:22 +0000
+++ lib/canonical/launchpad/offline-staging-code-update.html 2011-12-07 05:07:12 +0000
@@ -4,7 +4,7 @@
<title>Please try again</title>
<style type="text/css" media="screen, print">
html, body {
- font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
}
.offline {
text-align: center;
=== modified file 'lib/canonical/launchpad/offline-staging-db-update.html'
--- lib/canonical/launchpad/offline-staging-db-update.html 2010-12-16 17:04:22 +0000
+++ lib/canonical/launchpad/offline-staging-db-update.html 2011-12-07 05:07:12 +0000
@@ -4,7 +4,7 @@
<title>Please try again</title>
<style type="text/css" media="screen, print">
html, body {
- font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
}
.offline {
text-align: center;
=== modified file 'lib/canonical/launchpad/offline-unplanned-haproxy.html'
--- lib/canonical/launchpad/offline-unplanned-haproxy.html 2010-12-16 22:42:28 +0000
+++ lib/canonical/launchpad/offline-unplanned-haproxy.html 2011-12-07 05:07:12 +0000
@@ -7,7 +7,7 @@
<title>Please try again</title>
<style type="text/css" media="screen, print">
html, body {
- font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
}
.offline {
text-align: center;
=== modified file 'lib/canonical/launchpad/offline-unplanned.html'
--- lib/canonical/launchpad/offline-unplanned.html 2010-12-16 17:04:22 +0000
+++ lib/canonical/launchpad/offline-unplanned.html 2011-12-07 05:07:12 +0000
@@ -4,7 +4,7 @@
<title>Please try again</title>
<style type="text/css" media="screen, print">
html, body {
- font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
}
.offline {
text-align: center;
=== modified file 'lib/canonical/launchpad/webapp/error.py'
--- lib/canonical/launchpad/webapp/error.py 2011-10-03 14:39:59 +0000
+++ lib/canonical/launchpad/webapp/error.py 2011-12-07 05:07:12 +0000
@@ -107,7 +107,7 @@
"""Returns the given HTML inside a div of an appropriate class."""
return ('<div class="highlight" style="'
- "font-family: 'UbuntuBeta Mono', 'Ubuntu Mono', monospace;"
+ "font-family: 'Ubuntu Mono', monospace;"
' font-size: smaller;">'
'%s'
'</div>') % html
=== modified file 'lib/canonical/launchpad/webapp/templates/oops-veryplain.pt'
--- lib/canonical/launchpad/webapp/templates/oops-veryplain.pt 2011-05-27 21:03:22 +0000
+++ lib/canonical/launchpad/webapp/templates/oops-veryplain.pt 2011-12-07 05:07:12 +0000
@@ -11,7 +11,7 @@
<title>Oops!</title>
<style type="text/css">
html {
- font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
+ font-family: 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/lp/app/templates/launchpad-databaseunavailable.pt'
--- lib/lp/app/templates/launchpad-databaseunavailable.pt 2011-10-03 14:41:27 +0000
+++ lib/lp/app/templates/launchpad-databaseunavailable.pt 2011-12-07 05:07:12 +0000
@@ -16,7 +16,7 @@
}
body {
- font-family: 'UbuntuBeta Regular', Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
font-size: 0.75em;
line-height: 1.3em;
color: #000;
=== modified file 'lib/lp/code/templates/sourcepackagerecipe-index.pt'
--- lib/lp/code/templates/sourcepackagerecipe-index.pt 2011-11-26 04:03:29 +0000
+++ lib/lp/code/templates/sourcepackagerecipe-index.pt 2011-12-07 05:07:12 +0000
@@ -13,7 +13,7 @@
padding-left: 2em;
}
div#edit-recipe_text, div#edit-description {
- font-family: "UbuntuBeta Mono","Ubuntu Mono",monospace;
+ font-family: "Ubuntu Mono",monospace;
margin: 1em 0;
}
div#edit-recipe_text.yui3-editable_text-content,
=== modified file 'utilities/apidoc-index.pt'
--- utilities/apidoc-index.pt 2010-08-21 13:28:33 +0000
+++ utilities/apidoc-index.pt 2011-12-07 05:07:12 +0000
@@ -10,7 +10,7 @@
<style type="text/css">
body {
- font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
font-size: 0.85em;
margin: 2em 8em;
}
