From e30ff425a8d8aaab9098dd13e85b45dd591ac199 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Fri, 5 Jan 2024 15:34:00 -0500
Subject: [PATCH] Fix icon & badge spacing inside buttons and tabs

---
 netbox/project-static/dist/netbox.css         | Bin 543250 -> 543220 bytes
 netbox/project-static/styles/netbox.scss      |   4 ++--
 .../styles/overrides/_tabler.scss             |  13 +++++++++++++
 .../styles/transitional/_icons.scss           |  11 -----------
 4 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 netbox/project-static/styles/overrides/_tabler.scss
 delete 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 7c74491a3e1e794c1b3bccc3e79a109b9760f80e..d07eb73c7be40fe423a6274e3202f5e4835eb616 100644
GIT binary patch
delta 51
zcmbO<Me)mI#fBEf7N!>F7M2#)7Pc1lEgXN{S&~Zfbfz=zVH2M2x|vOM`)_v+9>(dx
Ho*erD-MbOH

delta 112
zcmew|S#i=7#fBEf7N!>F7M2#)7Pc1lEgXN{w`+TFa4~x8<)&m-7bK>nWag#o7G<Vq
rlvtS*RMhGvmE`Fb=PH1tb-<kTqWsbVppYGi2Np-uW-#5vlj8sYyJ;t{

diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss
index 13a05445b..93a88f5cd 100644
--- a/netbox/project-static/styles/netbox.scss
+++ b/netbox/project-static/styles/netbox.scss
@@ -5,8 +5,8 @@
 
 // Overrides of external libraries
 @import 'overrides/slim-select';
+@import 'overrides/tabler';
 
-// Transitional styling
+// Transitional styling to ease migration of templates from NetBox v3.x
 @import 'transitional/cards';
-@import 'transitional/icons';
 @import 'transitional/tables';
diff --git a/netbox/project-static/styles/overrides/_tabler.scss b/netbox/project-static/styles/overrides/_tabler.scss
new file mode 100644
index 000000000..4a3e20dce
--- /dev/null
+++ b/netbox/project-static/styles/overrides/_tabler.scss
@@ -0,0 +1,13 @@
+// Buttons
+.btn {
+  // Tabler sets display: flex
+  display: inline-block;
+}
+
+// Tabs
+.nav-tabs {
+  .nav-link {
+    // Tabler sets display: flex
+    display: inline-block;
+  }
+}
diff --git a/netbox/project-static/styles/transitional/_icons.scss b/netbox/project-static/styles/transitional/_icons.scss
deleted file mode 100644
index a18a9a843..000000000
--- a/netbox/project-static/styles/transitional/_icons.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-// Add padding between icon and text
-// TODO: Find a more robust solution for this
-.mdi {
-  padding-right: 4px;
-}
-// Omit padding inside small buttons (no text)
-.btn-sm {
-  .mdi {
-    padding-right: 0;
-  }
-}