diff --git a/netbox/project-static/dist/cable_trace.css b/netbox/project-static/dist/cable_trace.css index a5f5ff7e9..dc7a6a6fa 100644 Binary files a/netbox/project-static/dist/cable_trace.css and b/netbox/project-static/dist/cable_trace.css differ diff --git a/netbox/project-static/dist/graphiql.js b/netbox/project-static/dist/graphiql.js index 1b6949d02..ca01f112d 100644 Binary files a/netbox/project-static/dist/graphiql.js and b/netbox/project-static/dist/graphiql.js differ diff --git a/netbox/project-static/dist/graphiql.js.map b/netbox/project-static/dist/graphiql.js.map index 23c20b9a4..5fdb9aa54 100644 Binary files a/netbox/project-static/dist/graphiql.js.map and b/netbox/project-static/dist/graphiql.js.map differ diff --git a/netbox/project-static/dist/materialdesignicons-webfont-4ZM36VVG.woff b/netbox/project-static/dist/materialdesignicons-webfont-4ZM36VVG.woff new file mode 100644 index 000000000..a36a5f2d4 Binary files /dev/null and b/netbox/project-static/dist/materialdesignicons-webfont-4ZM36VVG.woff differ diff --git a/netbox/project-static/dist/materialdesignicons-webfont-7OXPFKOV.woff2 b/netbox/project-static/dist/materialdesignicons-webfont-7OXPFKOV.woff2 new file mode 100644 index 000000000..8c69b85f6 Binary files /dev/null and b/netbox/project-static/dist/materialdesignicons-webfont-7OXPFKOV.woff2 differ diff --git a/netbox/project-static/dist/materialdesignicons-webfont-A5TO3SM5.eot b/netbox/project-static/dist/materialdesignicons-webfont-A5TO3SM5.eot new file mode 100644 index 000000000..3eb89692a Binary files /dev/null and b/netbox/project-static/dist/materialdesignicons-webfont-A5TO3SM5.eot differ diff --git a/netbox/project-static/dist/materialdesignicons-webfont-OFFE53R5.ttf b/netbox/project-static/dist/materialdesignicons-webfont-OFFE53R5.ttf new file mode 100644 index 000000000..bba7dcf6c Binary files /dev/null and b/netbox/project-static/dist/materialdesignicons-webfont-OFFE53R5.ttf differ diff --git a/netbox/project-static/dist/netbox-external.css b/netbox/project-static/dist/netbox-external.css index edbb6aec5..f366cba76 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-print.css b/netbox/project-static/dist/netbox-print.css index 51a816c42..35579ce38 100644 Binary files a/netbox/project-static/dist/netbox-print.css and b/netbox/project-static/dist/netbox-print.css differ diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css index 9048a3286..2f0edc836 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/netbox.js b/netbox/project-static/dist/netbox.js index 97c4ba79c..8ae6c71a9 100644 Binary files a/netbox/project-static/dist/netbox.js and b/netbox/project-static/dist/netbox.js differ diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map index bbb2a3cc0..e8bf413de 100644 Binary files a/netbox/project-static/dist/netbox.js.map and b/netbox/project-static/dist/netbox.js.map differ diff --git a/netbox/project-static/dist/rack_elevation.css b/netbox/project-static/dist/rack_elevation.css index 32b3b687f..5d6f06fbf 100644 Binary files a/netbox/project-static/dist/rack_elevation.css and b/netbox/project-static/dist/rack_elevation.css differ diff --git a/netbox/project-static/package.json b/netbox/project-static/package.json index 98e1a5c60..7f4fd3c90 100644 --- a/netbox/project-static/package.json +++ b/netbox/project-static/package.json @@ -23,8 +23,8 @@ }, "dependencies": { "@mdi/font": "^7.0.96", - "@popperjs/core": "^2.11.6", - "bootstrap": "~5.0.2", + "@popperjs/core": "^2.11.8", + "bootstrap": "5.3.2", "clipboard": "^2.0.11", "color2k": "^2.0.0", "dayjs": "^1.11.5", diff --git a/netbox/project-static/styles/bootstrap.scss b/netbox/project-static/styles/bootstrap.scss index c55232acc..9f4191057 100644 --- a/netbox/project-static/styles/bootstrap.scss +++ b/netbox/project-static/styles/bootstrap.scss @@ -1,4 +1,6 @@ // Import the rest of bootstrap. +@import '../node_modules/bootstrap/scss/maps'; +@import '../node_modules/bootstrap/scss/mixins'; @import '../node_modules/bootstrap/scss/utilities'; @import './extensions'; @import '../node_modules/bootstrap/scss/mixins'; @@ -31,5 +33,8 @@ @import '../node_modules/bootstrap/scss/popover'; @import '../node_modules/bootstrap/scss/carousel'; @import '../node_modules/bootstrap/scss/spinners'; +@import '../node_modules/bootstrap/scss/offcanvas'; +@import '../node_modules/bootstrap/scss/placeholders'; +@import '../node_modules/bootstrap/scss/spinners'; @import '../node_modules/bootstrap/scss/helpers'; @import '../node_modules/bootstrap/scss/utilities/api'; diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss index a38633b5c..74a227c77 100644 --- a/netbox/project-static/styles/netbox.scss +++ b/netbox/project-static/styles/netbox.scss @@ -389,7 +389,7 @@ nav.search { // Object Selector Dropdown Button .dropdown-toggle { // Generate the same styles as a regular Bootstrap button. - @include button-variant($input-group-addon-bg, $input-border-color); + //@include button-variant($input-group-addon-bg, $input-border-color); margin-left: 0; font-weight: $input-group-addon-font-weight; line-height: $input-line-height; diff --git a/netbox/project-static/styles/theme-light.scss b/netbox/project-static/styles/theme-light.scss index 79517f729..f90843fa3 100644 --- a/netbox/project-static/styles/theme-light.scss +++ b/netbox/project-static/styles/theme-light.scss @@ -32,6 +32,7 @@ $darker: #1b1f22; $darkest: #171b1d; @import '../node_modules/bootstrap/scss/variables'; +@import '../node_modules/bootstrap/scss/variables-dark'; // This is the same value as the default from Bootstrap, but it needs to be in scope prior to // importing _variables.scss from Bootstrap. diff --git a/netbox/project-static/yarn.lock b/netbox/project-static/yarn.lock index 583b434f8..d970f33b9 100644 --- a/netbox/project-static/yarn.lock +++ b/netbox/project-static/yarn.lock @@ -107,6 +107,11 @@ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.6.tgz#cee20bd55e68a1720bdab363ecf0c821ded4cd45" integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw== +"@popperjs/core@^2.11.8": + version "2.11.8" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f" + integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== + "@types/bootstrap@^5.0.17": version "5.2.5" resolved "https://registry.yarnpkg.com/@types/bootstrap/-/bootstrap-5.2.5.tgz#0bb5dea7720611b2bb7ba16bd8a64fafd86fb658" @@ -319,10 +324,10 @@ binary-extensions@^2.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== -bootstrap@~5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.0.2.tgz#aff23d5e0e03c31255ad437530ee6556e78e728e" - integrity sha512-1Ge963tyEQWJJ+8qtXFU6wgmAVj9gweEjibUdbmcCEYsn38tVwRk8107rk2vzt6cfQcRr3SlZ8aQBqaD8aqf+Q== +bootstrap@5.3.2: + version "5.3.2" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.2.tgz#97226583f27aae93b2b28ab23f4c114757ff16ae" + integrity sha512-D32nmNWiQHo94BKHLmOrdjlL05q1c8oxbtBphQFb9Z5to6eGRDCm0QgeaZ4zFBHzfg2++rqa2JkqCcxDy0sH0g== brace-expansion@^1.1.7: version "1.1.11" diff --git a/netbox/templates/base/base.html b/netbox/templates/base/base.html index 4af904976..e9d7fcdf9 100644 --- a/netbox/templates/base/base.html +++ b/netbox/templates/base/base.html @@ -48,7 +48,7 @@ />