NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-08 08:38:16 -06:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

fixed #16847: updated font (#16848)

Browse Source 
* 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>
This commit is contained in:
Andrew Gormley 2024-07-15 13:45:36 +01:00 committed by GitHub
parent 561f50561f
commit d6d71a1d40
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
netbox/project-static/dist/netbox-external.css vendored
View File

Binary file not shown.

BIN
netbox/project-static/dist/netbox.css vendored
View File

Binary file not shown.

BIN
netbox/project-static/dist/plus-jakarta-sans-cyrillic-ext-wght-normal-3FNWYSHQ.woff2 vendored Normal file
View File

Binary file not shown.

BIN
netbox/project-static/dist/plus-jakarta-sans-latin-ext-wght-normal-WWG75Y4U.woff2 vendored Normal file
View File

Binary file not shown.

BIN
netbox/project-static/dist/plus-jakarta-sans-latin-wght-normal-S6EFCQOU.woff2 vendored Normal file
View File

Binary file not shown.

BIN
netbox/project-static/dist/plus-jakarta-sans-vietnamese-wght-normal-NNXUV3SN.woff2 vendored Normal file
View File

Binary file not shown.

2
netbox/project-static/package.json
View File

@ -22,6 +22,7 @@
"validate:formatting:scripts": "prettier -c src/**/*.ts" "validate:formatting:scripts": "prettier -c src/**/*.ts"
}, },
"dependencies": { "dependencies": {
"@fontsource-variable/plus-jakarta-sans": "^5.0.21",
"@mdi/font": "7.4.47", "@mdi/font": "7.4.47",
"@tabler/core": "1.0.0-beta20", "@tabler/core": "1.0.0-beta20",
"bootstrap": "5.3.3", "bootstrap": "5.3.3",
@ -32,7 +33,6 @@
"query-string": "9.0.0", "query-string": "9.0.0",
"sass": "1.77.6", "sass": "1.77.6",
"tom-select": "2.3.1", "tom-select": "2.3.1",
"typeface-inter": "3.18.1",
"typeface-roboto-mono": "1.1.13" "typeface-roboto-mono": "1.1.13"
}, },
"devDependencies": { "devDependencies": {

2
netbox/project-static/styles/_variables.scss
View File

@ -1,7 +1,7 @@
// Global variables // Global variables
// Set base fonts // Set base fonts
$font-family-sans-serif: 'Inter'; $font-family-sans-serif: 'Plus Jakarta Sans Variable', system-ui, sans-serif;
// See https://github.com/tabler/tabler/issues/1812 // See https://github.com/tabler/tabler/issues/1812
$font-family-monospace: 'Roboto Mono'; $font-family-monospace: 'Roboto Mono';

1
netbox/project-static/styles/external.scss
View File

@ -6,3 +6,4 @@
// Fonts // Fonts
@import url("../node_modules/typeface-inter/inter.css"); @import url("../node_modules/typeface-inter/inter.css");
@import url("../node_modules/typeface-roboto-mono/index.css"); @import url("../node_modules/typeface-roboto-mono/index.css");
@import url("../node_modules/@fontsource-variable/plus-jakarta-sans/index.css");

10
netbox/project-static/yarn.lock
View File

@ -80,6 +80,11 @@
resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.2.tgz#d8bae93ac8b815b2bd7a98078cf91e2724ef11e5" resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.2.tgz#d8bae93ac8b815b2bd7a98078cf91e2724ef11e5"
integrity sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw== integrity sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw==
"@fontsource-variable/plus-jakarta-sans@^5.0.21":
version "5.0.21"
resolved "https://registry.yarnpkg.com/@fontsource-variable/plus-jakarta-sans/-/plus-jakarta-sans-5.0.21.tgz#3bb6e0d16add99f0b93981443d4d763ea85ad13b"
integrity sha512-VTQB+MnaYbjLNmfxQJ/Fc2rayLGlqTiZa6nZTpplS0lJF3XKcWPPItilGFMZW4lfwIiroo+FIfBewBOF3MrMPQ==
"@graphiql/plugin-explorer@2.0.0": "@graphiql/plugin-explorer@2.0.0":
version "2.0.0" version "2.0.0"
resolved "https://registry.yarnpkg.com/@graphiql/plugin-explorer/-/plugin-explorer-2.0.0.tgz#d6869cba019ae6fac006ce61ae3470d8c8a83938" 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:
is-typed-array "^1.1.13" is-typed-array "^1.1.13"
possible-typed-array-names "^1.0.0" possible-typed-array-names "^1.0.0"
typeface-inter@3.18.1:
version "3.18.1"
resolved "https://registry.yarnpkg.com/typeface-inter/-/typeface-inter-3.18.1.tgz#24cccdf29923f318589783997be20a662cd3ab9c"
integrity sha512-c+TBanYFCvmg3j5vPk+zxK4ocMZbPxMEmjnwG7rPQoV87xvQ6b07VbAOC0Va0XBbbZCGw6cWNeFuLeg1YQru3Q==
typeface-roboto-mono@1.1.13: typeface-roboto-mono@1.1.13:
version "1.1.13" version "1.1.13"
resolved "https://registry.yarnpkg.com/typeface-roboto-mono/-/typeface-roboto-mono-1.1.13.tgz#2af8662db8f9119c00efd55d6ed8877d2a69ec94" resolved "https://registry.yarnpkg.com/typeface-roboto-mono/-/typeface-roboto-mono-1.1.13.tgz#2af8662db8f9119c00efd55d6ed8877d2a69ec94"

2
netbox/templates/generic/_base.html
View File

@ -10,7 +10,7 @@
{# Title #} {# Title #}
<div> <div>
<h2 class="page-title my-1">{% block title %}{% endblock title %}</h2> <h2 class="page-title mt-1 mb-2">{% block title %}{% endblock title %}</h2>
{% block subtitle %}{% endblock %} {% block subtitle %}{% endblock %}
</div> </div>