Launchpad itself

Merge lp:~mbp/launchpad/714381-beta-font into lp:launchpad

  1. 714381-beta-font
  2. Merge into devel
Proposed by Martin Pool
Status: Merged
Approved by: Martin Pool
Approved revision: no longer in the source branch.
Merged at revision: 14471
Proposed branch: lp:~mbp/launchpad/714381-beta-font
Merge into: lp:launchpad
Diff against target: 249 lines (+20/-20)
18 files modified
lib/canonical/launchpad/icing/css/base.css (+1/-1)
lib/canonical/launchpad/icing/css/forms.css (+1/-1)
lib/canonical/launchpad/icing/css/modifiers.css (+1/-1)
lib/canonical/launchpad/icing/css/typography.css (+1/-1)
lib/canonical/launchpad/icing/shipit.css (+2/-2)
lib/canonical/launchpad/icing/style.css (+2/-2)
lib/canonical/launchpad/icing/yui_2.7.0b/build/calendar/assets/skins/sam/calendar-skin.css (+1/-1)
lib/canonical/launchpad/offline-maintenance-haproxy.html (+1/-1)
lib/canonical/launchpad/offline-maintenance.html (+1/-1)
lib/canonical/launchpad/offline-staging-code-update.html (+1/-1)
lib/canonical/launchpad/offline-staging-db-update.html (+1/-1)
lib/canonical/launchpad/offline-unplanned-haproxy.html (+1/-1)
lib/canonical/launchpad/offline-unplanned.html (+1/-1)
lib/canonical/launchpad/webapp/error.py (+1/-1)
lib/canonical/launchpad/webapp/templates/oops-veryplain.pt (+1/-1)
lib/lp/app/templates/launchpad-databaseunavailable.pt (+1/-1)
lib/lp/code/templates/sourcepackagerecipe-index.pt (+1/-1)
utilities/apidoc-index.pt (+1/-1)
To merge this branch: bzr merge lp:~mbp/launchpad/714381-beta-font
Reviewer Review Type Date Requested Status
Jeroen T. Vermeulen (community) Approve
Review via email: mp+84716@code.launchpad.net

Commit message

[r=jtv][bug=714381] remove UbuntuBeta font from css

Description of the change

This removes references to the UbuntuBeta font per bug 714381: 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

To post a comment you must log in.
Revision history for this message
Jeroen T. Vermeulen (jtv) wrote :

I don't think 714831 was the right bug number!

Generally looks good. It seems ugly to quote some font names but not others; then again this is CSS, not code.

In lib/lp/code/templates/sourcepackagerecipe-index.pt maybe it would be a nice touch to separate the font names by adding a space after the comma. But that's a pre-existing thing.

review: Approve
Revision history for this message
Martin Pool (mbp) wrote :

On 7 December 2011 23:37, Jeroen T. Vermeulen <email address hidden> wrote:
> Review: Approve
>
> I don't think 714831 was the right bug number!

should have been bug 714381

> Generally looks good.  It seems ugly to quote some font names but not others; then again this is CSS, not code.

I think that is idiomatic in CSS? At any rate it is common in Launchpad's css.

--
Martin

Revision history for this message
Paul Sladen (sladen) wrote :

There will continue to be betas of new scripts/functionality/bug-fixes that haven't actually been *released*. These will likely continue under the "UbuntuBeta" and "UbuntuBeta Mono" names, but I don't see why Launchpad has to carry that baggage.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/launchpad/icing/css/base.css'
2--- lib/canonical/launchpad/icing/css/base.css 2011-11-18 05:32:00 +0000
3+++ lib/canonical/launchpad/icing/css/base.css 2011-12-07 05:09:25 +0000
4@@ -1,5 +1,5 @@
5 body {
6- font-family: 'UbuntuBeta Regular', Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
7+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
8 font-size: 12px;
9 line-height: 18px; /* The same as the sprite height. */
10 color: #333;
11
12=== modified file 'lib/canonical/launchpad/icing/css/forms.css'
13--- lib/canonical/launchpad/icing/css/forms.css 2011-11-18 05:15:52 +0000
14+++ lib/canonical/launchpad/icing/css/forms.css 2011-12-07 05:09:25 +0000
15@@ -232,7 +232,7 @@
16 }
17 .lazr-multiline-edit .clearfix h3 {
18 /* Undo the damage done by lazr. */
19- font-family: 'UbuntuBeta Regular', Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
20+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
21 line-height: 12px;
22 }
23 .widget-hd.js-action {
24
25=== modified file 'lib/canonical/launchpad/icing/css/modifiers.css'
26--- lib/canonical/launchpad/icing/css/modifiers.css 2011-11-18 05:15:52 +0000
27+++ lib/canonical/launchpad/icing/css/modifiers.css 2011-12-07 05:09:25 +0000
28@@ -119,7 +119,7 @@
29 }
30 pre.changelog, table.diff,
31 .bug-comment, .bug-activity, .codereviewcomment {
32- font-family: 'UbuntuBeta Mono', 'Ubuntu Mono', monospace;
33+ font-family: 'Ubuntu Mono', monospace;
34 }
35 .cloud-size-smallest {
36 font-size: 10px;
37
38=== modified file 'lib/canonical/launchpad/icing/css/typography.css'
39--- lib/canonical/launchpad/icing/css/typography.css 2011-11-18 05:15:52 +0000
40+++ lib/canonical/launchpad/icing/css/typography.css 2011-12-07 05:09:25 +0000
41@@ -38,7 +38,7 @@
42 width: 60em;
43 }
44 pre, code, samp, tt, .console {
45- font-family: 'UbuntuBeta Mono', 'Ubuntu Mono', monospace;
46+ font-family: 'Ubuntu Mono', monospace;
47 margin-bottom: 0.8em;
48 }
49 pre.wrap {
50
51=== modified file 'lib/canonical/launchpad/icing/shipit.css'
52--- lib/canonical/launchpad/icing/shipit.css 2010-08-21 13:28:33 +0000
53+++ lib/canonical/launchpad/icing/shipit.css 2011-12-07 05:09:25 +0000
54@@ -2,7 +2,7 @@
55
56 html {
57 position: relative;
58- font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
59+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
60 font-size: 12pt;
61 color: black;
62 background-color: #FFFFFF;
63@@ -52,7 +52,7 @@
64 input, select, textarea {
65 background-color: #fff;
66 color: #656565;
67- font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
68+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
69 margin: 0;
70 }
71 input[type="text"], input[type="submit"], input[type="reset"], textarea {
72
73=== modified file 'lib/canonical/launchpad/icing/style.css'
74--- lib/canonical/launchpad/icing/style.css 2011-11-30 06:12:55 +0000
75+++ lib/canonical/launchpad/icing/style.css 2011-12-07 05:09:25 +0000
76@@ -27,7 +27,7 @@
77 */
78 div#edit-description,
79 div#edit-commit_message {
80- font-family: 'UbuntuBeta Mono', 'Ubuntu Mono', monospace;
81+ font-family: 'Ubuntu Mono', monospace;
82 margin: 1em 0;
83 }
84
85@@ -461,7 +461,7 @@
86 padding: 5px;
87 border: solid gray;
88 border-width: 1px;
89- font-family: 'UbuntuBeta Mono', 'Ubuntu Mono', monospace;
90+ font-family: 'Ubuntu Mono', monospace;
91 -moz-border-radius: 5px;
92 -o-border-radius: 5px;
93 -webkit-border-radius: 5px;
94
95=== modified file 'lib/canonical/launchpad/icing/yui_2.7.0b/build/calendar/assets/skins/sam/calendar-skin.css'
96--- lib/canonical/launchpad/icing/yui_2.7.0b/build/calendar/assets/skins/sam/calendar-skin.css 2010-08-21 13:28:33 +0000
97+++ lib/canonical/launchpad/icing/yui_2.7.0b/build/calendar/assets/skins/sam/calendar-skin.css 2011-12-07 05:09:25 +0000
98@@ -264,7 +264,7 @@
99
100 /* NAVIGATOR BOUNDING BOX */
101 .yui-skin-sam .yui-calcontainer .yui-cal-nav {
102- font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
103+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
104 font-size:93%;
105 border:1px solid #808080;
106 left:50%;
107
108=== modified file 'lib/canonical/launchpad/offline-maintenance-haproxy.html'
109--- lib/canonical/launchpad/offline-maintenance-haproxy.html 2010-12-16 22:42:28 +0000
110+++ lib/canonical/launchpad/offline-maintenance-haproxy.html 2011-12-07 05:09:25 +0000
111@@ -7,7 +7,7 @@
112 <title>Launchpad is offline for maintenance</title>
113 <style type="text/css" media="screen, print">
114 html, body {
115- font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
116+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
117 }
118 .offline {
119 text-align: center;
120
121=== modified file 'lib/canonical/launchpad/offline-maintenance.html'
122--- lib/canonical/launchpad/offline-maintenance.html 2010-12-16 17:04:22 +0000
123+++ lib/canonical/launchpad/offline-maintenance.html 2011-12-07 05:09:25 +0000
124@@ -4,7 +4,7 @@
125 <title>Launchpad is offline for maintenance</title>
126 <style type="text/css" media="screen, print">
127 html, body {
128- font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
129+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
130 }
131 .offline {
132 text-align: center;
133
134=== modified file 'lib/canonical/launchpad/offline-staging-code-update.html'
135--- lib/canonical/launchpad/offline-staging-code-update.html 2010-12-16 17:04:22 +0000
136+++ lib/canonical/launchpad/offline-staging-code-update.html 2011-12-07 05:09:25 +0000
137@@ -4,7 +4,7 @@
138 <title>Please try again</title>
139 <style type="text/css" media="screen, print">
140 html, body {
141- font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
142+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
143 }
144 .offline {
145 text-align: center;
146
147=== modified file 'lib/canonical/launchpad/offline-staging-db-update.html'
148--- lib/canonical/launchpad/offline-staging-db-update.html 2010-12-16 17:04:22 +0000
149+++ lib/canonical/launchpad/offline-staging-db-update.html 2011-12-07 05:09:25 +0000
150@@ -4,7 +4,7 @@
151 <title>Please try again</title>
152 <style type="text/css" media="screen, print">
153 html, body {
154- font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
155+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
156 }
157 .offline {
158 text-align: center;
159
160=== modified file 'lib/canonical/launchpad/offline-unplanned-haproxy.html'
161--- lib/canonical/launchpad/offline-unplanned-haproxy.html 2010-12-16 22:42:28 +0000
162+++ lib/canonical/launchpad/offline-unplanned-haproxy.html 2011-12-07 05:09:25 +0000
163@@ -7,7 +7,7 @@
164 <title>Please try again</title>
165 <style type="text/css" media="screen, print">
166 html, body {
167- font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
168+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
169 }
170 .offline {
171 text-align: center;
172
173=== modified file 'lib/canonical/launchpad/offline-unplanned.html'
174--- lib/canonical/launchpad/offline-unplanned.html 2010-12-16 17:04:22 +0000
175+++ lib/canonical/launchpad/offline-unplanned.html 2011-12-07 05:09:25 +0000
176@@ -4,7 +4,7 @@
177 <title>Please try again</title>
178 <style type="text/css" media="screen, print">
179 html, body {
180- font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
181+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
182 }
183 .offline {
184 text-align: center;
185
186=== modified file 'lib/canonical/launchpad/webapp/error.py'
187--- lib/canonical/launchpad/webapp/error.py 2011-10-03 14:39:59 +0000
188+++ lib/canonical/launchpad/webapp/error.py 2011-12-07 05:09:25 +0000
189@@ -107,7 +107,7 @@
190 """Returns the given HTML inside a div of an appropriate class."""
191
192 return ('<div class="highlight" style="'
193- "font-family: 'UbuntuBeta Mono', 'Ubuntu Mono', monospace;"
194+ "font-family: 'Ubuntu Mono', monospace;"
195 ' font-size: smaller;">'
196 '%s'
197 '</div>') % html
198
199=== modified file 'lib/canonical/launchpad/webapp/templates/oops-veryplain.pt'
200--- lib/canonical/launchpad/webapp/templates/oops-veryplain.pt 2011-05-27 21:03:22 +0000
201+++ lib/canonical/launchpad/webapp/templates/oops-veryplain.pt 2011-12-07 05:09:25 +0000
202@@ -11,7 +11,7 @@
203 <title>Oops!</title>
204 <style type="text/css">
205 html {
206- font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
207+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
208 font-size: 8pt;
209 }
210 h1 {background: none; color: #83ad23; font-size: 3em; font-weight: normal;}
211
212=== modified file 'lib/lp/app/templates/launchpad-databaseunavailable.pt'
213--- lib/lp/app/templates/launchpad-databaseunavailable.pt 2011-10-03 14:41:27 +0000
214+++ lib/lp/app/templates/launchpad-databaseunavailable.pt 2011-12-07 05:09:25 +0000
215@@ -16,7 +16,7 @@
216 }
217
218 body {
219- font-family: 'UbuntuBeta Regular', Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
220+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
221 font-size: 0.75em;
222 line-height: 1.3em;
223 color: #000;
224
225=== modified file 'lib/lp/code/templates/sourcepackagerecipe-index.pt'
226--- lib/lp/code/templates/sourcepackagerecipe-index.pt 2011-11-26 04:03:29 +0000
227+++ lib/lp/code/templates/sourcepackagerecipe-index.pt 2011-12-07 05:09:25 +0000
228@@ -13,7 +13,7 @@
229 padding-left: 2em;
230 }
231 div#edit-recipe_text, div#edit-description {
232- font-family: "UbuntuBeta Mono","Ubuntu Mono",monospace;
233+ font-family: "Ubuntu Mono",monospace;
234 margin: 1em 0;
235 }
236 div#edit-recipe_text.yui3-editable_text-content,
237
238=== modified file 'utilities/apidoc-index.pt'
239--- utilities/apidoc-index.pt 2010-08-21 13:28:33 +0000
240+++ utilities/apidoc-index.pt 2011-12-07 05:09:25 +0000
241@@ -10,7 +10,7 @@
242
243 <style type="text/css">
244 body {
245- font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
246+ font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
247 font-size: 0.85em;
248 margin: 2em 8em;
249 }