From 2e0c5a77451e552dbf8928d92c12eec532e1a4d0 Mon Sep 17 00:00:00 2001
From: Arthur <worldnomad@gmail.com>
Date: Fri, 30 Sep 2022 16:48:00 -0700
Subject: [PATCH] 8424 fix merge

---
 netbox/dcim/views.py              | 1 +
 netbox/templates/dcim/device.html | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 7a6aecc8e..5930d6b2d 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1616,6 +1616,7 @@ class DeviceView(generic.ObjectView):
         return {
             'services': services,
             'vc_members': vc_members,
+            'svg_extra': f'highlight=id:{instance.pk}'
         }
 
 
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index f53c4bc44..5c97576a2 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -7,7 +7,11 @@
 
 {% block content %}
     <div class="row">
+<<<<<<< HEAD
         <div class="col col-md-6">
+=======
+        <div class="col col-12 col-xl-6">
+>>>>>>> a504b17fd (8424 highlight device)
             <div class="card">
                 <h5 class="card-header">
                     Device
@@ -153,7 +157,11 @@
             {% include 'inc/panels/comments.html' %}
             {% plugin_left_page object %}
         </div>
+<<<<<<< HEAD
         <div class="col col-md-6">
+=======
+        <div class="col col-12 col-xl-6">
+>>>>>>> a504b17fd (8424 highlight device)
             <div class="card">
                 <h5 class="card-header">Management</h5>
                 <div class="card-body">