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 03faeba00..96d758ad7 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 01dcd8062..04bb37c05 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/overrides/_tabler.scss b/netbox/project-static/styles/overrides/_tabler.scss index 5319651de..fba5e6f3c 100644 --- a/netbox/project-static/styles/overrides/_tabler.scss +++ b/netbox/project-static/styles/overrides/_tabler.scss @@ -45,8 +45,13 @@ pre { @include color-mode(dark, true) { --#{$prefix}alert-color: darken(var(--#{$prefix}warning),10%); --#{$prefix}link-color: #{$bright-teal}; - --#{$prefix}primary-rgb: 0,242,212; + --#{$prefix}link-color-rgb: 0,242,212; + --#{$prefix}link-hover-color-rgb: 0,242,212; --#{$prefix}secondary: #{$gray-400}; + --#{$prefix}primary: #{$bright-teal}; + --#{$prefix}primary-fg: #{$rich-black}; + --#{$prefix}primary-rgb: 0,242,212; + --#{$prefix}btn-active-color: #{$rich-black}; } } @@ -67,6 +72,22 @@ pre { color: $rich-black!important; } +// Add button focus state +.btn:focus { + border: 1px solid var(--tblr-primary-fg); + outline: 2px solid var(--tblr-primary)!important; +} + +// Fix secondary combo button contrast +.btn-outline-secondary { + &.active { + color: var(--tblr-primary-fg); + } + &:hover { + color: var(--tblr-primary-fg); + } +} + // Dark mode overrides body[data-bs-theme=dark] { @@ -96,6 +117,9 @@ body[data-bs-theme=dark] { // Adjusting text colors .text- { + &bg-primary { + color: $rich-black!important; + } &muted { color: var(--#{$prefix}secondary-color) !important; } diff --git a/netbox/project-static/styles/transitional/_cards.scss b/netbox/project-static/styles/transitional/_cards.scss index 6a7666524..1b619ab9b 100644 --- a/netbox/project-static/styles/transitional/_cards.scss +++ b/netbox/project-static/styles/transitional/_cards.scss @@ -16,6 +16,12 @@ background: var(--#{$prefix}bg-surface-tertiary); } + // Use
font size for card headers + h2.card-header { + @extend h5; + margin-bottom: 0; + } + // Reduce padding .list-group-item { padding: 0.5rem 0.75rem; diff --git a/netbox/project-static/styles/transitional/_forms.scss b/netbox/project-static/styles/transitional/_forms.scss index a489d87de..187b4bbcc 100644 --- a/netbox/project-static/styles/transitional/_forms.scss +++ b/netbox/project-static/styles/transitional/_forms.scss @@ -4,6 +4,13 @@ form.object-edit { max-width: 800px; } +// Use

style for field group headings +.field-group { + h2 { + @extend h4; + } +} + // Set bond font & append an asterisk to labels for required fields .col-form-label.required { font-weight: bold; diff --git a/netbox/project-static/styles/transitional/_navigation.scss b/netbox/project-static/styles/transitional/_navigation.scss index 1d3271461..22cc2fbf9 100644 --- a/netbox/project-static/styles/transitional/_navigation.scss +++ b/netbox/project-static/styles/transitional/_navigation.scss @@ -152,3 +152,37 @@ body[data-bs-theme=dark] .navbar-vertical.navbar-expand-lg { } } } + +// Dark theme styling +body[data-bs-theme=dark] .navbar-vertical.navbar-expand-lg { + + // Background Gradient + background: linear-gradient(180deg, rgba(0, 242, 212, 0.00) 0%, rgba(0, 242, 212, 0.10) 100%), #001423; + + // Border color for active dropdown list + .nav-item.dropdown.active:after { + border-color: $bright-teal!important; + } + + // Adjust hover color & style for menu items + .dropdown-item { + a { + color: white!important; + } + &.active { + background-color: $navbar-dark-active-bg!important; + a { + color: white!important; + } + } + &:hover { + background-color: $navbar-dark-active-bg!important; + } + .nav-link-title { + color: white!important; + } + } + .text-secondary { + color: $bright-teal!important; + } +} 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/500.html b/netbox/templates/500.html index b26b61973..4805e9240 100644 --- a/netbox/templates/500.html +++ b/netbox/templates/500.html @@ -14,9 +14,9 @@
-
+

{% trans "Server Error" %} -

+

{% block message %}

diff --git a/netbox/templates/account/base.html b/netbox/templates/account/base.html index 51076f781..b0e4e702a 100644 --- a/netbox/templates/account/base.html +++ b/netbox/templates/account/base.html @@ -2,24 +2,23 @@ {% load i18n %} {% block tabs %} -