Launchpad itself

Merge ~petermakowski/launchpad:use-ubuntu-mono-variable-font into launchpad:master

  1. Git
  2. lp:~petermakowski/launchpad
  3. use-ubuntu-mono-variable-font
  4. Merge into master
Proposed by Peter Makowski
Status: Merged
Approved by: Ines Almeida
Approved revision: ea8cac4059279efa9a8a485740f8055c78cf158b
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~petermakowski/launchpad:use-ubuntu-mono-variable-font
Merge into: launchpad:master
Diff against target: 89 lines (+9/-8)
4 files modified
lib/canonical/launchpad/icing/css/typography.scss (+1/-1)
lib/canonical/launchpad/icing/style.css (+4/-4)
lib/canonical/launchpad/icing/ubuntu-webfonts.css (+2/-2)
lib/lp/services/webapp/error.py (+2/-1)
Reviewer Review Type Date Requested Status
Ines Almeida Approve
Review via email: mp+443677@code.launchpad.net

Commit message

use "Ubuntu Mono variable" font

Description of the change

use the latest "Ubuntu Mono variable" font
as the regular Ubuntu Mono font does not render with the expected size and weight

https://github.com/canonical/vanilla-framework/blob/c4819c46b5eaaf70b849230ec696a658c526697d/scss/_base_fontfaces.scss#L22

## Screenshots
### Before
https://share.cleanshot.com/71trYprm
### After
https://share.cleanshot.com/l0LhlC56

To post a comment you must log in.
Revision history for this message
Ines Almeida (ines-almeida) wrote :

Very small comments below

review: Needs Fixing
Revision history for this message
Peter Makowski (petermakowski) :
Revision history for this message
Ines Almeida (ines-almeida) wrote :

Looks good, thank you!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/canonical/launchpad/icing/css/typography.scss b/lib/canonical/launchpad/icing/css/typography.scss
2index 1ebf55a..1a4067d 100644
3--- a/lib/canonical/launchpad/icing/css/typography.scss
4+++ b/lib/canonical/launchpad/icing/css/typography.scss
5@@ -1,6 +1,6 @@
6 // This file the result of auto-converting typography.css to scss.
7
8-$font-monospace: "Ubuntu Mono", Consolas, Monaco, Courier, monospace;
9+$font-monospace: "Ubuntu Mono variable", "Ubuntu Mono", Consolas, Monaco, Courier, monospace;
10 $page-width: 60em;
11 $wider-page: $page-width + 15em;
12 $reduced-spacing: 0.8em;
13diff --git a/lib/canonical/launchpad/icing/fonts/UbuntuMono.woff2 b/lib/canonical/launchpad/icing/fonts/UbuntuMono.woff2
14deleted file mode 100644
15index b9c869c..0000000
16Binary files a/lib/canonical/launchpad/icing/fonts/UbuntuMono.woff2 and /dev/null differ
17diff --git a/lib/canonical/launchpad/icing/fonts/UbuntuMonoBeta0.865[wght]-latin.woff2 b/lib/canonical/launchpad/icing/fonts/UbuntuMonoBeta0.865[wght]-latin.woff2
18new file mode 100644
19index 0000000..d6e1947
20Binary files /dev/null and b/lib/canonical/launchpad/icing/fonts/UbuntuMonoBeta0.865[wght]-latin.woff2 differ
21diff --git a/lib/canonical/launchpad/icing/style.css b/lib/canonical/launchpad/icing/style.css
22index 1d888a8..fcda434 100644
23--- a/lib/canonical/launchpad/icing/style.css
24+++ b/lib/canonical/launchpad/icing/style.css
25@@ -27,7 +27,7 @@
26 */
27 div#edit-description,
28 div#edit-commit_message {
29- font-family: "Ubuntu Mono", Consolas, Monaco, Courier, monospace;
30+ font-family: "Ubuntu Mono variable", "Ubuntu Mono", Consolas, Monaco, Courier, monospace;
31 margin: 1em 0;
32 }
33
34@@ -517,7 +517,7 @@ div.logtail {
35 padding: 5px;
36 border: solid gray;
37 border-width: 1px;
38- font-family: "Ubuntu Mono", Consolas, Monaco, Courier, monospace;
39+ font-family: "Ubuntu Mono variable", "Ubuntu Mono", Consolas, Monaco, Courier, monospace;
40 border-radius: 5px;
41 }
42
43@@ -564,7 +564,7 @@ code.command {
44 border-radius: 3px;
45 color: #626262;
46 padding: 4px;
47- font-family: "Ubuntu Mono", Consolas, Monaco, Courier, monospace;
48+ font-family: "Ubuntu Mono variable", "Ubuntu Mono", Consolas, Monaco, Courier, monospace;
49 font-size: 1.05em;
50 }
51 code.command-block {
52@@ -678,7 +678,7 @@ table.diff .inline-comments .boardComment {
53 }
54 table.diff .inline-comments .boardCommentBody {
55 word-wrap: break-word;
56- font-family: "Ubuntu Mono", Consolas, Monaco, Courier, monospace;
57+ font-family: "Ubuntu Mono variable", "Ubuntu Mono", Consolas, Monaco, Courier, monospace;
58 padding-bottom: 0.5em;
59 }
60 table.diff .inline-comments .yui3-ieditor-multiline .yui3-ieditor-btns
61diff --git a/lib/canonical/launchpad/icing/ubuntu-webfonts.css b/lib/canonical/launchpad/icing/ubuntu-webfonts.css
62index 3ad51c8..980c072 100644
63--- a/lib/canonical/launchpad/icing/ubuntu-webfonts.css
64+++ b/lib/canonical/launchpad/icing/ubuntu-webfonts.css
65@@ -29,8 +29,8 @@
66 src: local('Ubuntu'), url('fonts/Ubuntu.woff') format('woff');
67 }
68 @font-face {
69- font-family: 'Ubuntu Mono';
70+ font-family: 'Ubuntu Mono variable';
71 font-style: normal;
72 font-weight: 100 800; /* min and max value for the weight axis */
73- src: url('fonts/UbuntuMono.woff2') format('woff2');
74+ src: url('fonts/UbuntuMonoBeta0.865[wght]-latin.woff2') format('woff2-variations');
75 }
76diff --git a/lib/lp/services/webapp/error.py b/lib/lp/services/webapp/error.py
77index c6ef924..ddb9eab 100644
78--- a/lib/lp/services/webapp/error.py
79+++ b/lib/lp/services/webapp/error.py
80@@ -117,7 +117,8 @@ class SystemErrorView(LaunchpadView):
81
82 return (
83 '<div class="highlight" style="'
84- 'font-family: "Ubuntu Mono", Consolas, Monaco, Courier, monospace;'
85+ 'font-family: "Ubuntu Mono variable", "Ubuntu Mono",'
86+ " Consolas, Monaco, Courier, monospace;"
87 ' font-size: smaller;">'
88 "%s"
89 "</div>"

Subscribers

People subscribed via source and target branches

to status/vote changes: