Launchpad itself

Merge lp:~cjohnston/launchpad/883258-monospace into lp:launchpad

  1. 883258-monospace
  2. Merge into devel
Proposed by Chris Johnston
Status: Merged
Approved by: William Grant
Approved revision: no longer in the source branch.
Merged at revision: 17007
Proposed branch: lp:~cjohnston/launchpad/883258-monospace
Merge into: lp:launchpad
Diff against target: 73 lines (+6/-6)
5 files modified
lib/canonical/launchpad/icing/css/modifiers.css (+1/-1)
lib/canonical/launchpad/icing/css/typography.css (+1/-1)
lib/canonical/launchpad/icing/style.css (+2/-2)
lib/lp/code/templates/sourcepackagerecipe-index.pt (+1/-1)
lib/lp/services/webapp/error.py (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/launchpad/883258-monospace
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+219481@code.launchpad.net

Commit message

Switch from using Ubuntu Mono to monospace for easier readability.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

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/modifiers.css'
2--- lib/canonical/launchpad/icing/css/modifiers.css 2013-04-22 06:20:18 +0000
3+++ lib/canonical/launchpad/icing/css/modifiers.css 2014-05-14 10:23:58 +0000
4@@ -169,7 +169,7 @@
5 table.diff,
6 .comment-text,
7 .bug-activity {
8- font-family: 'Ubuntu Mono', monospace;
9+ font-family: monospace;
10 }
11
12 .cloud-size-smallest {
13
14=== modified file 'lib/canonical/launchpad/icing/css/typography.css'
15--- lib/canonical/launchpad/icing/css/typography.css 2012-09-12 01:36:22 +0000
16+++ lib/canonical/launchpad/icing/css/typography.css 2014-05-14 10:23:58 +0000
17@@ -41,7 +41,7 @@
18 width: 60em;
19 }
20 pre, code, samp, tt, .console {
21- font-family: 'Ubuntu Mono', monospace;
22+ font-family: monospace;
23 margin-bottom: 0.8em;
24 }
25 pre.wrap {
26
27=== modified file 'lib/canonical/launchpad/icing/style.css'
28--- lib/canonical/launchpad/icing/style.css 2013-09-05 03:57:28 +0000
29+++ lib/canonical/launchpad/icing/style.css 2014-05-14 10:23:58 +0000
30@@ -27,7 +27,7 @@
31 */
32 div#edit-description,
33 div#edit-commit_message {
34- font-family: 'Ubuntu Mono', monospace;
35+ font-family: monospace;
36 margin: 1em 0;
37 }
38
39@@ -485,7 +485,7 @@
40 padding: 5px;
41 border: solid gray;
42 border-width: 1px;
43- font-family: 'Ubuntu Mono', monospace;
44+ font-family: monospace;
45 border-radius: 5px;
46 }
47
48
49=== modified file 'lib/lp/code/templates/sourcepackagerecipe-index.pt'
50--- lib/lp/code/templates/sourcepackagerecipe-index.pt 2012-08-22 17:38:03 +0000
51+++ lib/lp/code/templates/sourcepackagerecipe-index.pt 2014-05-14 10:23:58 +0000
52@@ -13,7 +13,7 @@
53 padding-left: 2em;
54 }
55 div#edit-recipe_text, div#edit-description {
56- font-family: "Ubuntu Mono",monospace;
57+ font-family: monospace;
58 margin: 1em 0;
59 }
60 div#edit-recipe_text.yui3-editable_text-content,
61
62=== modified file 'lib/lp/services/webapp/error.py'
63--- lib/lp/services/webapp/error.py 2013-08-27 01:30:47 +0000
64+++ lib/lp/services/webapp/error.py 2014-05-14 10:23:58 +0000
65@@ -115,7 +115,7 @@
66 """Returns the given HTML inside a div of an appropriate class."""
67
68 return ('<div class="highlight" style="'
69- "font-family: 'Ubuntu Mono', monospace;"
70+ "font-family: monospace;"
71 ' font-size: smaller;">'
72 '%s'
73 '</div>') % html