Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion netbox/project-static/dist/netbox-external.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion netbox/project-static/dist/netbox.css

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion netbox/project-static/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"validate:formatting:scripts": "prettier -c src/**/*.ts"
},
"dependencies": {
"@fontsource-variable/plus-jakarta-sans": "^5.1.0",
"@mdi/font": "7.4.47",
"@tabler/core": "1.0.0-beta21",
"bootstrap": "5.3.3",
Expand All @@ -33,6 +32,7 @@
"query-string": "9.1.0",
"sass": "1.78.0",
"tom-select": "2.3.1",
"typeface-inter": "3.18.1",
"typeface-roboto-mono": "1.1.13"
},
"devDependencies": {
Expand Down
3 changes: 1 addition & 2 deletions netbox/project-static/styles/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
// Global variables

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

// Set the navigation sidebar width
$sidebar-width: 18rem;
Expand Down
2 changes: 1 addition & 1 deletion netbox/project-static/styles/external.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
@import 'gridstack/dist/gridstack.min.css';

// Fonts
@import url("../node_modules/typeface-inter/inter.css");
@import url("../node_modules/typeface-roboto-mono/index.css");
@import url("../node_modules/@fontsource-variable/plus-jakarta-sans/index.css");
10 changes: 5 additions & 5 deletions netbox/project-static/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,6 @@
resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.2.tgz#d8bae93ac8b815b2bd7a98078cf91e2724ef11e5"
integrity sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw==

"@fontsource-variable/plus-jakarta-sans@^5.1.0":
version "5.1.0"
resolved "https://registry.yarnpkg.com/@fontsource-variable/plus-jakarta-sans/-/plus-jakarta-sans-5.1.0.tgz#9dd5aa72277c43d408f6e34cd658d823fbef1fe1"
integrity sha512-K7o2GO7/quVFFyfjTqYZu0ng4KJGf60KSAGbvUWwKuH+/Giyl6Qe/EqnGLcjrl9AmXZzTvtRB1xpkASn8FNFoQ==

"@graphiql/[email protected]":
version "3.2.2"
resolved "https://registry.yarnpkg.com/@graphiql/plugin-explorer/-/plugin-explorer-3.2.2.tgz#973d6015b6db15041902e95c3e4b746473313eb6"
Expand Down Expand Up @@ -2852,6 +2847,11 @@ typed-array-length@^1.0.6:
is-typed-array "^1.1.13"
possible-typed-array-names "^1.0.0"

[email protected]:
version "3.18.1"
resolved "https://registry.yarnpkg.com/typeface-inter/-/typeface-inter-3.18.1.tgz#24cccdf29923f318589783997be20a662cd3ab9c"
integrity sha512-c+TBanYFCvmg3j5vPk+zxK4ocMZbPxMEmjnwG7rPQoV87xvQ6b07VbAOC0Va0XBbbZCGw6cWNeFuLeg1YQru3Q==

[email protected]:
version "1.1.13"
resolved "https://registry.yarnpkg.com/typeface-roboto-mono/-/typeface-roboto-mono-1.1.13.tgz#2af8662db8f9119c00efd55d6ed8877d2a69ec94"
Expand Down
2 changes: 1 addition & 1 deletion netbox/templates/generic/_base.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

{# Title #}
<div>
<h1 class="page-title mt-1 mb-2">{% block title %}{% endblock title %}</h1>
<h1 class="page-title">{% block title %}{% endblock title %}</h1>
{% block subtitle %}{% endblock %}
</div>

Expand Down