launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #30041
[Merge] ~petermakowski/launchpad:use-ubuntu-mono-variable-font into launchpad:master
Peter Makowski has proposed merging ~petermakowski/launchpad:use-ubuntu-mono-variable-font into launchpad:master.
Commit message:
use "Ubuntu Mono variable" font
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~petermakowski/launchpad/+git/launchpad/+merge/443677
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
--
Your team Launchpad code reviewers is requested to review the proposed merge of ~petermakowski/launchpad:use-ubuntu-mono-variable-font into launchpad:master.
diff --git a/lib/canonical/launchpad/icing/css/typography.scss b/lib/canonical/launchpad/icing/css/typography.scss
index 1ebf55a..1a4067d 100644
--- a/lib/canonical/launchpad/icing/css/typography.scss
+++ b/lib/canonical/launchpad/icing/css/typography.scss
@@ -1,6 +1,6 @@
// This file the result of auto-converting typography.css to scss.
-$font-monospace: "Ubuntu Mono", Consolas, Monaco, Courier, monospace;
+$font-monospace: "Ubuntu Mono variable", "Ubuntu Mono", Consolas, Monaco, Courier, monospace;
$page-width: 60em;
$wider-page: $page-width + 15em;
$reduced-spacing: 0.8em;
diff --git a/lib/canonical/launchpad/icing/fonts/UbuntuMono.woff2 b/lib/canonical/launchpad/icing/fonts/UbuntuMono.woff2
deleted file mode 100644
index b9c869c..0000000
Binary files a/lib/canonical/launchpad/icing/fonts/UbuntuMono.woff2 and /dev/null differ
diff --git a/lib/canonical/launchpad/icing/fonts/UbuntuMonoBeta0.865[wght]-latin.woff2 b/lib/canonical/launchpad/icing/fonts/UbuntuMonoBeta0.865[wght]-latin.woff2
new file mode 100644
index 0000000..d6e1947
Binary files /dev/null and b/lib/canonical/launchpad/icing/fonts/UbuntuMonoBeta0.865[wght]-latin.woff2 differ
diff --git a/lib/canonical/launchpad/icing/style.css b/lib/canonical/launchpad/icing/style.css
index 1d888a8..ebe7aa2 100644
--- a/lib/canonical/launchpad/icing/style.css
+++ b/lib/canonical/launchpad/icing/style.css
@@ -27,7 +27,7 @@
*/
div#edit-description,
div#edit-commit_message {
- font-family: "Ubuntu Mono", Consolas, Monaco, Courier, monospace;
+ font-family: "Ubuntu Mono variable", "Ubuntu Mono variable", "Ubuntu Mono", Consolas, Monaco, Courier, monospace;
margin: 1em 0;
}
@@ -517,7 +517,7 @@ div.logtail {
padding: 5px;
border: solid gray;
border-width: 1px;
- font-family: "Ubuntu Mono", Consolas, Monaco, Courier, monospace;
+ font-family: "Ubuntu Mono variable", "Ubuntu Mono", Consolas, Monaco, Courier, monospace;
border-radius: 5px;
}
@@ -564,7 +564,7 @@ code.command {
border-radius: 3px;
color: #626262;
padding: 4px;
- font-family: "Ubuntu Mono", Consolas, Monaco, Courier, monospace;
+ font-family: "Ubuntu Mono variable", "Ubuntu Mono", Consolas, Monaco, Courier, monospace;
font-size: 1.05em;
}
code.command-block {
@@ -678,7 +678,7 @@ table.diff .inline-comments .boardComment {
}
table.diff .inline-comments .boardCommentBody {
word-wrap: break-word;
- font-family: "Ubuntu Mono", Consolas, Monaco, Courier, monospace;
+ font-family: "Ubuntu Mono variable", "Ubuntu Mono", Consolas, Monaco, Courier, monospace;
padding-bottom: 0.5em;
}
table.diff .inline-comments .yui3-ieditor-multiline .yui3-ieditor-btns
diff --git a/lib/canonical/launchpad/icing/ubuntu-webfonts.css b/lib/canonical/launchpad/icing/ubuntu-webfonts.css
index 3ad51c8..980c072 100644
--- a/lib/canonical/launchpad/icing/ubuntu-webfonts.css
+++ b/lib/canonical/launchpad/icing/ubuntu-webfonts.css
@@ -29,8 +29,8 @@
src: local('Ubuntu'), url('fonts/Ubuntu.woff') format('woff');
}
@font-face {
- font-family: 'Ubuntu Mono';
+ font-family: 'Ubuntu Mono variable';
font-style: normal;
font-weight: 100 800; /* min and max value for the weight axis */
- src: url('fonts/UbuntuMono.woff2') format('woff2');
+ src: url('fonts/UbuntuMonoBeta0.865[wght]-latin.woff2') format('woff2-variations');
}
diff --git a/lib/lp/services/webapp/error.py b/lib/lp/services/webapp/error.py
index c6ef924..ac77583 100644
--- a/lib/lp/services/webapp/error.py
+++ b/lib/lp/services/webapp/error.py
@@ -117,7 +117,8 @@ class SystemErrorView(LaunchpadView):
return (
'<div class="highlight" style="'
- 'font-family: "Ubuntu Mono", Consolas, Monaco, Courier, monospace;'
+ 'font-family: "Ubuntu Mono variable", "Ubuntu Mono",'
+ ' Consolas, Monaco, Courier, monospace;'
' font-size: smaller;">'
"%s"
"</div>"