diff --git a/netbox/project-static/styles/old/netbox.scss b/netbox/project-static/styles/old/netbox.scss index 8d0192593..b1505e5d3 100644 --- a/netbox/project-static/styles/old/netbox.scss +++ b/netbox/project-static/styles/old/netbox.scss @@ -142,59 +142,12 @@ table td > .progress { } } -// Primarily used for the new release notification, but could be used for other alerts as needed. -// Wrap any alerts in .header-alert-container to ensure the layout is consistent. -.header-alert-container { - // Center-align the alert(s). - display: flex; - align-items: center; - justify-content: center; - // Apply the same spacing that's applied to the #content div's first child (.px-3). - padding: 0 $spacer; - - // By default, alerts inside .header-alert-container should take up the full width. - .alert { - width: 100%; - - // Adjust the max-width for larger screens so there's not a big ugly blue blob taking up the - // entire screen. - @include media-breakpoint-up(md) { - max-width: 75%; - } - @include media-breakpoint-up(lg) { - max-width: 50%; - } - } -} - .alert { code { color: $gray-600; } } -span.profile-button .dropdown-menu { - right: 0; - left: auto; - display: block !important; - margin-top: 0.5rem; - box-shadow: $box-shadow; - transition: opacity 0.2s ease-in-out; - - &:not(.show) { - pointer-events: none; - opacity: 0; - } - &.show { - pointer-events: auto; - opacity: 1; - } -} - -div#advanced-search-content div.card div.card-body div.col:not(:last-child) { - margin-right: 1rem; -} - table { td { a { @@ -276,28 +229,6 @@ table { } } -div.title-container { - display: flex; - // On small screens, `flex-direction: column;` ensures the control buttons don't appear on the - // same line as the title, but rather break to the next line. - flex-direction: column; - flex-wrap: wrap; - justify-content: space-between; - - @include media-breakpoint-up(lg) { - // On large screens, `flex-direction: row;` allows the control buttons to appear vertically - // aligned with the title. - flex-direction: row; - } - - #content-title { - display: flex; - flex: 1 0; - flex-direction: column; - padding-bottom: map.get($spacers, 2); - } -} - // Object list control buttons (Add/Clone/Import/Export) .controls { margin-bottom: map.get($spacers, 2); @@ -337,32 +268,6 @@ div.title-container { } } -.object-subtitle { - display: block; - font-size: $font-size-sm; - color: $text-muted; - - @include media-breakpoint-up(md) { - display: inline-block; - } - - > span { - display: block; - - // Hide the separator on small screens. - &.separator { - display: none; - } - - &, - &.separator { - @include media-breakpoint-up(md) { - display: inline-block; - } - } - } -} - // Global Search nav.search { // Don't overtake dropdowns @@ -614,20 +519,6 @@ div.content-container { } } -.tooltip { - pointer-events: none; -} - -span.color-label { - display: block; - width: 5rem; - height: 1rem; - padding: $badge-padding-y $badge-padding-x; - border: 1px solid #303030; - border-radius: $border-radius; - box-shadow: $box-shadow-sm; -} - .badge a { color: inherit; } @@ -790,48 +681,6 @@ label.required { } } -// Applied to containing element around table bulk-action buttons (bulk-edit, bulk-disconnect -// bulk-delete, etc). Each usage of .bulk-buttons needs to have groups of buttons wrapped with -// .bulk-button-group so that proper spacing is applied (even if there is only one group). -div.bulk-buttons { - display: flex; - justify-content: space-between; - margin: math.div($spacer, 2) 0; - - // Each group of buttons needs to be contained separately for alignment purposes. This way, you - // can put some buttons in a group that aligns left, and other buttons in a group that aligns - // right. - > div.bulk-button-group { - display: flex; - flex-wrap: wrap; - // For small screens: don't fill the available space (thereby expanding the size of the button). - align-items: flex-start; - - &:first-of-type:not(:last-of-type) { - // If there are multiple bulk button groups and this is the first, the first button in the - // group should *not* have left spacing applied, so the button group aligns with the rest - // of the page elements. - > *:first-child { - margin-left: 0; - } - } - - &:last-of-type:not(:first-of-type) { - // If there are multiple bulk button groups and this is the last, the last button in the - // group should *not* have right spacing applied, so the button group aligns with the rest - // of the page elements. - > *:last-child { - margin-right: 0; - } - } - - // However, the rest of the buttons should have spacing applied in all directions. - > * { - margin: math.div($spacer, 4); - } - } -} - table tbody { @each $color, $value in $theme-colors { tr.#{$color} { @@ -959,23 +808,6 @@ div.card-overlay { padding: $spacer; } -// Override masonry-layout styles when printing. -.masonry { - @media print { - position: static !important; - display: block !important; - height: unset !important; - } - .masonry-item { - @media print { - position: static !important; - top: unset !important; - left: unset !important; - display: block !important; - } - } -} - // Object hierarchy indicators. .record-depth { display: inline; diff --git a/netbox/templates/core/configrevision.html b/netbox/templates/core/configrevision.html index 9c39f5031..c7640e521 100644 --- a/netbox/templates/core/configrevision.html +++ b/netbox/templates/core/configrevision.html @@ -30,8 +30,8 @@ {% block subtitle %} {% if object.created %} -
- {% trans "Created" %} {{ object.created|annotated_date }} +
+ {% trans "Created" %} {{ object.created|annotated_date }}
{% endif %} {% endblock subtitle %} diff --git a/netbox/templates/core/configrevision_restore.html b/netbox/templates/core/configrevision_restore.html index b1f00a385..c7449270c 100644 --- a/netbox/templates/core/configrevision_restore.html +++ b/netbox/templates/core/configrevision_restore.html @@ -8,8 +8,8 @@ {% block title %}{% trans "Restore" %}: {{ object }}{% endblock %} {% block subtitle %} -
- {% trans "Created" %} {{ object.created|annotated_date }} +
+ {% trans "Created" %} {{ object.created|annotated_date }}
{% endblock %} diff --git a/netbox/templates/dcim/inc/cable_termination.html b/netbox/templates/dcim/inc/cable_termination.html index da08e7b9c..99b4353b2 100644 --- a/netbox/templates/dcim/inc/cable_termination.html +++ b/netbox/templates/dcim/inc/cable_termination.html @@ -1,7 +1,7 @@ {% load helpers %} {% load i18n %} {% if terminations.0 %} - +
{% if terminations.0.device %} {# Device component #} diff --git a/netbox/templates/dcim/inc/interface_vlans_table.html b/netbox/templates/dcim/inc/interface_vlans_table.html index 72689b374..6983efeef 100644 --- a/netbox/templates/dcim/inc/interface_vlans_table.html +++ b/netbox/templates/dcim/inc/interface_vlans_table.html @@ -1,5 +1,5 @@ {% load i18n %} -
+
diff --git a/netbox/templates/extras/htmx/report_result.html b/netbox/templates/extras/htmx/report_result.html index 363b4a75e..440b12eba 100644 --- a/netbox/templates/extras/htmx/report_result.html +++ b/netbox/templates/extras/htmx/report_result.html @@ -36,7 +36,7 @@
{% trans "Report Results" %}
{% trans "VID" %} {% trans "Name" %}
- + diff --git a/netbox/templates/extras/report/base.html b/netbox/templates/extras/report/base.html index 05b077ed6..ba7f4260f 100644 --- a/netbox/templates/extras/report/base.html +++ b/netbox/templates/extras/report/base.html @@ -16,8 +16,8 @@ {% block subtitle %} {% if report.description %} -
-
{{ report.description|markdown }}
+
+ {{ report.description|markdown }}
{% endif %} {% endblock subtitle %} diff --git a/netbox/templates/extras/report_list.html b/netbox/templates/extras/report_list.html index 31ca87abb..e770f4faa 100644 --- a/netbox/templates/extras/report_list.html +++ b/netbox/templates/extras/report_list.html @@ -39,7 +39,7 @@
{% include 'inc/sync_warning.html' with object=module %} {% if module.reports %} -
{% trans "Time" %} {% trans "Level" %} {% trans "Object" %}
+
diff --git a/netbox/templates/extras/script/base.html b/netbox/templates/extras/script/base.html index 70f9a94e0..af3b20ef1 100644 --- a/netbox/templates/extras/script/base.html +++ b/netbox/templates/extras/script/base.html @@ -16,8 +16,8 @@ {% endblock breadcrumbs %} {% block subtitle %} -
-
{{ script.Meta.description|markdown }}
+
+ {{ script.Meta.description|markdown }}
{% endblock subtitle %} diff --git a/netbox/templates/extras/script_list.html b/netbox/templates/extras/script_list.html index 3bd32ffdc..3c609f407 100644 --- a/netbox/templates/extras/script_list.html +++ b/netbox/templates/extras/script_list.html @@ -45,7 +45,7 @@ {% endblocktrans %}
{% else %} -
{% trans "Name" %}
+
diff --git a/netbox/templates/wireless/inc/wirelesslink_interface.html b/netbox/templates/wireless/inc/wirelesslink_interface.html index f1440a4fc..8b61a5564 100644 --- a/netbox/templates/wireless/inc/wirelesslink_interface.html +++ b/netbox/templates/wireless/inc/wirelesslink_interface.html @@ -1,7 +1,7 @@ {% load helpers %} {% load i18n %} -
{% trans "Name" %}
+
{% trans "Device" %} {{ interface.device|linkify }}