From 04d8db7c52992ca4ede41410501526aed38f83a7 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 26 Mar 2024 15:27:25 -0400 Subject: [PATCH] Closes #15236: Clean up unused static resources (#15539) * Remove unused images * Remove unused stylesheets --- netbox/project-static/dist/cable_trace.css | 2 +- netbox/project-static/dist/rack_elevation.css | 2 +- netbox/project-static/img/graphql.ico | Bin 1235 -> 0 bytes netbox/project-static/img/netbox_logo.png | Bin 2257 -> 0 bytes .../styles/old/theme-light.scss | 119 ------------------ .../styles/svg/cable_trace.scss | 16 ++- .../styles/svg/rack_elevation.scss | 17 +-- 7 files changed, 22 insertions(+), 134 deletions(-) delete mode 100644 netbox/project-static/img/graphql.ico delete mode 100644 netbox/project-static/img/netbox_logo.png delete mode 100644 netbox/project-static/styles/old/theme-light.scss diff --git a/netbox/project-static/dist/cable_trace.css b/netbox/project-static/dist/cable_trace.css index dc7a6a6fa..54f01c3f7 100644 --- a/netbox/project-static/dist/cable_trace.css +++ b/netbox/project-static/dist/cable_trace.css @@ -1 +1 @@ -:root{--nbx-trace-color: #000;--nbx-trace-node-bg: #e9ecef;--nbx-trace-termination-bg: #f8f9fa;--nbx-trace-cable-shadow: #343a40;--nbx-trace-attachment: #ced4da}:root[data-netbox-color-mode=dark]{--nbx-trace-color: #fff;--nbx-trace-node-bg: #212529;--nbx-trace-termination-bg: #343a40;--nbx-trace-cable-shadow: #e9ecef;--nbx-trace-attachment: #6c757d}*{font-family:system-ui,-apple-system,Segoe UI,Roboto,Helvetica Neue,Noto Sans,Liberation Sans,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";font-size:.875rem}text{text-anchor:middle;dominant-baseline:middle}text:not([fill]){fill:var(--nbx-trace-color)}text.bold{font-weight:700}svg rect{fill:var(--nbx-trace-node-bg);stroke:#606060;stroke-width:1}svg rect .termination{fill:var(--nbx-trace-termination-bg)}svg .connector text{text-anchor:start}svg line{stroke-width:5px}svg polyline{fill:none;stroke-width:5px}svg .cable-shadow{stroke:var(--nbx-trace-cable-shadow);stroke-width:7px}svg line.wireless-link{stroke:var(--nbx-trace-attachment);stroke-dasharray:4px 12px;stroke-linecap:round}svg line.attachment{stroke:var(--nbx-trace-attachment);stroke-dasharray:5px} +:root{--nbx-trace-color: #000;--nbx-trace-node-bg: #e9ecef;--nbx-trace-termination-bg: #f8f9fa;--nbx-trace-cable-shadow: #343a40;--nbx-trace-attachment: #ced4da}:root[data-bs-theme=dark]{--nbx-trace-color: #fff;--nbx-trace-node-bg: #212529;--nbx-trace-termination-bg: #343a40;--nbx-trace-cable-shadow: #e9ecef;--nbx-trace-attachment: #6c757d}*{font-family:system-ui,-apple-system,Segoe UI,Roboto,Helvetica Neue,Noto Sans,Liberation Sans,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";font-size:.875rem}text{text-anchor:middle;dominant-baseline:middle}text:not([fill]){fill:var(--nbx-trace-color)}text.bold{font-weight:700}svg rect{fill:var(--nbx-trace-node-bg);stroke:#606060;stroke-width:1}svg rect .termination{fill:var(--nbx-trace-termination-bg)}svg .connector text{text-anchor:start}svg line{stroke-width:5px}svg polyline{fill:none;stroke-width:5px}svg .cable-shadow{stroke:var(--nbx-trace-cable-shadow);stroke-width:7px}svg line.wireless-link{stroke:var(--nbx-trace-attachment);stroke-dasharray:4px 12px;stroke-linecap:round}svg line.attachment{stroke:var(--nbx-trace-attachment);stroke-dasharray:5px} diff --git a/netbox/project-static/dist/rack_elevation.css b/netbox/project-static/dist/rack_elevation.css index 5d6f06fbf..40fa2908a 100644 --- a/netbox/project-static/dist/rack_elevation.css +++ b/netbox/project-static/dist/rack_elevation.css @@ -1 +1 @@ -svg{--nbx-rack-bg: #e9ecef;--nbx-rack-border: #000;--nbx-rack-slot-bg: #e9ecef;--nbx-rack-slot-border: #adb5bd;--nbx-rack-slot-hover-bg: #ced4da;--nbx-rack-link-color: #0d6efd;--nbx-rack-unit-color: var(--bs-secondary-color)}svg[data-netbox-color-mode=dark]{--nbx-rack-bg: #343a40;--nbx-rack-border: #6c757d;--nbx-rack-slot-bg: #343a40;--nbx-rack-slot-border: #495057;--nbx-rack-slot-hover-bg: #212529;--nbx-rack-link-color: #9ec5fe;--nbx-rack-unit-color: var(--bs-secondary-color)}*{font-family:system-ui,-apple-system,Segoe UI,Roboto,Helvetica Neue,Noto Sans,Liberation Sans,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";font-size:.875rem}rect{box-sizing:border-box}text{text-anchor:middle;dominant-baseline:middle}svg .unit{margin:0;padding:5px 0;fill:var(--nbx-rack-unit-color)}svg .hidden{visibility:hidden}svg rect.shaded,svg image.shaded{opacity:25%}svg text.shaded{opacity:50%}svg .rack{fill:none;stroke-width:2px;stroke:var(--nbx-rack-border);background-color:var(--nbx-rack-bg)}svg .slot{fill:var(--nbx-rack-slot-bg);stroke:var(--nbx-rack-slot-border)}svg .slot:hover{fill:var(--nbx-rack-slot-hover-bg)}svg .slot+.add-device{fill:var(--nbx-rack-link-color);opacity:0;pointer-events:none}svg .slot:hover+.add-device{opacity:1}svg .slot.occupied[class],svg .slot.occupied:hover[class]{fill:url(#occupied)}svg .slot.blocked[class],svg .slot.blocked:hover[class]{fill:url(#blocked)}svg .slot.blocked:hover+.add-device{opacity:0}svg .reservation[class]{fill:url(#reserved)} +svg{--nbx-rack-bg: #e9ecef;--nbx-rack-border: #000;--nbx-rack-slot-bg: #e9ecef;--nbx-rack-slot-border: #adb5bd;--nbx-rack-slot-hover-bg: #ced4da;--nbx-rack-link-color: #0d6efd;--nbx-rack-unit-color: var(--bs-secondary-color)}svg[data-bs-theme=dark]{--nbx-rack-bg: #343a40;--nbx-rack-border: #6c757d;--nbx-rack-slot-bg: #343a40;--nbx-rack-slot-border: #495057;--nbx-rack-slot-hover-bg: #212529;--nbx-rack-link-color: #9ec5fe;--nbx-rack-unit-color: var(--bs-secondary-color)}*{font-family:system-ui,-apple-system,Segoe UI,Roboto,Helvetica Neue,Noto Sans,Liberation Sans,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";font-size:.875rem}rect{box-sizing:border-box}text{text-anchor:middle;dominant-baseline:middle}svg .unit{margin:0;padding:5px 0;fill:var(--nbx-rack-unit-color)}svg .hidden{visibility:hidden}svg rect.shaded,svg image.shaded{opacity:25%}svg text.shaded{opacity:50%}svg .rack{fill:none;stroke-width:2px;stroke:var(--nbx-rack-border);background-color:var(--nbx-rack-bg)}svg .slot{fill:var(--nbx-rack-slot-bg);stroke:var(--nbx-rack-slot-border)}svg .slot:hover{fill:var(--nbx-rack-slot-hover-bg)}svg .slot+.add-device{fill:var(--nbx-rack-link-color);opacity:0;pointer-events:none}svg .slot:hover+.add-device{opacity:1}svg .slot.occupied[class],svg .slot.occupied:hover[class]{fill:url(#occupied)}svg .slot.blocked[class],svg .slot.blocked:hover[class]{fill:url(#blocked)}svg .slot.blocked:hover+.add-device{opacity:0}svg .reservation[class]{fill:url(#reserved)} diff --git a/netbox/project-static/img/graphql.ico b/netbox/project-static/img/graphql.ico deleted file mode 100644 index 4940291a2ef32ce404e25132b143d04d73e815ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1235 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 diff --git a/netbox/project-static/styles/old/theme-light.scss b/netbox/project-static/styles/old/theme-light.scss deleted file mode 100644 index 9b861c3a5..000000000 --- a/netbox/project-static/styles/old/theme-light.scss +++ /dev/null @@ -1,119 +0,0 @@ -// Base NetBox Theme Overrides and Settings - color mode agnostic. - -@import '../../node_modules/bootstrap/scss/functions'; - -$card-cap-bg: 'unset'; - -$border-radius-md: 0.375rem; -$border-radius-lg: 0.5rem; -$border-radius-xl: 0.75rem; -$border-radius-2xl: 1.5rem; - -$border-radius: $border-radius-md; - -$border-radius-sm: $border-radius; -$border-radius-lg: $border-radius-xl; - -$badge-border-radius: $border-radius-md; -$progress-border-radius: $border-radius-md; - -$font-weight-lighter: 200; -$font-weight-medium: 600; -$font-weight-bolder: 800; - -$font-size-xs: 0.75rem; - -$line-height-base: 1.5; -$line-height-xs: 1; -$line-height-sm: 1.25; -$line-height-lg: 1.75; - -$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. -$btn-close-width: 1em; - -$accordion-padding-y: 0.8125rem; -$accordion-padding-x: 0.8125rem; - -$sidebar-width: 280px; -$sidebar-bottom-height: 4rem; - -$transition-100ms-ease-in-out: all 0.1s ease-in-out; - -// Sidebar/Sidenav -$sidenav-width-closed: 3rem; -$sidenav-width-open: 16rem; -$sidenav-icon-width: 2rem; -$sidenav-spacing-x: 1.5rem; -$sidenav-link-spacing-x: 1rem; -$sidenav-link-spacing-y: 0.5rem; - -// Theme colors (BS5 classes) -$primary: #337ab7; -$secondary: $gray-600; -$success: $green-500; -$info: #54d6f0; -$warning: $yellow-500; -$danger: $red-500; -$light: $gray-200; -$dark: $gray-800; - -$theme-colors: ( - // BS5 theme colors - 'primary': $primary, - 'secondary': $secondary, - 'success': $success, - 'info': $info, - 'warning': $warning, - 'danger': $danger, - 'light': $light, - 'dark': $dark, - // General-purpose palette - 'blue': $blue-500, - 'indigo': $indigo-500, - 'purple': $purple-500, - 'pink': $pink-500, - 'red': $red-500, - 'orange': $orange-500, - 'yellow': $yellow-500, - 'green': $green-500, - 'teal': $teal-500, - 'cyan': $cyan-500, - 'gray': $gray-500, - 'black': $black, - 'white': $white -); - -$light: $gray-200; - -$navbar-light-color: $gray-100; - -$card-cap-color: $gray-800; - -$accordion-bg: transparent; -$accordion-button-bg: $accordion-bg; -$accordion-body-active-bg: $gray-100; -$accordion-border-color: $border-color; -$accordion-button-active-bg: $blue-100; -$accordion-button-active-color: $gray-800; - -$breadcrumb-divider: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8'%3E%3Cpath d='M2.5 0L1 1.5 3.5 4 1 6.5 2.5 8l4-4-4-4z' fill='currentColor'/%3E%3C/svg%3E"); - -$code-color: $gray-900; - -$list-group-color: $gray-700; -$list-group-disabled-color: $gray-500; - -$table-flush-header-bg: $gray-100; - -$input-placeholder-color: $gray-500; -$form-select-disabled-color: $gray-600; - -// Tabbed content -$tab-content-bg: $gray-100; diff --git a/netbox/project-static/styles/svg/cable_trace.scss b/netbox/project-static/styles/svg/cable_trace.scss index 4a8fdf61a..b7b09c219 100644 --- a/netbox/project-static/styles/svg/cable_trace.scss +++ b/netbox/project-static/styles/svg/cable_trace.scss @@ -1,17 +1,21 @@ -@import '../old/theme-light'; +@import '../../node_modules/bootstrap/scss/functions'; +@import '../../node_modules/bootstrap/scss/variables'; +@import '../../node_modules/bootstrap/scss/variables-dark'; -// Cable Trace Styles. +/* + * Cable trace SVG styling + */ :root { - // Light Mode Variables. + // Light mode values --nbx-trace-color: #{$black}; --nbx-trace-node-bg: #{$gray-200}; --nbx-trace-termination-bg: #{$gray-100}; --nbx-trace-cable-shadow: #{$gray-800}; --nbx-trace-attachment: #{$gray-400}; - &[data-netbox-color-mode='dark'] { - // Dark Mode Variables. - // Note: only the `theme-light.scss` file is in-scope for simplicity. + + &[data-bs-theme='dark'] { + // Dark mode values --nbx-trace-color: #{$white}; --nbx-trace-node-bg: #{$gray-900}; --nbx-trace-termination-bg: #{$gray-800}; diff --git a/netbox/project-static/styles/svg/rack_elevation.scss b/netbox/project-static/styles/svg/rack_elevation.scss index 424dd823e..f61081983 100644 --- a/netbox/project-static/styles/svg/rack_elevation.scss +++ b/netbox/project-static/styles/svg/rack_elevation.scss @@ -1,9 +1,13 @@ -@import '../old/theme-light'; +@import '../../node_modules/bootstrap/scss/functions'; +@import '../../node_modules/bootstrap/scss/variables'; +@import '../../node_modules/bootstrap/scss/variables-dark'; -// Rack Elevation Styles. +/* + * Rack elevation SVG styling + */ svg { - // Light Mode Variables. + // Light mode values --nbx-rack-bg: #{$gray-200}; --nbx-rack-border: #{$black}; --nbx-rack-slot-bg: #{$gray-200}; @@ -12,9 +16,8 @@ svg { --nbx-rack-link-color: #{$blue}; --nbx-rack-unit-color: #{$text-muted}; - &[data-netbox-color-mode='dark'] { - // Dark Mode Variables. - // Note: only the `theme-light.scss` file is in-scope for simplicity. + &[data-bs-theme='dark'] { + // Dark mode values --nbx-rack-bg: #{$gray-800}; --nbx-rack-border: #{$gray-600}; --nbx-rack-slot-bg: #{$gray-800}; @@ -41,7 +44,7 @@ svg { // Rack unit numbers along left side of rack elevation. .unit { margin: 0; - padding: 5px 0px; + padding: 5px 0; // Rack unit text color. fill: var(--nbx-rack-unit-color); }