From f62fa821a7a01ec302b800e087356926f5e3ee0b Mon Sep 17 00:00:00 2001
From: Arthur <worldnomad@gmail.com>
Date: Wed, 3 May 2023 08:12:05 -0700
Subject: [PATCH] 12363 change p tag to only effect last-child

---
 netbox/project-static/dist/netbox-dark.css  | Bin 375416 -> 375281 bytes
 netbox/project-static/dist/netbox-light.css | Bin 232725 -> 232658 bytes
 netbox/project-static/dist/netbox-print.css | Bin 727516 -> 727191 bytes
 netbox/project-static/styles/netbox.scss    |  12 +-----------
 netbox/templates/extras/object_journal.html |   2 +-
 5 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css
index 70ffe560280a1f106ef159648999d66bdd55fa36..fbc7ee8ff6b3e4de448f36b2efe81fa9fcf5d0fc 100644
GIT binary patch
delta 61
zcmV-D0K)(H^cL~+7J!5SgaU*Egaot&oM#F;Y+-YBEn{eDY?FcbC6~Zw1qqjZJ_0_M
TFl7Y@w*+Vf1_HOIY6a0x1ko1#

delta 136
zcmezPS?tFbv4$4L7N!>F7M3lnbJC|jdd#Ri-5`~fgGr%a`olmbV=!mCR0b;>lcHX6
zL1J=hif%z-QDS;gVnK#(Nn%n?ssfZuQJDVlF{7#?epMMjgB#6QgePC%SKh9W#d^^n
E0Cd<fZ~y=R

diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css
index bf6dd2722f59af355121fbd8cb5e4cca373f440c..5c990740d59c6d7fb808908137a202ae452481c7 100644
GIT binary patch
delta 54
zcmbO_i|^7*zJ?aY7N#xC;h|zyIf=z3y2%-tIVn0NiAg!B3MCl|1(WxR%WN+WWlmw-
KZV=A=)D!?8mJ?q9

delta 114
zcmcaKlW*!QzJ?aY7N#xC;i23*C5cHnsR|_-3I*FMLYYe$UG<6!5|dL?bPE!T64Q$k
f3o>+}N+1eT6bf_*C;^%^-B5x_c>9|$=4Yk=9eyaf

diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css
index d0748f25ee5e02683478184ce463a54328629eb1..36c9362c1a45b5d5e73b5cf06b06cefa132975af 100644
GIT binary patch
delta 166
zcmcb!S!eo2orV_17N!>F7M2#)7Pc1l7LFFqEnL23(pEW%#U;AQ8JRgLIvFLoISM6-
zNja$sB^e3@(=VE^>P>Gb<Klv_63V$am_WiBtoqXxicmT1%pe_%EnLEr|AujHS1IQ@
z%RF7Gj!Ss@o?0&1$qTsIrtRZmnZCA`%YFLpbS~cM0yjBWrWbr?5!x<O%XMH506bqf
AApigX

delta 360
zcmbQfQRmKPorV_17N!>F7M2#)7Pc1l7LFFqEnL23{5lyWxj70YiAg!B3MCl|(+ejv
zs!V@S#KpmgV6!s;B@WJERh_N?kpQzD%DK3<hn92QWA@Z5E=WvHP0=k#EJ{o-N-W6G
zg&GJkHbtQTVhsUx5bISH2$=?QBq3E07poCA3+NX$CHyvKC=^sro*=3=-QYhL%k-Ny
aT>R5(s<~t*FW_dIE>+7VydB7so(llq0)MCg

diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss
index 993050f33..bb8d73c05 100644
--- a/netbox/project-static/styles/netbox.scss
+++ b/netbox/project-static/styles/netbox.scss
@@ -229,7 +229,7 @@ table {
       line-height: $line-height-xs;
     }
 
-    p {
+    p:last-child {
       // Remove spacing from paragraph elements within tables.
       margin-bottom: 0;
     }
@@ -266,16 +266,6 @@ table {
   }
 }
 
-.spaced-paragraph-table table {
-  td,
-  th {
-    p {
-      // Remove spacing from paragraph elements within tables.
-      margin-bottom: 1rem;
-    }
-  }
-}
-
 div.title-container {
   display: flex;
   // On small screens, `flex-direction: column;` ensures the control buttons don't appear on the
diff --git a/netbox/templates/extras/object_journal.html b/netbox/templates/extras/object_journal.html
index d127a4e8d..0ed95d9eb 100644
--- a/netbox/templates/extras/object_journal.html
+++ b/netbox/templates/extras/object_journal.html
@@ -6,7 +6,7 @@
 
 {% block content %}
   <div class="card">
-    <div class="card-body table-responsive spaced-paragraph-table">
+    <div class="card-body table-responsive">
       {% render_table table 'inc/table.html' %}
       {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
     </div>