From d2eab22ef3702953493f3e3b244a0ea7cc212c97 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Fri, 5 Jan 2024 10:44:53 -0500
Subject: [PATCH] Fix icon spacing

---
 netbox/project-static/dist/netbox.css         | Bin 543174 -> 543197 bytes
 netbox/project-static/styles/netbox.scss      |   1 +
 .../styles/transitional/_icons.scss           |   5 +++++
 .../utilities/templates/buttons/delete.html   |   2 +-
 netbox/utilities/templates/buttons/edit.html  |   2 +-
 .../utilities/templates/buttons/export.html   |   2 +-
 6 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 netbox/project-static/styles/transitional/_icons.scss

diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css
index cc0218f3535286f2d926e63baf4e8510682efe51..b5124558ed0b5b698975823658c7e2577aa7bd52 100644
GIT binary patch
delta 53
zcmX>$S@G^<#fBEf7N!>F7M2#)7Pc1lEgbBgVtTnLnbie}DJhwG>AFRk=@}(fCIuDK
J**rN8008*k5^n$i

delta 35
rcmcaRS@GCp#fBEf7N!>F7M2#)7Pc1lEgbBg(-(Pi2u(Ne<X8&;<_-(7

diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss
index 35f879b1e..13a05445b 100644
--- a/netbox/project-static/styles/netbox.scss
+++ b/netbox/project-static/styles/netbox.scss
@@ -8,4 +8,5 @@
 
 // Transitional styling
 @import 'transitional/cards';
+@import 'transitional/icons';
 @import 'transitional/tables';
diff --git a/netbox/project-static/styles/transitional/_icons.scss b/netbox/project-static/styles/transitional/_icons.scss
new file mode 100644
index 000000000..90a6d256f
--- /dev/null
+++ b/netbox/project-static/styles/transitional/_icons.scss
@@ -0,0 +1,5 @@
+// Add padding between icon and text
+// TODO: Find a more robust solution for this
+.mdi {
+  padding-right: 4px;
+}
diff --git a/netbox/utilities/templates/buttons/delete.html b/netbox/utilities/templates/buttons/delete.html
index bffbff27d..a56a3dbc8 100644
--- a/netbox/utilities/templates/buttons/delete.html
+++ b/netbox/utilities/templates/buttons/delete.html
@@ -6,5 +6,5 @@
   data-bs-toggle="modal"
   data-bs-target="#htmx-modal"
 >
-  <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span>&nbsp;{% trans "Delete" %}
+  <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> {% trans "Delete" %}
 </a>
diff --git a/netbox/utilities/templates/buttons/edit.html b/netbox/utilities/templates/buttons/edit.html
index 26016fcfc..9dc9a0b46 100644
--- a/netbox/utilities/templates/buttons/edit.html
+++ b/netbox/utilities/templates/buttons/edit.html
@@ -1,4 +1,4 @@
 {% load i18n %}
 <a href="{{ url }}" class="btn btn-yellow" role="button">
-    <span class="mdi mdi-pencil" aria-hidden="true"></span>&nbsp;{% trans "Edit" %}
+  <i class="mdi mdi-pencil" aria-hidden="true"></i> {% trans "Edit" %}
 </a>
diff --git a/netbox/utilities/templates/buttons/export.html b/netbox/utilities/templates/buttons/export.html
index 0499d15d1..e163f48f9 100644
--- a/netbox/utilities/templates/buttons/export.html
+++ b/netbox/utilities/templates/buttons/export.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 <div class="dropdown">
   <button type="button" class="btn btn-purple dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-    <i class="mdi mdi-download"></i>&nbsp;{% trans "Export" %}
+    <i class="mdi mdi-download"></i> {% trans "Export" %}
   </button>
   <ul class="dropdown-menu dropdown-menu-end">
     <li><a class="dropdown-item" href="?{% if url_params %}{{ url_params }}&{% endif %}export=table">{% trans "Current View" %}</a></li>