diff --git a/netbox/netbox/tables/columns.py b/netbox/netbox/tables/columns.py index 2576f70e5..67b11ae2d 100644 --- a/netbox/netbox/tables/columns.py +++ b/netbox/netbox/tables/columns.py @@ -275,7 +275,7 @@ class ActionsColumn(tables.Column): if len(self.actions) == 1 or (self.split_actions and idx == 0): dropdown_class = attrs.css_class button = ( - f'' + f'' f'' ) diff --git a/netbox/project-static/dist/netbox-external.css b/netbox/project-static/dist/netbox-external.css index 05e350aa8..ead382177 100644 Binary files a/netbox/project-static/dist/netbox-external.css and b/netbox/project-static/dist/netbox-external.css differ diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css index fc27a79e7..c7a088e8e 100644 Binary files a/netbox/project-static/dist/netbox.css and b/netbox/project-static/dist/netbox.css differ diff --git a/netbox/project-static/dist/plus-jakarta-sans-cyrillic-ext-wght-normal-3FNWYSHQ.woff2 b/netbox/project-static/dist/plus-jakarta-sans-cyrillic-ext-wght-normal-3FNWYSHQ.woff2 new file mode 100644 index 000000000..c456409f0 Binary files /dev/null and b/netbox/project-static/dist/plus-jakarta-sans-cyrillic-ext-wght-normal-3FNWYSHQ.woff2 differ diff --git a/netbox/project-static/dist/plus-jakarta-sans-latin-ext-wght-normal-WWG75Y4U.woff2 b/netbox/project-static/dist/plus-jakarta-sans-latin-ext-wght-normal-WWG75Y4U.woff2 new file mode 100644 index 000000000..bdb7edfd4 Binary files /dev/null and b/netbox/project-static/dist/plus-jakarta-sans-latin-ext-wght-normal-WWG75Y4U.woff2 differ diff --git a/netbox/project-static/dist/plus-jakarta-sans-latin-wght-normal-S6EFCQOU.woff2 b/netbox/project-static/dist/plus-jakarta-sans-latin-wght-normal-S6EFCQOU.woff2 new file mode 100644 index 000000000..8c4a84afe Binary files /dev/null and b/netbox/project-static/dist/plus-jakarta-sans-latin-wght-normal-S6EFCQOU.woff2 differ diff --git a/netbox/project-static/dist/plus-jakarta-sans-vietnamese-wght-normal-NNXUV3SN.woff2 b/netbox/project-static/dist/plus-jakarta-sans-vietnamese-wght-normal-NNXUV3SN.woff2 new file mode 100644 index 000000000..57866b15f Binary files /dev/null and b/netbox/project-static/dist/plus-jakarta-sans-vietnamese-wght-normal-NNXUV3SN.woff2 differ diff --git a/netbox/project-static/package.json b/netbox/project-static/package.json index c0ee79754..482e78598 100644 --- a/netbox/project-static/package.json +++ b/netbox/project-static/package.json @@ -22,6 +22,7 @@ "validate:formatting:scripts": "prettier -c src/**/*.ts" }, "dependencies": { + "@fontsource-variable/plus-jakarta-sans": "^5.0.21", "@mdi/font": "7.4.47", "@tabler/core": "1.0.0-beta20", "bootstrap": "5.3.3", @@ -32,7 +33,6 @@ "query-string": "9.0.0", "sass": "1.77.6", "tom-select": "2.3.1", - "typeface-inter": "3.18.1", "typeface-roboto-mono": "1.1.13" }, "devDependencies": { diff --git a/netbox/project-static/styles/_variables.scss b/netbox/project-static/styles/_variables.scss index 9a4d510b7..bf73f8361 100644 --- a/netbox/project-static/styles/_variables.scss +++ b/netbox/project-static/styles/_variables.scss @@ -1,7 +1,7 @@ // Global variables // 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 $font-family-monospace: 'Roboto Mono'; diff --git a/netbox/project-static/styles/external.scss b/netbox/project-static/styles/external.scss index b3c83aa87..d89a2f140 100644 --- a/netbox/project-static/styles/external.scss +++ b/netbox/project-static/styles/external.scss @@ -6,3 +6,4 @@ // 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"); diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss index af2905312..46d8da9aa 100644 --- a/netbox/project-static/styles/netbox.scss +++ b/netbox/project-static/styles/netbox.scss @@ -6,6 +6,7 @@ // Overrides of external libraries @import 'overrides/bootstrap'; +@import 'overrides/gridstack'; @import 'overrides/tabler'; @import 'overrides/tomselect'; diff --git a/netbox/project-static/styles/overrides/_gridstack.scss b/netbox/project-static/styles/overrides/_gridstack.scss new file mode 100644 index 000000000..ecb5d9a4c --- /dev/null +++ b/netbox/project-static/styles/overrides/_gridstack.scss @@ -0,0 +1,12 @@ +// Altering dashboard card colors +.grid-stack { + .card-header { + // Default color of card header changes depending on theme + &.bg-default { + background: var(--tblr-bg-surface-secondary)!important; + } + a { + color: inherit!important; + } + } +} diff --git a/netbox/project-static/styles/overrides/_tabler.scss b/netbox/project-static/styles/overrides/_tabler.scss index 120f37990..20ebabab0 100644 --- a/netbox/project-static/styles/overrides/_tabler.scss +++ b/netbox/project-static/styles/overrides/_tabler.scss @@ -93,6 +93,10 @@ body[data-bs-theme=dark] { .btn { color: var(--#{$prefix}body-color); } + // Stops table headers from appearing as primary link color + th.orderable a { + color: var(--#{$prefix}body-color); + } } // Adjusting text colors diff --git a/netbox/project-static/yarn.lock b/netbox/project-static/yarn.lock index 6e5517d59..4f126692b 100644 --- a/netbox/project-static/yarn.lock +++ b/netbox/project-static/yarn.lock @@ -80,6 +80,11 @@ 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.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": version "2.0.0" 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" 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: version "1.1.13" resolved "https://registry.yarnpkg.com/typeface-roboto-mono/-/typeface-roboto-mono-1.1.13.tgz#2af8662db8f9119c00efd55d6ed8877d2a69ec94" diff --git a/netbox/templates/base/base.html b/netbox/templates/base/base.html index 1030c469b..291bebad9 100644 --- a/netbox/templates/base/base.html +++ b/netbox/templates/base/base.html @@ -11,7 +11,7 @@ > - + {# Page title #} diff --git a/netbox/templates/dcim/rack_elevation_list.html b/netbox/templates/dcim/rack_elevation_list.html index e50380ba0..66e4f14b0 100644 --- a/netbox/templates/dcim/rack_elevation_list.html +++ b/netbox/templates/dcim/rack_elevation_list.html @@ -11,7 +11,7 @@ {% trans "View List" %} - diff --git a/netbox/templates/extras/dashboard/widget.html b/netbox/templates/extras/dashboard/widget.html index 39be16145..51b40342e 100644 --- a/netbox/templates/extras/dashboard/widget.html +++ b/netbox/templates/extras/dashboard/widget.html @@ -9,14 +9,14 @@ gs-id="{{ widget.id }}" >
-
+
- +
{% if widget.title %} @@ -29,7 +29,7 @@ data-bs-toggle="modal" data-bs-target="#htmx-modal" > - +
diff --git a/netbox/templates/generic/_base.html b/netbox/templates/generic/_base.html index 4e88d39d7..6c279b102 100644 --- a/netbox/templates/generic/_base.html +++ b/netbox/templates/generic/_base.html @@ -10,7 +10,7 @@ {# Title #}
-

{% block title %}{% endblock title %}

+

{% block title %}{% endblock title %}

{% block subtitle %}{% endblock %}