From aa9e68e121a5f02615451ed0e0c0b0e328a8cd15 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Thu, 28 Oct 2021 10:46:00 -0400
Subject: [PATCH] Tweak preformatted block styling

---
 netbox/project-static/dist/netbox-dark.css    | Bin 788776 -> 788877 bytes
 netbox/project-static/dist/netbox-light.css   | Bin 493600 -> 493633 bytes
 netbox/project-static/dist/netbox-print.css   | Bin 1623462 -> 1623705 bytes
 netbox/project-static/styles/netbox.scss      |  11 +++++++++++
 netbox/project-static/styles/overrides.scss   |   4 ----
 netbox/templates/500.html                     |   2 +-
 netbox/templates/dcim/platform.html           |   2 +-
 .../extras/inc/configcontext_data.html        |   2 +-
 netbox/templates/extras/script.html           |   2 +-
 netbox/templates/extras/script_result.html    |   4 ++--
 10 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css
index b06cca0a11d640e5d728a81d25e0745825aa204a..d98f6539c49584229e74662dc40241be9edaf1dc 100644
GIT binary patch
delta 107
zcmZ26$)I<#K|>2;3sVbo3rh=Y3tJ0&3&$2t|31F*jLec$-Qt48<W#GIqREO<s*`U^
zShVZ*a{@8fcHMsN+2w2{DGCKesgoy)8*>3^y`-G{<m~F{3Cuil(;Iv_xu&=GaprD6
J!N!xo1OVIOB;No4

delta 94
zcmeC3Y_MXIK|>2;3sVbo3rh=Y3tJ0&3&$2t|32x0#FUiGymTwWqSRdL@{G)qRNdl&
x#N<?~f}-h+5156gH~4aLO+UcKlRNpAgk}4#K29L!+P<rgdv^JDU3Q)XCIC2lA}Rm?

diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css
index cf06883a981bf8a07b403e0a852b2a0a12b620af..7eefc861fdeeca4560a8250d4504276479e8bcfa 100644
GIT binary patch
delta 107
zcmZ25LGIuLxrP?T7N!>F7M3lnldtoaXJnS7>J}FyCZ}2z6s5L{-eBD>dV?)=okmHD
z0#KkjH?b%^Gfy`uzoaBT*UF$4D5jT`lb@VjU67cPl9`u2{bD|g`1A=4>|E1NUuX5+
Kp4G;_jS&FGLMi?L

delta 78
zcmV-U0I~nUkRG6r9)N@agaU*Egaot&lh+$?VPs@!Zf80%a%F8hcW7yJWi4}XVPj=F
kaB`PXnF14+5QGN`mq3OGONXP^1-GNu22`%Mi-rfb0gp@`6951J

diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css
index 7e565c3d5be6b900a59495cd008ed04c0bad79ad..4a42224884e0cb50be5f48cd653af7b65df86dd2 100644
GIT binary patch
delta 175
zcmZ41ojkKQxuJ!zg{g(Pg{6hHg{_6Xg`<VDg{y_Tg{OtLg|CIbMW98nMQDp~>QTP(
zjLec$-Qt48<W#GIqUi^d8AT`as~%|IeM}gLMSxfoh{d+=J|_P52UAJPBpt=c4NmNg
zK!yfeNs2;2QR?J{N-8WsT5tM9HX#i-OKEa|AUhXGJSitXIlFrL&7Bf*)7R$<b4{On
NR5)(?iv1G*SOFiaL9+k=

delta 122
zcmbQ)o4l+$xuJ!zg{g(Pg{6hHg{_6Xg`<VDg{y_Tg{OtLg|CIbMW98nMQDp~>QU)}
z#FUiGymTwWqSRdL@{G)qRNdl&#N<?~f}-h-hMdCF*XIj!O}9ND5jUA%^+3DFF<~GU
X0b)@g7TfM|O#JPS?XwR^{9^?GK`t&Z

diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss
index 8ce526985..e962bedfb 100644
--- a/netbox/project-static/styles/netbox.scss
+++ b/netbox/project-static/styles/netbox.scss
@@ -967,6 +967,17 @@ div.card-overlay {
   max-width: unset;
 }
 
+// Preformatted text blocks
+td pre {
+  margin-bottom: 0
+}
+pre.block {
+  padding: $spacer;
+  background-color: var(--nbx-pre-bg);
+  border: 1px solid var(--nbx-pre-border-color);
+  border-radius: $border-radius;
+}
+
 #django-messages {
   position: fixed;
   right: $spacer;
diff --git a/netbox/project-static/styles/overrides.scss b/netbox/project-static/styles/overrides.scss
index 85e6f0d40..03c72c6e6 100644
--- a/netbox/project-static/styles/overrides.scss
+++ b/netbox/project-static/styles/overrides.scss
@@ -7,11 +7,7 @@ body {
 }
 
 pre {
-  padding: $spacer;
   white-space: pre;
-  background-color: var(--nbx-pre-bg);
-  border: 1px solid var(--nbx-pre-border-color);
-  border-radius: $border-radius;
 }
 
 // Force <small/> elements to make text smaller.
diff --git a/netbox/templates/500.html b/netbox/templates/500.html
index 097699ffc..6cface941 100644
--- a/netbox/templates/500.html
+++ b/netbox/templates/500.html
@@ -26,7 +26,7 @@
                         <p>
                             The complete exception is provided below:
                         </p>
-<pre><strong>{{ exception }}</strong><br />
+<pre class="block"><strong>{{ exception }}</strong><br />
 {{ error }}
 
 Python version: {{ python_version }}
diff --git a/netbox/templates/dcim/platform.html b/netbox/templates/dcim/platform.html
index 8cd26a116..a926c4ed4 100644
--- a/netbox/templates/dcim/platform.html
+++ b/netbox/templates/dcim/platform.html
@@ -64,7 +64,7 @@
         NAPALM Arguments
       </h5>
       <div class="card-body">
-        <pre>{{ object.napalm_args }}</pre>
+        <pre>{{ object.napalm_args|render_json }}</pre>
       </div>
     </div>
     {% include 'inc/panels/custom_fields.html' %}
diff --git a/netbox/templates/extras/inc/configcontext_data.html b/netbox/templates/extras/inc/configcontext_data.html
index 085887748..48ca18543 100644
--- a/netbox/templates/extras/inc/configcontext_data.html
+++ b/netbox/templates/extras/inc/configcontext_data.html
@@ -1,5 +1,5 @@
 {% load helpers %}
 
 <div class="rendered-context-data">
-    <pre>{% if format == 'json' %}{{ data|render_json }}{% elif format == 'yaml' %}{{ data|render_yaml }}{% else %}{{ data }}{% endif %}</pre>
+    <pre class="block">{% if format == 'json' %}{{ data|render_json }}{% elif format == 'yaml' %}{{ data|render_yaml }}{% else %}{{ data }}{% endif %}</pre>
 </div>
diff --git a/netbox/templates/extras/script.html b/netbox/templates/extras/script.html
index 3a50e09a1..bb2b83360 100644
--- a/netbox/templates/extras/script.html
+++ b/netbox/templates/extras/script.html
@@ -69,7 +69,7 @@
     </div>
     <div role="tabpanel" class="tab-pane" id="source">
       <code class="h6 my-3 d-block">{{ script.filename }}</code>
-      <pre>{{ script.source }}</pre>
+      <pre class="block">{{ script.source }}</pre>
     </div>
   </div>
 {% endblock content-wrapper %}
diff --git a/netbox/templates/extras/script_result.html b/netbox/templates/extras/script_result.html
index f463b0f2c..3cbd0c611 100644
--- a/netbox/templates/extras/script_result.html
+++ b/netbox/templates/extras/script_result.html
@@ -102,11 +102,11 @@
           {% endif %}
       </div>
       <div role="tabpanel" class="tab-pane" id="output">
-          <pre>{{ result.data.output }}</pre>
+          <pre class="block">{{ result.data.output }}</pre>
       </div>
       <div role="tabpanel" class="tab-pane" id="source">
           <p><code>{{ script.filename }}</code></p>
-          <pre>{{ script.source }}</pre>
+          <pre class="block">{{ script.source }}</pre>
       </div>
   </div>
 {% endblock content-wrapper %}