Merge ~petermakowski/launchpad:update-ubuntu-font into launchpad:master

Proposed by Peter Makowski
Status: Merged
Approved by: Guruprasad
Approved revision: 286e6213b4babf6545d8ef7ddd1deadd6438d3bd
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~petermakowski/launchpad:update-ubuntu-font
Merge into: launchpad:master
Diff against target: 91 lines (+10/-20)
2 files modified
lib/canonical/launchpad/icing/css/base.scss (+1/-1)
lib/canonical/launchpad/icing/ubuntu-webfonts.css (+9/-19)
Reviewer Review Type Date Requested Status
Simone Pelosi Approve
Guruprasad Approve
Review via email: mp+447969@code.launchpad.net

Commit message

update Ubuntu Mono variable font
- add Ubuntu variable font

Description of the change

This updates launchpad to use the latest official Ubuntu web fonts and follows vanilla framework implementation.

https://github.com/canonical/vanilla-framework/blob/0fea7c49ee123526ee5d8f234b0529441a41364e/scss/_base_fontfaces.scss

More about Ubuntu font: https://vanillaframework.io/docs/base/typography

---

# Screenshots

## Description

### Before
https://share.cleanshot.com/N96WczXK

### After
https://share.cleanshot.com/fNq109dK

## Preview Diff

### Before
https://share.cleanshot.com/w0fxyPch

### After
https://share.cleanshot.com/V3rqHV4m

To post a comment you must log in.
Revision history for this message
Guruprasad (lgp171188) wrote :

Hi Peter, thank you for making a contribution to Launchpad. Can you explain the reasoning behind this change and provide screenshots illustrating the difference, if any? I am not able to understand by just looking at the diff below.

review: Needs Information
Revision history for this message
Peter Makowski (petermakowski) wrote :

> Hi Peter, thank you for making a contribution to Launchpad. Can you explain
> the reasoning behind this change and provide screenshots illustrating the
> difference, if any? I am not able to understand by just looking at the diff
> below.

I added more information to the description, please have a look. Thanks!

Revision history for this message
Guruprasad (lgp171188) wrote :

LGTM 👍

review: Approve
Revision history for this message
Guruprasad (lgp171188) wrote :

I will land this after doing some testing locally and on dogfood.

Revision history for this message
Simone Pelosi (pelpsi) wrote :

LGTM!

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/base.scss b/lib/canonical/launchpad/icing/css/base.scss
2index 970fce5..f86bbf0 100644
3--- a/lib/canonical/launchpad/icing/css/base.scss
4+++ b/lib/canonical/launchpad/icing/css/base.scss
5@@ -2,7 +2,7 @@
6
7 body {
8 /* line-height is the same as the sprite height. */
9- font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma,
10+ font-family: "Ubuntu variable", Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma,
11 sans-serif;
12 font-size: 0.8rem;
13 line-height: 1.2rem;
14diff --git a/lib/canonical/launchpad/icing/fonts/90b59210-Ubuntu-Italic[wdth,wght]-latin-v0.896a.woff2 b/lib/canonical/launchpad/icing/fonts/90b59210-Ubuntu-Italic[wdth,wght]-latin-v0.896a.woff2
15new file mode 100644
16index 0000000..99b4ad1
17Binary files /dev/null and b/lib/canonical/launchpad/icing/fonts/90b59210-Ubuntu-Italic[wdth,wght]-latin-v0.896a.woff2 differ
18diff --git a/lib/canonical/launchpad/icing/fonts/Ubuntu-Bold.woff b/lib/canonical/launchpad/icing/fonts/Ubuntu-Bold.woff
19deleted file mode 100644
20index e0f87a2..0000000
21Binary files a/lib/canonical/launchpad/icing/fonts/Ubuntu-Bold.woff and /dev/null differ
22diff --git a/lib/canonical/launchpad/icing/fonts/Ubuntu-BoldItalic.woff b/lib/canonical/launchpad/icing/fonts/Ubuntu-BoldItalic.woff
23deleted file mode 100644
24index 5c5c886..0000000
25Binary files a/lib/canonical/launchpad/icing/fonts/Ubuntu-BoldItalic.woff and /dev/null differ
26diff --git a/lib/canonical/launchpad/icing/fonts/Ubuntu-Italic.woff b/lib/canonical/launchpad/icing/fonts/Ubuntu-Italic.woff
27deleted file mode 100644
28index 750f431..0000000
29Binary files a/lib/canonical/launchpad/icing/fonts/Ubuntu-Italic.woff and /dev/null differ
30diff --git a/lib/canonical/launchpad/icing/fonts/Ubuntu.woff b/lib/canonical/launchpad/icing/fonts/Ubuntu.woff
31deleted file mode 100644
32index 4c8f53c..0000000
33Binary files a/lib/canonical/launchpad/icing/fonts/Ubuntu.woff and /dev/null differ
34diff --git a/lib/canonical/launchpad/icing/fonts/UbuntuMonoBeta0.865[wght]-latin.woff2 b/lib/canonical/launchpad/icing/fonts/UbuntuMonoBeta0.865[wght]-latin.woff2
35deleted file mode 100644
36index d6e1947..0000000
37Binary files a/lib/canonical/launchpad/icing/fonts/UbuntuMonoBeta0.865[wght]-latin.woff2 and /dev/null differ
38diff --git a/lib/canonical/launchpad/icing/fonts/d5fc1819-UbuntuMono[wght]-latin-v0.869.woff2 b/lib/canonical/launchpad/icing/fonts/d5fc1819-UbuntuMono[wght]-latin-v0.869.woff2
39new file mode 100644
40index 0000000..6509608
41Binary files /dev/null and b/lib/canonical/launchpad/icing/fonts/d5fc1819-UbuntuMono[wght]-latin-v0.869.woff2 differ
42diff --git a/lib/canonical/launchpad/icing/fonts/f1ea362b-Ubuntu[wdth,wght]-latin-v0.896a.woff2 b/lib/canonical/launchpad/icing/fonts/f1ea362b-Ubuntu[wdth,wght]-latin-v0.896a.woff2
43new file mode 100644
44index 0000000..b8f5de0
45Binary files /dev/null and b/lib/canonical/launchpad/icing/fonts/f1ea362b-Ubuntu[wdth,wght]-latin-v0.896a.woff2 differ
46diff --git a/lib/canonical/launchpad/icing/ubuntu-webfonts.css b/lib/canonical/launchpad/icing/ubuntu-webfonts.css
47index 980c072..6dca761 100644
48--- a/lib/canonical/launchpad/icing/ubuntu-webfonts.css
49+++ b/lib/canonical/launchpad/icing/ubuntu-webfonts.css
50@@ -5,32 +5,22 @@
51 * But served from launchpad.net for performance and security reasons.
52 */
53 @font-face {
54- font-family: 'Ubuntu';
55- font-style: italic;
56- font-weight: normal;
57- src: local('Ubuntu Italic'), local('Ubuntu-Italic'), url('fonts/Ubuntu-Italic.woff') format('woff');
58-}
59-@font-face {
60- font-family: 'Ubuntu';
61+ font-family: 'Ubuntu variable';
62+ font-stretch: 100%; /* min and max value for the width axis, expressed as percentage */
63 font-style: normal;
64- font-weight: bold;
65- src: local('Ubuntu Bold'), local('Ubuntu-Bold'), url('fonts/Ubuntu-Bold.woff') format('woff');
66+ font-weight: 100 800; /* min and max value for the weight axis */
67+ src: url('fonts/f1ea362b-Ubuntu%5Bwdth,wght%5D-latin-v0.896a.woff2') format('woff2-variations');
68 }
69 @font-face {
70- font-family: 'Ubuntu';
71+ font-family: 'Ubuntu variable';
72+ font-stretch: 100%; /* min and max value for the width axis, expressed as percentage */
73 font-style: italic;
74- font-weight: bold;
75- src: local('Ubuntu Bold Italic'), local('Ubuntu-BoldItalic'), url('fonts/Ubuntu-BoldItalic.woff') format('woff');
76-}
77-@font-face {
78- font-family: 'Ubuntu';
79- font-style: normal;
80- font-weight: normal;
81- src: local('Ubuntu'), url('fonts/Ubuntu.woff') format('woff');
82+ font-weight: 100 800; /* min and max value for the weight axis */
83+ src: url('fonts/90b59210-Ubuntu-Italic%5Bwdth,wght%5D-latin-v0.896a.woff2') format('woff2-variations');
84 }
85 @font-face {
86 font-family: 'Ubuntu Mono variable';
87 font-style: normal;
88 font-weight: 100 800; /* min and max value for the weight axis */
89- src: url('fonts/UbuntuMonoBeta0.865[wght]-latin.woff2') format('woff2-variations');
90+ src: url('fonts/d5fc1819-UbuntuMono%5Bwght%5D-latin-v0.869.woff2') format('woff2-variations');
91 }

Subscribers

People subscribed via source and target branches

to status/vote changes: