Skip to content

Commit d6d71a1

Browse files
andrewgormleyAndrew Gormleyjeremystretch
authored
fixed #16847: updated font (#16848)
* fixed #16847: updated font * fixed #16847: changed font to local and added current font as fallback * fixed #16847: removed inter and added padding to page header --------- Co-authored-by: Andrew Gormley <Andrew@MacBook-Pro-3.local> Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>
1 parent 561f505 commit d6d71a1

11 files changed

+11
-10
lines changed

netbox/project-static/dist/netbox-external.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

netbox/project-static/dist/netbox.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.
Binary file not shown.

netbox/project-static/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"validate:formatting:scripts": "prettier -c src/**/*.ts"
2323
},
2424
"dependencies": {
25+
"@fontsource-variable/plus-jakarta-sans": "^5.0.21",
2526
"@mdi/font": "7.4.47",
2627
"@tabler/core": "1.0.0-beta20",
2728
"bootstrap": "5.3.3",
@@ -32,7 +33,6 @@
3233
"query-string": "9.0.0",
3334
"sass": "1.77.6",
3435
"tom-select": "2.3.1",
35-
"typeface-inter": "3.18.1",
3636
"typeface-roboto-mono": "1.1.13"
3737
},
3838
"devDependencies": {

netbox/project-static/styles/_variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Global variables
22

33
// Set base fonts
4-
$font-family-sans-serif: 'Inter';
4+
$font-family-sans-serif: 'Plus Jakarta Sans Variable', system-ui, sans-serif;
55
// See https://github.com/tabler/tabler/issues/1812
66
$font-family-monospace: 'Roboto Mono';
77

netbox/project-static/styles/external.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
// Fonts
77
@import url("../node_modules/typeface-inter/inter.css");
88
@import url("../node_modules/typeface-roboto-mono/index.css");
9+
@import url("../node_modules/@fontsource-variable/plus-jakarta-sans/index.css");

netbox/project-static/yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@
8080
resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.2.tgz#d8bae93ac8b815b2bd7a98078cf91e2724ef11e5"
8181
integrity sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw==
8282

83+
"@fontsource-variable/plus-jakarta-sans@^5.0.21":
84+
version "5.0.21"
85+
resolved "https://registry.yarnpkg.com/@fontsource-variable/plus-jakarta-sans/-/plus-jakarta-sans-5.0.21.tgz#3bb6e0d16add99f0b93981443d4d763ea85ad13b"
86+
integrity sha512-VTQB+MnaYbjLNmfxQJ/Fc2rayLGlqTiZa6nZTpplS0lJF3XKcWPPItilGFMZW4lfwIiroo+FIfBewBOF3MrMPQ==
87+
8388
"@graphiql/plugin-explorer@2.0.0":
8489
version "2.0.0"
8590
resolved "https://registry.yarnpkg.com/@graphiql/plugin-explorer/-/plugin-explorer-2.0.0.tgz#d6869cba019ae6fac006ce61ae3470d8c8a83938"
@@ -2774,11 +2779,6 @@ typed-array-length@^1.0.6:
27742779
is-typed-array "^1.1.13"
27752780
possible-typed-array-names "^1.0.0"
27762781

2777-
typeface-inter@3.18.1:
2778-
version "3.18.1"
2779-
resolved "https://registry.yarnpkg.com/typeface-inter/-/typeface-inter-3.18.1.tgz#24cccdf29923f318589783997be20a662cd3ab9c"
2780-
integrity sha512-c+TBanYFCvmg3j5vPk+zxK4ocMZbPxMEmjnwG7rPQoV87xvQ6b07VbAOC0Va0XBbbZCGw6cWNeFuLeg1YQru3Q==
2781-
27822782
typeface-roboto-mono@1.1.13:
27832783
version "1.1.13"
27842784
resolved "https://registry.yarnpkg.com/typeface-roboto-mono/-/typeface-roboto-mono-1.1.13.tgz#2af8662db8f9119c00efd55d6ed8877d2a69ec94"

netbox/templates/generic/_base.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
{# Title #}
1212
<div>
13-
<h2 class="page-title my-1">{% block title %}{% endblock title %}</h2>
13+
<h2 class="page-title mt-1 mb-2">{% block title %}{% endblock title %}</h2>
1414
{% block subtitle %}{% endblock %}
1515
</div>
1616

0 commit comments

Comments
 (0)